Update requirements

.github/workflows/build.yml

@@ -44,9 +44,9 @@ jobs:
           CIBW_ENVIRONMENT_LINUX: "SKBUILD_CONFIGURE_OPTIONS='-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=2;link=1'"
           CIBW_MANYLINUX_X86_64_IMAGE: dockcross/manylinux1-x64
           CIBW_MANYLINUX_I686_IMAGE: dockcross/manylinux1-x86
-          CIBW_BEFORE_BUILD: "pip install git+https://github.com/jcfr/wheeltools.git@wheeltools-2018-10-28-a2f174d0e"
+          CIBW_BEFORE_BUILD: "pip install -r requirements-repair.txt"
           CIBW_REPAIR_WHEEL_COMMAND: "python scripts/repair_wheel.py -w {dest_dir} {wheel}"
-          CIBW_TEST_REQUIRES: "-r requirements-dev.txt"
+          CIBW_TEST_REQUIRES: "-r requirements-test.txt"
           CIBW_TEST_COMMAND: "pytest {project}/tests"
 
       - uses: actions/upload-artifact@v2
@@ -84,12 +84,6 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
 
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends libssl-dev
-          pip install -r requirements-dev.txt
-
       - uses: actions/download-artifact@v2
         with:
           name: artifact
@@ -100,6 +94,9 @@ jobs:
           SKBUILD_CONFIGURE_OPTIONS: "-DBUILD_CMAKE_FROM_SOURCE:BOOL=OFF"
         run: pip install dist/*.tar.gz
 
+      - name: Install test dependencies
+        run: pip install -r requirements-test.txt
+
       - name: Test installed SDist
         run: pytest ./tests
 

.travis.yml

@@ -18,9 +18,9 @@ env:
     - CIBW_BUILD="cp39-*"
     - CIBW_BUILD_VERBOSITY="1"
     - CIBW_ENVIRONMENT_LINUX="SKBUILD_CONFIGURE_OPTIONS='-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link -DCMAKE_JOB_POOLS:STRING=compile=2;link=1'"
-    - CIBW_BEFORE_BUILD="pip install git+https://github.com/jcfr/wheeltools.git@wheeltools-2018-10-28-a2f174d0e"
+    - CIBW_BEFORE_BUILD="pip install -r requirements-repair.txt"
     - CIBW_REPAIR_WHEEL_COMMAND="python scripts/repair_wheel.py -w {dest_dir} {wheel}"
-    - CIBW_TEST_REQUIRES="-r requirements-dev.txt"
+    - CIBW_TEST_REQUIRES="-r requirements-test.txt"
     - CIBW_TEST_COMMAND="pytest {project}/tests"
 
 matrix:
@@ -32,7 +32,7 @@ matrix:
     - arch: s390x
 
 install:
-  - pip install cibuildwheel==1.11.0
+  - pip install -r requirements-deploy.txt cibuildwheel==1.11.0
 
 script:
   - |

MANIFEST.in

@@ -1,6 +1,6 @@
 include CMakeLists.txt
 include CMakeUrls.cmake
-include requirements-dev.txt
+include requirements-test.txt
 include HISTORY.rst
 include README.rst
 include LICENSE_Apache_20

requirements-deploy.txt

@@ -0,0 +1,8 @@
+twine
+
+# need to pin cryptography for manylinux1 builds & s390x/ppc64le builds
+# cryptography only provides manylinux2010 wheels since 3.4.0
+# because of the lack of a decent rust compiler on manylinux1
+# For s390x/ppc64le builds, cryptography never provided wheels, the requirements to
+# build from source are a relaxed when building the 3.3 series
+cryptography~=3.3.2 ; sys_platform=="linux" and platform_machine in "i386, i486, i586, i686, x86_64, s390x, ppc64le"

requirements-dev.txt

@@ -1,19 +1,7 @@
-codecov>=2.0.5
-coverage>=4.2
-flake8>=3.0.4
-path.py>=11.5.0
-pytest>=3.0.3
-pytest-cov>=2.4.0
-pytest-runner>=2.9
-pytest-virtualenv>=1.2.5
+-r requirements-test.txt
+-r requirements-repair.txt
+-r requirements-deploy.txt
 scikit-build>=0.10.0
 setuptools>=28.0.0
-twine
 virtualenv>=15.0.3
 wheel
-wheeltools
-
-# need to pin cryptography for manylinux1 builds
-# cryptography only provides manylinux2010 wheels since 3.4.0
-# because of the lack of a decent rust compiler on manylinux1
-cryptography~=3.3.2 ; sys_platform=="linux" and platform_machine in "i386, i486, i586, i686, x86_64"

requirements-repair.txt

@@ -0,0 +1 @@
+git+https://github.com/jcfr/wheeltools.git@wheeltools-2018-10-28-a2f174d0e

requirements-test.txt

@@ -0,0 +1,7 @@
+codecov>=2.0.5
+coverage>=4.2
+flake8>=3.0.4
+path.py>=11.5.0
+pytest>=3.0.3
+pytest-cov>=2.4.0
+pytest-runner>=2.9

setup.py

@@ -26,7 +26,7 @@ def parse_requirements(filename):
 
 
 requirements = []
-dev_requirements = parse_requirements('requirements-dev.txt')
+test_requirements = parse_requirements('requirements-test.txt')
 
 # Require pytest-runner only when running tests
 pytest_runner = (['pytest-runner>=2.0,<3dev']
@@ -89,6 +89,6 @@ def parse_requirements(filename):
     keywords='CMake build c++ fortran cross-platform cross-compilation',
 
     install_requires=requirements,
-    tests_require=dev_requirements,
+    tests_require=test_requirements,
     setup_requires=setup_requires
 )