Merge pull request #3 from MDAnalysis/fix-39-bump

Fix CI for py39 removal
MDAnalysis · Mar 17, 2024 · 3f887af · 3f887af
2 parents 698caf8 + b9fd3fe
commit 3f887af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml
@@ -60,15 +60,15 @@ jobs:
       shell: bash
       run: |
         echo "test 1"
-        python utils/assert_varray.py --input ${{ toJSON(steps.default-matrix.outputs.python-versions) }} --target '["3.9", "3.10", "3.11", "3.12"]'
+        python utils/assert_varray.py --input ${{ toJSON(steps.default-matrix.outputs.python-versions) }} --target '["3.10", "3.11", "3.12"]'
         [[ "${{ steps.default-matrix.outputs.latest-python }}" == "3.12" ]] || exit 1
         [[ "${{ steps.default-matrix.outputs.stable-python }}" == "3.11" ]] || exit 1
-        [[ "${{ steps.default-matrix.outputs.oldest-python }}" == "3.9" ]] || exit 1
+        [[ "${{ steps.default-matrix.outputs.oldest-python }}" == "3.10" ]] || exit 1
         echo "test 2"
-        python utils/assert_varray.py --input ${{ toJSON(steps.exclude-latest.outputs.python-versions) }} --target '["3.9", "3.10", "3.11"]'
+        python utils/assert_varray.py --input ${{ toJSON(steps.exclude-latest.outputs.python-versions) }} --target '["3.10", "3.11"]'
         [[ "${{ steps.exclude-latest.outputs.latest-python }}" == "3.11" ]] || exit 1
         [[ "${{ steps.exclude-latest.outputs.stable-python }}" == "3.10" ]] || exit 1
-        [[ "${{ steps.exclude-latest.outputs.oldest-python }}" == "3.9" ]] || exit 1
+        [[ "${{ steps.exclude-latest.outputs.oldest-python }}" == "3.10" ]] || exit 1
         echo "test 3"
         python utils/assert_varray.py --input ${{ toJSON(steps.exclude-2-include-1.outputs.python-versions) }} --target '["3.10", "3.12", "3.13"]'
         [[ "${{ steps.exclude-2-include-1.outputs.latest-python }}" == "3.13" ]] || exit 1

diff --git a/get_mda_python_range.py b/get_mda_python_range.py
@@ -108,8 +108,7 @@ def get_release_versions(release: str) -> list[str]:
 def exclude_versions(versions: list[str], excludes: str) -> list[str]:
     # need to decode the exclude JSON array
     exclude_array = json.loads(excludes)
-    return list(set(versions) ^ set(exclude_array))
-
+    return [i for i in set(versions) if i not in set(exclude_array)]
 
 def include_versions(versions: list[str], includes: str) -> list[str]:
     # need to decode the include JSON array