Repository: popsim-consortium/stdpopsim (language: python)

Issue:
undo #1181 with SLiM 3.7.1
To avoid a bug in SLiM we're doing tests with the development version of SLiM, but should undo that when the new release comes. (see #1181)


Discussion / hints:
Also see #1188. When undoing this, check for `TODO[#1182]` in the workflow file.

Fix patch:
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3794b97ae..7f5eb83fb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,8 +29,8 @@ jobs:
             git clone --bare https://github.com/MesserLab/SLiM /tmp/SLiM_top/SLiM
             cd /tmp/SLiM_top/SLiM
             git describe --tags $(git rev-list --tags --max-count=1) > ${TAG_FILE}
-            # Pinning to SLiM 3.7; comment out the next line to use latest tag.
-            echo v3.7 > ${TAG_FILE}
+            # Pinning to SLiM 3.7.1; comment out the next line to use latest tag.
+            echo v3.7.1 > ${TAG_FILE}
             echo Using SLiM version $(cat /tmp/SLiM_tag)
 
       - restore_cache:
diff --git a/requirements/CI/conda.txt b/requirements/CI/conda.txt
index 8c0a03587..1ad4005db 100644
--- a/requirements/CI/conda.txt
+++ b/requirements/CI/conda.txt
@@ -1,1 +1,2 @@
 msprime==1.1.0
+slim==3.7.1


Test patch:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 85789685d..99de1b396 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,7 +20,6 @@ jobs:
         os: [ubuntu-18.04, macos-10.15, windows-latest]
         python: [3.7, "3.10"]
     env:
-      SLIM_TAG: 3.7
       CONDA_ENV_NAME: stdpopsim
 
     steps:
@@ -48,12 +47,12 @@ jobs:
         uses: actions/cache@v2
         env:
           # Increase this to reset the cache if the key hasn't changed.
-          CACHE_NUM: 2
+          CACHE_NUM: 0
         with:
           path: |
             ${{ steps.find-conda.outputs.CONDA }}/envs/${{ env.CONDA_ENV_NAME }}
             ~/.bash_profile
-          key: ${{ runner.os }}-${{ matrix.python }}-conda-${{ hashFiles('requirements/CI/*') }}-${{ env.SLIM_TAG }}-${{ env.CACHE_NUM }}
+          key: ${{ runner.os }}-${{ matrix.python }}-conda-${{ hashFiles('requirements/CI/*') }}-${{ env.CACHE_NUM }}
 
       - name: install conda
         uses: conda-incubator/setup-miniconda@v2
@@ -81,34 +80,8 @@ jobs:
           # when pip installing without binary wheels (on Windows).
           conda install --yes --file=requirements/CI/conda.txt
           pip install -r requirements/CI/requirements.txt
-          # TODO[#1182]: put this back at next SLiM release
-          # conda install --yes slim==${{ env.SLIM_TAG }}
-          # but FOR NOW install github SLiM
-
-      # TODO[#1182]: remove this step
-      - name: checkout SLiM
-        if: runner.os != 'Windows'
-        uses: actions/checkout@v2
-        with:
-          repository: MesserLab/SLiM
-          fetch-depth: 0
-          path: SLiM
-
-      # TODO[#1182]: remove this step
-      - name: build SLiM
-        if: runner.os != 'Windows'
-        run: |
-          cd SLiM
-          mkdir build
-          cd build
-          cmake ..
-          make -j 2
-          ./slim -testEidos
-          ./slim -testSLiM
 
       - name: run test suite
         run: |
-          # TODO[#1182]: remove this export
-          export PATH=$PATH:./SLiM/build
           pytest -n0 --cov=stdpopsim --cov-branch tests
           coverage report -m