Merge pull request #629 from k4cg/3.0-dev_reverted_req_fix

reverted parts of #607 since pip-tools 6.2 support "skip-extras"
k4cg · Jul 4, 2021 · 7813acf · 7813acf
2 parents f4ff34e + ce9fbfc
commit 7813acf
Show file tree

Hide file tree

Showing 20 changed files with 148 additions and 141 deletions.
diff --git a/.github/workflows/test-python-package.yaml b/.github/workflows/test-python-package.yaml
@@ -121,7 +121,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U wheel setuptools pip
-          python -m pip install -r requirements/tox.txt
+          python -m pip install tox -c requirements/tox.txt
       - name: Test ${{ env.project-directory }}
         id: tests
         run:
@@ -219,7 +219,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U wheel setuptools pip
-          python -m pip install -r requirements/tests.txt -r requirements/tox.txt
+          python -m pip install coverage tox -c requirements/tests.txt -c requirements/tox.txt
       - name: Merge pytest-reports
         run: python -m tox -r -e pytests_merge
       - name: Merge coverage

diff --git a/.github/workflows/test-python-plugin-example.yaml b/.github/workflows/test-python-plugin-example.yaml
@@ -192,7 +192,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U wheel setuptools pip
-          python -m pip install -r requirements/tests.txt -r requirements/tox.txt
+          python -m pip install coverage tox -c requirements/tests.txt -c requirements/tox.txt
       - name: Merge pytest-reports
         run: python -m tox -r -e pytests_merge
       - name: Merge pytest-coverage

diff --git a/python-package/bin/requirements_bump.sh b/python-package/bin/requirements_bump.sh
@@ -9,4 +9,4 @@ cd "$(dirname "$(dirname "$0")")"
 
 find "${REQUIREMENTS_DIR}" -type f -name '*.in' \
   -exec echo 'precessing {}' \; \
-  -exec pip-compile -qUr --header --annotate {} \;
+  -exec pip-compile -qUr --strip-extras --header --annotate {} \;
diff --git a/python-package/requirements/build.txt b/python-package/requirements/build.txt
@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    pip-compile requirements/build.in
+#    pip-compile --strip-extras requirements/build.in
 #
 pep517==0.10.0
     # via -r requirements/build.in

diff --git a/python-package/requirements/constraints.txt b/python-package/requirements/constraints.txt
@@ -12,3 +12,6 @@
     setuptools >= 41.0
     # for CLI:
     click >= 7.1 , < 8.0
+
+# constraint from certain issues during testing
+    mypy < 0.900 # mypy introduced a lot of new stuff that was not incorporated into this project
diff --git a/python-package/requirements/dev.txt b/python-package/requirements/dev.txt
@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    pip-compile requirements/dev.in
+#    pip-compile --strip-extras requirements/dev.in
 #
 appdirs==1.4.4
     # via virtualenv
@@ -16,16 +16,24 @@ click==7.1.2
     # via
     #   -c requirements/constraints.txt
     #   pip-tools
-coverage[toml]==5.5
+coverage==5.5
     # via
     #   -r requirements/tests.in
     #   pytest-cov
-distlib==0.3.1
+distlib==0.3.2
     # via virtualenv
 filelock==3.0.12
     # via
     #   tox
     #   virtualenv
+flake8==3.9.2
+    # via
+    #   -r requirements/style.in
+    #   flake8-annotations
+    #   flake8-bugbear
+    #   flake8-isort
+    #   flake8-polyfill
+    #   flake8-use-fstring
 flake8-annotations==2.6.2
     # via -r requirements/style.in
 flake8-bugbear==21.4.3
@@ -36,47 +44,33 @@ flake8-polyfill==1.0.2
     # via pep8-naming
 flake8-use-fstring==1.1
     # via -r requirements/style.in
-flake8==3.9.2
-    # via
-    #   -r requirements/style.in
-    #   flake8-annotations
-    #   flake8-bugbear
-    #   flake8-isort
-    #   flake8-polyfill
-    #   flake8-use-fstring
 future==0.18.2
     # via junitparser
