diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2125a3af..c0489417 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,6 +55,14 @@ jobs: - name: Run tests run: tox -e ${{ matrix.tox-env }} + - name: Run off-tox tests + # https://github.com/scrapinghub/shub/issues/441 + run: | + python -m venv venv + . venv/bin/activate + pip install . + python -c "from shub.image.utils import get_docker_client; get_docker_client(validate=False)" + - name: Upload coverage report run: | curl -Os https://uploader.codecov.io/latest/linux/codecov diff --git a/setup.py b/setup.py index 7ba295f7..d81c8abf 100644 --- a/setup.py +++ b/setup.py @@ -29,13 +29,14 @@ install_requires=[ 'click', 'docker', - 'importlib-metadata; python_version < "3.8"', + 'importlib-metadata; python_version < "3.10"', 'packaging', 'pip', 'PyYAML', 'retrying', 'requests', 'scrapinghub>=2.3.1', + 'setuptools', 'tqdm==4.55.1', 'toml', ], diff --git a/shub/image/utils.py b/shub/image/utils.py index 737a07d2..50914ba3 100644 --- a/shub/image/utils.py +++ b/shub/image/utils.py @@ -16,7 +16,7 @@ ShubDeprecationWarning, print_warning, BadParameterException, ) -if sys.version_info < (3, 8): +if sys.version_info < (3, 10): import importlib_metadata as metadata else: from importlib import metadata