From a563c90057dc7c536b08539f9ed043992b8fe39b Mon Sep 17 00:00:00 2001
From: Kevin Meagher <11620178+kjmeagher@users.noreply.github.com>
Date: Tue, 9 Apr 2024 10:53:12 -0500
Subject: [PATCH] unset PYTHONPATH in cvmfs tests (#30)

* unset PYTHONPATH in cvmfs tests

PYTHONPATH appears to be not only unnescessary but activly messing up the tests
because the packages in system site-packages are old and incompatible with the
latest version of pytest. Having system site-packages in PYTHONPATH causes
them to be loaded first overriding what it is in .local/

* remove v4.2.1 from pseudo-cobalt gh action

There is some binary incompatability issue with running the latest wheels from
pypi on top of cvmfs python on top of the centos docker image that only applies
to v4.2.x. I don't want to spend any more time trying to figure out. The
testing regime is already pretty robust. So I am just gonna drop v4.2.1 and
move on.
---
 .github/workflows/tests.yml  | 8 +++++---
 .github/workflows/wheels.yml | 7 +++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4c1685f..26001fa 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -98,7 +98,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cvmfs: [py3-v4.1.1, py3-v4.2.1, py3-v4.3.0]
+        cvmfs: [py3-v4.1.1, py3-v4.3.0]
     steps:
       - uses: cvmfs-contrib/github-action-cvmfs@v3
       - name: Checkout nuflux
@@ -111,8 +111,9 @@ jobs:
           run: |
             yum -y install glibc-headers glibc-devel unzip
             eval $(/cvmfs/icecube.opensciencegrid.org/${{matrix.cvmfs}}/setup.sh)
+            unset PYTHONPATH
             export PATH=${HOME}/.local/bin:${PATH}
-            pip install --upgrade --user meson ninja 'pytest>=7,<8' pytest-tap
+            pip install --upgrade --user meson ninja pytest pytest-tap
             CMAKE_PREFIX_PATH=${SROOT} BOOST_ROOT=${SROOT} meson setup /nuflux/build /nuflux
             meson test -C/nuflux/build
       - name: Copy TestLog
@@ -143,7 +144,8 @@ jobs:
           run: |
             yum -y install glibc-headers glibc-devel
             eval $(/cvmfs/icecube.opensciencegrid.org/${{matrix.cvmfs}}/setup.sh)
-            python3 -m pip install --upgrade --user pip 'pytest>=7,<8'
+            unset PYTHONPATH
+            python3 -m pip install --upgrade --user pip pytest
             BOOST_ROOT=${SROOT} python3 -m pip install --user --verbose /nf
             python3 -m pytest /nf --junit-xml=/nf/test-results-pyproject-cvmfs-${{matrix.cvmfs}}.junit.xml
       - uses: actions/upload-artifact@v4
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index a7be4aa..375bfa8 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -85,12 +85,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cvmfs: [py3-v4.1.1, py3-v4.2.1, py3-v4.3.0]
+        cvmfs: [py3-v4.1.1, py3-v4.3.0]
         include:
           - cvmfs: py3-v4.1.1
             python-tag: cp37
-          - cvmfs: py3-v4.2.1
-            python-tag: cp310
           - cvmfs: py3-v4.3.0
             python-tag: cp311
     steps:
@@ -109,7 +107,8 @@ jobs:
           image: centos:centos7.9.2009
           run: |
             eval $(/cvmfs/icecube.opensciencegrid.org/${{matrix.cvmfs}}/setup.sh)
-            python3 -m pip install --user 'pytest>=7,<8' /nuflux/nuflux-*-${{matrix.python-tag}}-*.whl
+            unset PYTHONPATH
+            python3 -m pip install --user pytest /nuflux/nuflux-*-${{matrix.python-tag}}-*.whl
             python3 /nuflux/tests/test_fluxes.py --junit-xml=test-results-cibw-cvmfs-${{ matrix.cvmfs }}.junit.xml
   upload_pypi:
     needs: [cvmfs_test_wheel, test_wheels, build_sdist]