-importlib-metadata==4.3.1
-    # via
-    #   flake8
-    #   pep517
-    #   pluggy
-    #   pytest
-    #   tox
-    #   virtualenv
 iniconfig==1.1.1
     # via pytest
-isort==5.8.0
+isort==5.9.1
     # via
     #   -r requirements/dev.in
     #   flake8-isort
-junitparser==2.0.0
+junitparser==2.1.1
     # via -r requirements/tests.in
 mccabe==0.6.1
     # via flake8
+mypy==0.812
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/style.in
 mypy-extensions==0.4.3
     # via mypy
-mypy==0.812
-    # via -r requirements/style.in
-packaging==20.9
+packaging==21.0
     # via
     #   pytest
     #   tox
 pep517==0.10.0
     # via pip-tools
 pep8-naming==0.11.1
     # via -r requirements/style.in
-pip-tools==6.1.0
+pip-tools==6.2.0
     # via -r requirements/dev.in
 pluggy==0.13.1
     # via
@@ -94,15 +88,15 @@ pyflakes==2.3.1
     # via flake8
 pyparsing==2.4.7
     # via packaging
-pytest-cov==2.12.0
-    # via -r requirements/tests.in
-pytest-mock==3.6.1
-    # via -r requirements/tests.in
 pytest==6.2.4
     # via
     #   -r requirements/tests.in
     #   pytest-cov
     #   pytest-mock
+pytest-cov==2.12.1
+    # via -r requirements/tests.in
+pytest-mock==3.6.1
+    # via -r requirements/tests.in
 six==1.16.0
     # via
     #   tox
@@ -112,27 +106,21 @@ testfixtures==6.17.1
 toml==0.10.2
     # via
     #   autopep8
-    #   coverage
     #   pep517
     #   pytest
+    #   pytest-cov
     #   tox
 tox==3.23.1
     # via -r requirements/tox.in
 typed-ast==1.4.3
-    # via
-    #   flake8-annotations
-    #   mypy
-typing-extensions==3.10.0.0 ; python_version < "3.8"
-    # via
-    #   -c requirements/constraints.txt
-    #   importlib-metadata
-    #   mypy
+    # via mypy
+typing-extensions==3.10.0.0
+    # via mypy
 virtualenv==20.4.7
     # via tox
-zipp==3.4.1
-    # via
-    #   importlib-metadata
-    #   pep517
+wheel==0.36.2
+    # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
+# setuptools
diff --git a/python-package/requirements/style.txt b/python-package/requirements/style.txt
@@ -1,11 +1,18 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    pip-compile requirements/style.in
+#    pip-compile --strip-extras requirements/style.in
 #
 attrs==21.2.0
     # via flake8-bugbear
+flake8==3.9.2
+    # via
+    #   -r requirements/style.in
+    #   flake8-annotations
+    #   flake8-bugbear
+    #   flake8-isort
+    #   flake8-use-fstring
 flake8-annotations==2.6.2
     # via -r requirements/style.in
 flake8-bugbear==21.4.3
@@ -16,21 +23,16 @@ flake8-polyfill==1.0.2
     # via pep8-naming
 flake8-use-fstring==1.1
     # via -r requirements/style.in
-flake8==3.9.2
-    # via
-    #   -r requirements/style.in
-    #   flake8-annotations
-    #   flake8-bugbear
-    #   flake8-isort
-    #   flake8-use-fstring
-isort==5.8.0
+isort==5.9.1
     # via flake8-isort
 mccabe==0.6.1
     # via flake8
+mypy==0.812
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/style.in
 mypy-extensions==0.4.3
     # via mypy
-mypy==0.812
-    # via -r requirements/style.in
 pep8-naming==0.11.1
     # via -r requirements/style.in
 pycodestyle==2.7.0

diff --git a/python-package/requirements/tests.txt b/python-package/requirements/tests.txt
@@ -1,39 +1,39 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    pip-compile requirements/tests.in
+#    pip-compile --strip-extras requirements/tests.in
 #
 attrs==21.2.0
     # via pytest
-coverage[toml]==5.5
+coverage==5.5
     # via
     #   -r requirements/tests.in
     #   pytest-cov
 future==0.18.2
     # via junitparser
 iniconfig==1.1.1
     # via pytest
