[deps] special casing pyproject.toml is no longer necessary

Author: renefritze

.ci/PYPI_MIRROR_TAG

@@ -1 +1 @@
-e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+82a1891bc39e3f67d5009e9383f16abd44bc871c

.ci/gitlab/ci.yml

@@ -21,7 +21,7 @@ stages:
     except:
         - /^staging/.*$/i
     variables:
-        PYPI_MIRROR_TAG: e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        PYPI_MIRROR_TAG: 82a1891bc39e3f67d5009e9383f16abd44bc871c
 
 
 .pytest:
@@ -149,7 +149,7 @@ ci setup:
 minimal_cpp_demo:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.7:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.7:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.7:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -158,7 +158,7 @@ minimal_cpp_demo:
 mpi 3 6:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.6:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.6:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.6:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -167,7 +167,7 @@ mpi 3 6:
 mpi 3 7:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.7:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.7:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.7:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -176,7 +176,7 @@ mpi 3 7:
 mpi 3 8:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.8:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.8:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.8:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -185,7 +185,7 @@ mpi 3 8:
 notebooks_dir 3 6:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.6:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.6:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.6:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -194,7 +194,7 @@ notebooks_dir 3 6:
 notebooks_dir 3 7:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.7:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.7:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.7:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -203,7 +203,7 @@ notebooks_dir 3 7:
 notebooks_dir 3 8:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.8:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.8:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.8:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -212,7 +212,7 @@ notebooks_dir 3 8:
 pip_installed 3 6:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.6:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.6:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.6:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -221,7 +221,7 @@ pip_installed 3 6:
 pip_installed 3 7:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.7:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.7:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.7:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -230,7 +230,7 @@ pip_installed 3 7:
 pip_installed 3 8:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.8:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.8:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.8:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -239,7 +239,7 @@ pip_installed 3 8:
 vanilla 3 6:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.6:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.6:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.6:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -248,7 +248,7 @@ vanilla 3 6:
 vanilla 3 7:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.7:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.7:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.7:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -257,7 +257,7 @@ vanilla 3 7:
 vanilla 3 8:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.8:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.8:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.8:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -266,7 +266,7 @@ vanilla 3 8:
 numpy_git 3 8:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_stable_py3.8:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_stable_py3.8:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.8:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
@@ -275,7 +275,7 @@ numpy_git 3 8:
 oldest 3 6:
     extends: .pytest
     services:
-        - name: pymor/pypi-mirror_oldest_py3.6:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e
+        - name: pymor/pypi-mirror_oldest_py3.6:82a1891bc39e3f67d5009e9383f16abd44bc871c
 
           alias: pypi_mirror
     image: pymor/testing_py3.6:e51f12f3ab2a6d9e7d472fb6ce8d89db41af126e

Makefile

@@ -56,6 +56,7 @@ docs:
 	PYTHONPATH=${PWD}/src/:${PYTHONPATH} make -C docs html
 
 template: docker_file
+	./dependencies.py
 	./.ci/gitlab/template.ci.py
 
 # Docker targets

dependencies.py

@@ -16,17 +16,14 @@ def _pymess(rev, major, minor, marker=True):
         return '{url} ; python_version == "{major}.{minor}" and "linux" in sys_platform'.format(url=url, major=major, minor=minor)
     return url
 
-# for pyproject.toml we require equality to build compatible wheels in pep 517 mode
-def setup_requires(toml=False):
+def setup_requires():
     NUMPY = '1.16.0'
     # numpy versions with filters according to minimal version with a wheel
     numpys = ['numpy>={};python_version == "3.6"'.format(NUMPY),
       'numpy>=1.15.4;python_version == "3.7"',
       'numpy>=1.17.5;python_version == "3.8"',
       'numpy>={};python_version != "3.6" and python_version != "3.7" and python_version != "3.8"'.format(NUMPY),]
     other = ['setuptools>=40.8.0', 'wheel', 'pytest-runner>=2.9', 'cython>=0.28', 'packaging',]
-    if toml:
-        numpys = [f.replace('numpy>=', 'numpy==') for f in numpys]
     return numpys + other
 
 install_requires = ['scipy>=1.1;python_version < "3.8"','scipy>=1.3.3;python_version >= "3.8"', 'Qt.py>=1.2.4', 'packaging','diskcache', 'docopt-ng'] + setup_requires()
@@ -46,8 +43,8 @@ def setup_requires(toml=False):
                     'pillow': 'image library used for bitmap data functions'}
 doc_requires = ['sphinx>=1.7', 'pymor-nb2plots>=0.7', 'matplotlib', 'PySide2', 'ipyparallel',
                 'ipywidgets', 'sphinx-qt-documentation'] + install_requires
-ci_requires = [_PYTEST, 'pytest-cov', 'pytest-xdist', 'check-manifest', 'nbconvert', 'pytest-parallel', 'virtualenv', 
-               'readme_renderer[md]', 'rstcheck', 'codecov', 'twine', 'pytest-memprof', 'pytest-timeout', 
+ci_requires = [_PYTEST, 'pytest-cov', 'pytest-xdist', 'check-manifest', 'nbconvert', 'pytest-parallel', 'virtualenv',
+               'readme_renderer[md]', 'rstcheck', 'codecov', 'twine', 'pytest-memprof', 'pytest-timeout',
                'testipynb', "pypi-oldest-requirements>=2020.2", 'pytest-deadfixtures']
 import_names = {'ipython': 'IPython',
                 'pytest-cache': 'pytest_cache',
@@ -131,4 +128,4 @@ def _candidates(blacklist):
             req.write(module+'\n')
     with open(os.path.join(os.path.dirname(__file__), 'pyproject.toml'), 'wt') as toml:
         toml.write(note)
-        toml.write(toml_tpl.format(str(setup_requires(toml=True))))
+        toml.write(toml_tpl.format(str(setup_requires())))

pyproject.toml

@@ -1,4 +1,4 @@
 # This file is autogenerated. Edit dependencies.py instead
 [build-system]
-requires = ['numpy==1.16.0;python_version == "3.6"', 'numpy==1.15.4;python_version == "3.7"', 'numpy==1.17.5;python_version == "3.8"', 'numpy==1.16.0;python_version != "3.6" and python_version != "3.7" and python_version != "3.8"', 'setuptools>=40.8.0', 'wheel', 'pytest-runner>=2.9', 'cython>=0.28', 'packaging']
+requires = ['numpy>=1.16.0;python_version == "3.6"', 'numpy>=1.15.4;python_version == "3.7"', 'numpy>=1.17.5;python_version == "3.8"', 'numpy>=1.16.0;python_version != "3.6" and python_version != "3.7" and python_version != "3.8"', 'setuptools>=40.8.0', 'wheel', 'pytest-runner>=2.9', 'cython>=0.28', 'packaging']
 build-backend = "setuptools.build_meta"