CI: Split basic and optional dependencies

Author: effigies

.github/workflows/misc.yml

@@ -18,9 +18,10 @@ jobs:
         install: ['setup']
         check: ['style', 'doc']
         pip-flags: ['']
-        depends: ['DEFAULT_DEPENDS']
+        depends: ['REQUIREMENTS']
     env:
       DEPENDS: ${{ matrix.depends }}
+      OPTIONAL_DEPENDS: ${{ matrix.optional-depends }}
       INSTALL_TYPE: ${{ matrix.install }}
       CHECK_TYPE: ${{ matrix.check }}
       EXTRA_PIP_FLAGS: ${{ matrix.pip-flags }}

.github/workflows/pre-release.yml

@@ -21,15 +21,17 @@ jobs:
         install: ['setup']
         check: ['test']
         pip-flags: ['PRE_PIP_FLAGS']
-        depends: ['DEFAULT_DEPENDS']
+        depends: ['REQUIREMENTS']
+        optional-depends: ['DEFAULT_OPT_DEPENDS']
         include:
           # Pydicom master
           - os: ubuntu-latest
             python-version: 3.8
             install: setup
             check: test
             pip-flags: ''
-            depends: PYDICOM_MASTER
+            depends: REQUIREMENTS
+            optional-depends: PYDICOM_MASTER
         exclude:
           - os: ubuntu-latest
             architecture: x86
@@ -42,6 +44,7 @@ jobs:
 
     env:
       DEPENDS: ${{ matrix.depends }}
+      OPTIONAL_DEPENDS: ${{ matrix.optional-depends }}
       INSTALL_TYPE: ${{ matrix.install }}
       CHECK_TYPE: ${{ matrix.check }}
       EXTRA_PIP_FLAGS: ${{ matrix.pip-flags }}

.github/workflows/stable.yml

@@ -24,7 +24,8 @@ jobs:
         install: ['setup']
         check: ['test']
         pip-flags: ['']
-        depends: ['DEFAULT_DEPENDS']
+        depends: ['REQUIREMENTS']
+        optional-depends: ['DEFAULT_OPT_DEPENDS']
         include:
           # Basic dependencies only
           - os: ubuntu-latest
@@ -33,20 +34,23 @@ jobs:
             check: test
             pip-flags: ''
             depends: REQUIREMENTS
+            optional-depends: ''
           # Absolute minimum dependencies
           - os: ubuntu-latest
             python-version: 3.6
             install: setup
             check: test
             pip-flags: ''
             depends: MIN_REQUIREMENTS
+            optional-depends: ''
           # Absolute minimum dependencies plus old MPL, Pydicom, Pillow
           - os: ubuntu-latest
             python-version: 3.6
             install: setup
             check: test
             pip-flags: ''
-            depends: MIN_REQUIREMENTS_PLUS
+            depends: MIN_REQUIREMENTS
+            optional-depends: MIN_OPT_DEPENDS
           # Clean install imports only with package-declared dependencies
           - os: ubuntu-latest
             python-version: 3.6
@@ -60,26 +64,30 @@ jobs:
             install: wheel
             check: test
             pip-flags: ''
-            depends: DEFAULT_DEPENDS
+            depends: REQUIREMENTS
+            optional-depends: DEFAULT_OPT_DEPENDS
           - os: ubuntu-latest
             python-version: 3.8
             install: sdist
             check: test
             pip-flags: ''
-            depends: DEFAULT_DEPENDS
+            depends: REQUIREMENTS
+            optional-depends: DEFAULT_OPT_DEPENDS
           - os: ubuntu-latest
             python-version: 3.8
             install: archive
             check: test
             pip-flags: ''
-            depends: DEFAULT_DEPENDS
+            depends: REQUIREMENTS
+            optional-depends: DEFAULT_OPT_DEPENDS
         exclude:
           - os: ubuntu-latest
             architecture: x86
           - os: macos-latest
             architecture: x86
     env:
       DEPENDS: ${{ matrix.depends }}
+      OPTIONAL_DEPENDS: ${{ matrix.optional-depends }}
       INSTALL_TYPE: ${{ matrix.install }}
       CHECK_TYPE: ${{ matrix.check }}
       EXTRA_PIP_FLAGS: ${{ matrix.pip-flags }}

tools/ci/env.sh

@@ -1,15 +1,15 @@
 SETUP_REQUIRES="pip setuptools>=30.3.0 wheel"
 
-# Dependencies that should always be installable
-DEFAULT_DEPENDS="numpy scipy matplotlib pillow pydicom h5py indexed_gzip"
-# pydicom has skipped some important pre-releases, so enable a check against master
-PYDICOM_MASTER="numpy git+https://github.com/pydicom/pydicom.git@master"
-
 # Minimum requirements
 REQUIREMENTS="-r requirements.txt"
 # Minimum versions of minimum requirements
 MIN_REQUIREMENTS="-r min-requirements.txt"
-MIN_REQUIREMENTS_PLUS="-r min-requirements.txt matplotlib==1.5.3 pydicom==0.9.9 pillow==2.6"
+
+DEFAULT_OPT_DEPENDS="scipy matplotlib pillow pydicom h5py indexed_gzip"
+# pydicom has skipped some important pre-releases, so enable a check against master
+PYDICOM_MASTER="git+https://github.com/pydicom/pydicom.git@master"
+# Minimum versions of optional requirements
+MIN_OPT_DEPENDS="matplotlib==1.5.3 pydicom==0.9.9 pillow==2.6"
 
 # Numpy and scipy upload nightly/weekly/intermittent wheels
 NIGHTLY_WHEELS="https://pypi.anaconda.org/scipy-wheels-nightly/simple"

tools/ci/install_dependencies.sh

@@ -10,6 +10,7 @@ set -eu
 # Required variables
 echo EXTRA_PIP_FLAGS = $EXTRA_PIP_FLAGS
 echo DEPENDS = $DEPENDS
+echo OPTIONAL_DEPENDS = $OPTIONAL_DEPENDS
 
 set -x
 
@@ -19,6 +20,11 @@ fi
 
 if [ -n "$DEPENDS" ]; then
     pip install ${EXTRA_PIP_FLAGS} --prefer-binary ${!DEPENDS}
+    if [ -n "$OPTIONAL_DEPENDS" ]; then
+        for DEP in ${!OPTIONAL_DEPENDS}; do
+            pip install ${EXTRA_PIP_FLAGS} --prefer-binary $DEP || true
+	done
+    fi
 fi
 
 set +eux