From 1bccd866ae59ea3ea99585bc1788c1146391bb28 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 23 Jun 2021 13:56:07 +0200 Subject: Fix broken CI for package only PRs, make dateutil not strictly required (#24484) * 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 (#24473)" This reverts commit 477c8ce8205ec149fa897c9d83e530815c978d8b. * Make python-dateutil a soft dependency for unit tests Before #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 --- .github/workflows/unit_tests.yaml | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.github') diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index 6d5901edd1..726c56e617 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -156,6 +156,8 @@ 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 @@ -163,6 +165,7 @@ jobs: - 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: | -- cgit v1.2.3-70-g09d2