-junitparser==2.0.0
+junitparser==2.1.1
     # via -r requirements/tests.in
-packaging==20.9
+packaging==21.0
     # via pytest
 pluggy==0.13.1
     # via pytest
 py==1.10.0
     # via pytest
 pyparsing==2.4.7
     # via packaging
-pytest-cov==2.12.0
-    # via -r requirements/tests.in
-pytest-mock==3.6.1
-    # via -r requirements/tests.in
 pytest==6.2.4
     # via
     #   -r requirements/tests.in
     #   pytest-cov
     #   pytest-mock
+pytest-cov==2.12.1
+    # via -r requirements/tests.in
+pytest-mock==3.6.1
+    # via -r requirements/tests.in
 toml==0.10.2
     # via
-    #   coverage
     #   pytest
+    #   pytest-cov
diff --git a/python-package/requirements/tox.txt b/python-package/requirements/tox.txt
@@ -1,23 +1,18 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    pip-compile requirements/tox.in
+#    pip-compile --strip-extras requirements/tox.in
 #
 appdirs==1.4.4
     # via virtualenv
-distlib==0.3.1
+distlib==0.3.2
     # via virtualenv
 filelock==3.0.12
     # via
     #   tox
     #   virtualenv
-importlib-metadata==4.3.1
-    # via
-    #   pluggy
-    #   tox
-    #   virtualenv
-packaging==20.9
+packaging==21.0
     # via tox
 pluggy==0.13.1
     # via tox
@@ -33,11 +28,5 @@ toml==0.10.2
     # via tox
 tox==3.23.1
     # via -r requirements/tox.in
-typing-extensions==3.10.0.0 ; python_version < "3.8"
-    # via
-    #   -c requirements/constraints.txt
-    #   importlib-metadata
 virtualenv==20.4.7
     # via tox
-zipp==3.4.1
-    # via importlib-metadata
diff --git a/python-package/tox.ini b/python-package/tox.ini
@@ -22,6 +22,7 @@ download = False
 depends = tests_start
 deps =
     -r requirements/tests.txt
+    -c requirements/dev.txt
 setenv =
     NP_TESTLOG_NAME = {env:NP_TESTLOG_NAME:}_{envname}
 extras =
@@ -36,20 +37,22 @@ commands =
 depends =
 skip_install = True
 deps =
-    -r requirements/tests.txt
+    coverage
+    -c requirements/dev.txt
 setenv =
     NP_TESTLOG_NAME =
 commands =
     {envpython} -m coverage erase
-    {envpython} -c 'import shutil; shutil.rmtree("reports", True);'
+    {envpython} -c 'import shutil; shutil.rmtree("reports", True)'
 
 [testenv:coverage_report]
 depends =
     tests_start
     py{39, 38,37,36}
 skip_install = True
 deps =
-    -r requirements/tests.txt
+    coverage
+    -c requirements/dev.txt
 setenv =
     NP_TESTLOG_NAME =
 commands =
@@ -63,6 +66,7 @@ depends =
 skip_install = True
 deps =
     junitparser
+    -c requirements/dev.txt
 setenv =
     NP_TESTLOG_NAME =
 commands =
@@ -74,6 +78,7 @@ skip_install = True
 deps =
     -r requirements/style.txt
     -r requirements/tests.txt # to analyse tests
+    -c requirements/dev.txt
 setenv =
     NP_TESTLOG_NAME =
 commands =
@@ -96,7 +101,7 @@ setenv =
     NP_TESTLOG_NAME =
     NP_DIST_DIR = {env:NP_DIST_DIR:dist}
 commands =
-    {envpython} -c 'import shutil; shutil.rmtree("build", True); shutil.rmtree("{env:NP_DIST_DIR}", True);'
+    {envpython} -c 'import shutil; shutil.rmtree("build", True); shutil.rmtree("{env:NP_DIST_DIR}", True)'
     {envpython} -m pep517.build --source --binary --out-dir {env:NP_DIST_DIR} .
 
 [testenv:install]