Fix OSX exception type in test

tskit-dev · Nov 15, 2023 · aa33167 · aa33167
1 parent 2890fae
commit aa33167
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -56,9 +56,9 @@ jobs:
             /usr/share/miniconda/envs/anaconda-client-env
             ~/osx-conda
             ~/.profile
-          key: ${{ runner.os }}-${{ matrix.python}}-conda-v14-${{ hashFiles('requirements/CI-tests-conda/requirements.txt')}}
+          key: ${{ runner.os }}-${{ matrix.python}}-conda-v16-${{ hashFiles('requirements/CI-tests-conda/requirements.txt')}}
 
-      - name: Install Conda
+      - name: Install Miniconda with Mamba
         uses: conda-incubator/setup-miniconda@v2
         if: steps.cache.outputs.cache-hit != 'true'
         with:
@@ -67,6 +67,8 @@ jobs:
           channels: conda-forge
           channel-priority: strict
           auto-update-conda: true
+          mamba-version: "*"
+          use-mamba: true
 
       - name: Fix windows .profile
         if: steps.cache.outputs.cache-hit != 'true' && matrix.os == 'windows-latest'
@@ -78,12 +80,12 @@ jobs:
       - name: Install compiler from conda
         if: steps.cache.outputs.cache-hit != 'true'
         shell: bash -l {0} #We need a login shell to get conda
-        run: conda install --yes c-compiler
+        run: mamba install --yes c-compiler
 
       - name: Install conda deps
         if: steps.cache.outputs.cache-hit != 'true'
         shell: bash -l {0} #We need a login shell to get conda
-        run: conda install --yes --file=requirements/CI-tests-conda/requirements.txt
+        run: mamba install --yes --file=requirements/CI-tests-conda/requirements.txt
 
       - name: Install cyvcf2 #Fails if done via conda due to no windows support.
         if: steps.cache.outputs.cache-hit != 'true' && matrix.os != 'windows-latest'

diff --git a/tests/test_inference.py b/tests/test_inference.py
@@ -1841,7 +1841,8 @@ def test_mmap_unwriteable_dir(self):
             for genotypes, position in zip(G, positions):
                 sample_data.add_site(position, genotypes)
 
-        with pytest.raises(PermissionError):
+        # On OSX we sometimes get OSError depending on Pyhton version
+        with pytest.raises((PermissionError, OSError)):
             # Assuming /bin is unwriteable here
             tsinfer.generate_ancestors(sample_data, mmap_temp_dir="/bin")