Fix broken CI for package only PRs, make dateutil not strictly required (spack#24484)

alalazo · web-flow · commit 1bccd866ae59 · 2021-06-23T07:56:07.000-04:00
* Force the Python interpreter with an env variable This commit forces the Python interpreter with an environment variable, to ensure that the Python set by the "setup-python" action is the one being used. Due to the policy adopted by Spack to prefer python3 over python we may end up picking a Python 3.X interpreter where Python 2.7 was meant to be used. * Revert "Update conftest.py (spack#24473)" This reverts commit 477c8ce. * Make python-dateutil a soft dependency for unit tests Before spack#23212 people could clone spack and run ``` spack unit-tests ``` while now this is not possible, since python-dateutil is a required but not vendored dependency. This change makes it not a hard requirement, i.e. it will be used if found in the current interpreter. * Workaround mypy complaint
diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml
@@ -156,13 +156,16 @@ jobs:
           make -C ${KCOV_ROOT}/build && sudo  make -C ${KCOV_ROOT}/build install
     - name: Bootstrap clingo from sources
       if: ${{ matrix.concretizer == 'clingo' }}
+      env:
+          SPACK_PYTHON: python
       run: |
           . share/spack/setup-env.sh
           spack external find --not-buildable cmake bison
           spack -v solve zlib
     - name: Run unit tests (full suite with coverage)
       if: ${{ needs.changes.outputs.with_coverage == 'true' }}
       env:
+          SPACK_PYTHON: python
           COVERAGE: true
           SPACK_TEST_SOLVER: ${{ matrix.concretizer }}
       run: |
@@ -172,6 +175,7 @@ jobs:
     - name: Run unit tests (reduced suite without coverage)
       if: ${{ needs.changes.outputs.with_coverage == 'false' }}
       env:
+          SPACK_PYTHON: python
           ONLY_PACKAGES: true
           SPACK_TEST_SOLVER: ${{ matrix.concretizer }}
       run: |
diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py
@@ -12,20 +12,19 @@
 import os.path
 import re
 import shutil
-import sys
 import tempfile
 import xml.etree.ElementTree
 
-if sys.version_info >= (3,):
+try:
     # CVS outputs dates in different formats on different systems. We are using
     # the dateutil package to parse these dates. This package does not exist
-    # for Python 2.x. That means that we cannot test checkouts "by date" for
+    # for Python <2.7. That means that we cannot test checkouts "by date" for
     # CVS respositories. (We can still use CVS repos with all features, only
     # our tests break.)
     from dateutil.parser import parse as parse_date
-else:
-    def parse_date(string):
-        pytest.skip("dateutil package not available for Python 2.6")
+except ImportError:
+    def parse_date(string):  # type: ignore
+        pytest.skip("dateutil package not available")
 
 import py
 import pytest
