Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unpin the bs4 version, relock #499

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
on:
pull_request:
branches:
- master

name: Run Tox tests on Linux

jobs:
tox_test:
name: Tox test
steps:
- name: checkout
uses: actions/checkout@v2
- name: run Tox tests
id: test
uses: fedora-python/tox-github-action@master
with:
tox_env: ${{ matrix.tox_env }}
dnf_install: /usr/bin/make
strategy:
matrix:
tox_env: [
# This list has to be maintained manually :(
# You can get it from `tox -l | sed "s/$/,/"`
py36-pip90-toml,
py36-pip192-toml,
py36-pip193-toml,
py36-pip203-toml,
py36-pip213-toml,
py36-pip90-pytoml,
py37-pip90-toml,
py37-pip192-toml,
py37-pip193-toml,
py37-pip203-toml,
py37-pip213-toml,
py37-piplatest-toml,
py37-pipgit-toml,
py38-pip90-toml,
py38-pip192-toml,
py38-pip193-toml,
py38-pip203-toml,
py38-pip213-toml,
py38-piplatest-toml,
py38-pipgit-toml,
py39-pip90-toml,
py39-pip192-toml,
py39-pip193-toml,
py39-pip203-toml,
py39-pip213-toml,
py39-piplatest-toml,
py39-pipgit-toml,
py38-pip90-pytoml,
py38-piplatest-pytoml,
py38-pipgit-pytoml,
py39-pip90-pytoml,
py39-piplatest-pytoml,
py39-pipgit-pytoml,
py310-pip192-toml,
py310-pip193-toml,
py310-pip203-toml,
py310-pip213-toml,
py310-piplatest-toml,
py310-pipgit-toml,
py310-piplatest-pytoml,
py310-pipgit-pytoml,
py310-piplatest-tomli,
py310-pipgit-tomli,
py311-pip192,
py311-pip193,
py311-pip203,
py311-pip213,
py311-piplatest,
py311-pipgit,
mypy,
]

# Use GitHub's Linux Docker host
runs-on: ubuntu-latest
22 changes: 11 additions & 11 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
requests = "*"
click = "*"
thoth-analyzer = "*"
thoth-common = "*"
aiohttp = "*"
attrs = "*"
beautifulsoup4 = "==4.6.3"
beautifulsoup4 = "*"
click = "*"
lxml = "*"
pyelftools = "*"
packaging = "<22"
pyelftools = "*"
requests = "*"
thoth-analyzer = "*"
thoth-common = "*"
toml = "*"
aiohttp = "*"

[dev-packages]
flexmock = "*"
pytest = "*"
pytest-timeout = "*"
pytest-asyncio = "*"
pytest-cov = "*"
pytest-mypy = "*"
pytest-asyncio = "*"
flexmock = "*"
pytest-timeout = "*"

[requires]
python_version = "3.8"
352 changes: 179 additions & 173 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ You can use Pipenv for managing this project and execute testsuite using
git clone https://github.com/thoth-station/python.git thoth-python
cd thoth-python
pipenv install --dev
pipenv run python3 setup.py test
pipenv run python pytest
2 changes: 1 addition & 1 deletion tests/test_aiosource.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ async def test_get_package_hashes(self):
}

source = AIOSource.from_dict(source_info)
hashes = await source.get_package_hashes("tensorflow", "2.0.0")
hashes = await source.get_package_hashes("tensorflow-cpu", "2.0.0")
assert type(hashes) is list

for actual in hashes:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_pipfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def test_construct_requirements(self):
# as provided by pip-tools.
#
--index-url https://pypi.org/simple
--extra-index-url https://tensorflow.pypi.thoth-station.ninja/index/manylinux2010/AVX2/simple/
--extra-index-url https://tensorflow.pypi.thoth-station.ninja/index/manylinux2010/AVX2/simple

attrs>=10
connexion[swagger-ui]>=1.2; python_version < '2.7.9' or (python_version >= '3.0' and python_version < '3.4')
Expand Down
2 changes: 1 addition & 1 deletion tests/test_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class TestSource(PythonTestCase):
def test_dict(self):
"""Test dict."""
source_info = {
"url": "https://index-aicoe.a3c1.starter-us-west-1.openshiftapps.com/",
"url": "https://pypi.python.org",
"verify_ssl": True,
"name": "redhat-aicoe-experiments",
"warehouse": True,
Expand Down
65 changes: 65 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[tox]
# Don't forget to adjust CI when changing this
envlist =
# Python 3.6 has its own part because pip >= 22
# does not support it anymore.
py36-pip{90,192,193,203,213}-toml
py36-pip{90}-pytoml
py{37,38,39}-pip{90,192,193,203,213,latest,git}-toml
py{38,39}-pip{90,latest,git}-pytoml
py310-pip{192,193,203,213,latest,git}-toml
py310-pip{latest,git}-pytoml
py310-pip{latest,git}-tomli
py311-pip{192,193,203,213,latest,git}
mypy
skipsdist = True

[testenv]
commands = pytest --timeout=300 --capture=no --verbose -l -s -vv {posargs} tests/
deps =
flexmock
pytest
pytest-timeout
pytest-venv
packaging
toml: toml
pytoml: pytoml
tomli: tomli
requests
aiohttp
attrs
beautifulsoup4
click
lxml
packaging
pyelftools
thoth-analyzer
thoth-common

setenv =
# platform-python-pip and python27-pip in RHEL8
# pip 9 seems not to be compatible with the latest setuptools
# so we are using the same version we have in RHEL 8
pip90: THOTH_PYTHON_TEST_PIP_VERSION = >=9.0,<10.0
pip90: THOTH_PYTHON_TEST_SETUPTOOLS_VERSION = <60
# older version in Python 3.8 module
pip192: THOTH_PYTHON_TEST_PIP_VERSION = >=19.2,<19.3
# first version with manylinux2014 support, Python 3.8 module, Fedora 32
pip193: THOTH_PYTHON_TEST_PIP_VERSION = >=19.3,<20.0
# Latest version from 2020
pip203: THOTH_PYTHON_TEST_PIP_VERSION = >=20.3,<21
# Latest version from 2021
pip213: THOTH_PYTHON_TEST_PIP_VERSION = >=21.3,<22
# Latest release
piplatest: THOTH_PYTHON_TEST_PIP_VERSION = latest
# Git master
pipgit: THOTH_PYTHON_TEST_PIP_VERSION = git
# Two implementations of toml format
toml: THOTH_PYTHON_TEST_TOML_MODULE = toml
pytoml: THOTH_PYTHON_TEST_TOML_MODULE = pytoml
tomli: THOTH_PYTHON_TEST_TOML_MODULE = tomli

[testenv:mypy]
commands = mypy micropipenv.py
deps =
mypy