Merge pull request #103 from rcoup/rc-dep-fixes

Dependency fixes from #101
datopian · Apr 26, 2022 · c0935ce · c0935ce
2 parents 13af128 + a2dbe52
commit c0935ce
Show file tree

Hide file tree

Showing 11 changed files with 153 additions and 54 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -12,15 +12,17 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [ 3.7, 3.8 ]
+        python-version: [ "3.7", "3.8", "3.9", "3.10" ]
     steps:
       - uses: actions/checkout@v2
       - name: Install Python 3
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up the test environment
-        run: make dev-setup
+        run: |
+          touch requirements.txt dev-requirements.txt
+          make dev-setup
       - name: Run tests
         run: |
           make test PYTEST_EXTRA_ARGS="--cov=giftless"

diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@
 /*.local.yaml
 /.coverage
 /.make-cache
+/.tox
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,2 @@
+include VERSION
+include README.md
diff --git a/Makefile b/Makefile
@@ -24,6 +24,8 @@ SOURCE_FILES := $(shell find $(PACKAGE_DIRS) $(TESTS_DIR) -type f -name "*.py")
 SENTINELS := .make-cache
 DIST_DIR := dist
 
+PYVER := $(shell $(PYTHON) -c "import sys;print(f'{sys.version_info[0]}{sys.version_info[1]}')")
+
 default: help
 
 ## Regenerate requirements files
@@ -69,12 +71,15 @@ docs-html:
 .PHONY: test docker release dist distclean requirements docs-html
 
 requirements.txt: requirements.in
-	$(PIP_COMPILE) --no-index --output-file=requirements.txt requirements.in
+	@if [ "$(PYVER)" != "37" ]; then \
+		echo "Run pip-compile under Python 3.7. See requirements.in"; exit 1; \
+	fi
+	$(PIP_COMPILE) --no-emit-index-url -o requirements.txt requirements.in
 
-dev-requirements.txt: dev-requirements.in
-	$(PIP_COMPILE) --no-index --output-file=dev-requirements.txt dev-requirements.in
+dev-requirements.txt: dev-requirements.in requirements.txt
+	$(PIP_COMPILE) --no-emit-index-url -o dev-requirements.txt dev-requirements.in
 
-$(DIST_DIR)/$(PACKAGE_NAME)-$(VERSION).tar.gz $(DIST_DIR)/$(PACKAGE_NAME)-$(VERSION)-py3-none-any.whl: $(SOURCE_FILES) setup.py | $(SENTINELS)/dist-setup
+$(DIST_DIR)/$(PACKAGE_NAME)-$(VERSION).tar.gz $(DIST_DIR)/$(PACKAGE_NAME)-$(VERSION)-py3-none-any.whl: $(SOURCE_FILES) setup.py VERSION README.md | $(SENTINELS)/dist-setup
 	$(PYTHON) setup.py sdist bdist_wheel
 
 $(SENTINELS):

diff --git a/dev-requirements.in b/dev-requirements.in
@@ -1,4 +1,7 @@
+-c requirements.txt
+
 pip-tools
+tox
 pytest
 pytest-flake8
 pytest-isort
@@ -13,7 +16,8 @@ types-python-dateutil
 types-PyYAML
 
 # Documentation Requirements
-sphinx~=4.5
-sphinx-autodoc-typehints[type_comments]
 recommonmark
 furo
+# https://github.com/PyCQA/flake8/pull/1438 - see requirements.in
+sphinx<4.4.0
+sphinx-autodoc-typehints[type_comments]<1.18.0
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,55 +1,80 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.7
 # To update, run:
 #
-#    pip-compile dev-requirements.in
+#    pip-compile --no-emit-index-url --output-file=dev-requirements.txt dev-requirements.in
 #
 alabaster==0.7.12
     # via sphinx
 attrs==21.4.0
     # via
     #   pytest
     #   pytest-mypy
-babel==2.9.1
+babel==2.10.1
     # via sphinx
-beautifulsoup4==4.10.0
+beautifulsoup4==4.11.1
     # via furo
 certifi==2021.10.8
-    # via requests
+    # via
+    #   -c requirements.txt
+    #   requests
 charset-normalizer==2.0.12
-    # via requests
+    # via
+    #   -c requirements.txt
+    #   requests
 click==8.1.2
-    # via pip-tools
+    # via
+    #   -c requirements.txt
+    #   pip-tools
 commonmark==0.9.1
     # via recommonmark
 coverage[toml]==6.3.2
     # via pytest-cov
+distlib==0.3.4
+    # via virtualenv
 docutils==0.17.1
     # via
     #   recommonmark
     #   sphinx
 filelock==3.6.0
-    # via pytest-mypy
+    # via
+    #   pytest-mypy
+    #   tox
+    #   virtualenv
 flake8==4.0.1
     # via pytest-flake8
-furo==2022.3.4
+furo==2022.4.7
     # via -r dev-requirements.in
 idna==3.3
     # via
+    #   -c requirements.txt
     #   requests
     #   yarl
 imagesize==1.3.0
     # via sphinx
-importlib-metadata==4.11.3
-    # via sphinx
+importlib-metadata==4.2.0 ; python_version < "3.8"
+    # via
+    #   -c requirements.txt
+    #   click
+    #   flake8
+    #   pep517
+    #   pluggy
+    #   pytest
+    #   pytest-isort
+    #   tox
+    #   virtualenv
 iniconfig==1.1.1
     # via pytest
 isort==5.10.1
     # via pytest-isort
 jinja2==3.1.1
-    # via sphinx
+    # via
+    #   -c requirements.txt
+    #   sphinx
 markupsafe==2.1.1
-    # via jinja2
+    # via
+    #   -c requirements.txt
+    #   jinja2
 mccabe==0.6.1
     # via flake8
 multidict==6.0.2
@@ -60,27 +85,37 @@ mypy-extensions==0.4.3
     # via mypy
 packaging==21.3
     # via
+    #   -c requirements.txt
     #   pytest
     #   sphinx
+    #   tox
 pep517==0.12.0
     # via pip-tools
 pip-tools==6.6.0
     # via -r dev-requirements.in
+platformdirs==2.5.2
+    # via virtualenv
 pluggy==1.0.0
-    # via pytest
+    # via
+    #   pytest
+    #   tox
 py==1.11.0
-    # via pytest
+    # via
+    #   pytest
+    #   tox
 pycodestyle==2.8.0
     # via flake8
 pyflakes==2.4.0
     # via flake8
-pygments==2.11.2
+pygments==2.12.0
     # via
     #   furo
     #   sphinx
-pyparsing==3.0.7
-    # via packaging
-pytest==7.1.1
+pyparsing==3.0.8
+    # via
+    #   -c requirements.txt
+    #   packaging
+pytest==7.1.2
     # via
     #   -r dev-requirements.in
     #   pytest-cov
@@ -104,24 +139,32 @@ pytest-vcr==1.0.2
 pytz==2022.1
     # via babel
 pyyaml==6.0
-    # via vcrpy
+    # via
+    #   -c requirements.txt
+    #   vcrpy
 recommonmark==0.7.1
     # via -r dev-requirements.in
 requests==2.27.1
-    # via sphinx
+    # via
+    #   -c requirements.txt
+    #   sphinx
 six==1.16.0
-    # via vcrpy
+    # via
+    #   -c requirements.txt
+    #   tox
+    #   vcrpy
+    #   virtualenv
 snowballstemmer==2.2.0
     # via sphinx
-soupsieve==2.3.1
+soupsieve==2.3.2.post1
     # via beautifulsoup4
-sphinx==4.5.0
+sphinx==4.3.2
     # via
     #   -r dev-requirements.in
     #   furo
     #   recommonmark
     #   sphinx-autodoc-typehints
-sphinx-autodoc-typehints[type_comments]==1.17.0
+sphinx-autodoc-typehints[type_comments]==1.17.1
     # via -r dev-requirements.in
 sphinxcontrib-applehelp==1.0.2
     # via sphinx
@@ -135,36 +178,55 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
+toml==0.10.2
+    # via tox
 tomli==2.0.1
     # via
     #   coverage
     #   mypy
     #   pep517
     #   pytest
-types-cryptography==3.3.19
+tox==3.25.0
+    # via -r dev-requirements.in
+typed-ast==1.5.3
+    # via
+    #   mypy
+    #   sphinx-autodoc-typehints
+types-cryptography==3.3.20
     # via types-jwt
 types-jwt==0.1.3
     # via -r dev-requirements.in
-types-python-dateutil==2.8.10
+types-python-dateutil==2.8.12
     # via -r dev-requirements.in
 types-pytz==2021.3.6
     # via -r dev-requirements.in
-types-pyyaml==6.0.5
+types-pyyaml==6.0.7
     # via -r dev-requirements.in
-typing-extensions==4.1.1
-    # via mypy
+typing-extensions==4.2.0
+    # via
+    #   -c requirements.txt
+    #   importlib-metadata
+    #   mypy
+    #   yarl
 urllib3==1.26.9
-    # via requests
+    # via
+    #   -c requirements.txt
+    #   requests
 vcrpy==4.1.1
     # via pytest-vcr
+virtualenv==20.14.1
+    # via tox
 wheel==0.37.1
     # via pip-tools
 wrapt==1.14.0
     # via vcrpy
 yarl==1.7.2
     # via vcrpy
 zipp==3.8.0
-    # via importlib-metadata
+    # via
+    #   -c requirements.txt
+    #   importlib-metadata
+    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

diff --git a/pytest.ini b/pytest.ini
@@ -1,6 +1,7 @@
 [pytest]
 addopts = --flake8 --isort --mypy --doctest-modules
-
+testpaths =
+    tests
 env =
     D:AZURE_CONNECTION_STRING=
     D:AZURE_CONTAINER=

diff --git a/requirements.in b/requirements.in
@@ -20,3 +20,7 @@ flask-classful~=0.15.0b1
 azure-storage-blob~=12.11
 google-cloud-storage~=1.28
 boto3~=1.21
+
+# https://github.com/PyCQA/flake8/pull/1438
+# pip-compile doesn't support env specifiers, so we need to run it under Py3.7
+importlib-metadata<4.3; python_version < '3.8'