Merge pull request #17 from jheuel/master

update test containers
Snakemake-Profiles · Oct 27, 2023 · 043ca4b · 043ca4b
2 parents 029454d + 900b87b
commit 043ca4b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/htcondor.yaml b/.github/workflows/htcondor.yaml
@@ -1,7 +1,7 @@
 name: Test SnakemakeProfiles/htcondor
 env:
-  SNAKEMAKE_IMAGE: quay.io/biocontainers/snakemake:7.3.2--hdfd78af_0
-  HTCONDOR_IMAGE: htcondor/mini:el7
+  SNAKEMAKE_IMAGE: quay.io/biocontainers/snakemake:7.32.4--hdfd78af_1
+  HTCONDOR_IMAGE: htcondor/mini:23.0-el8
   DOCKER_COMPOSE: tests/docker-compose.yaml
 
 on: [push, pull_request]
@@ -33,11 +33,9 @@ jobs:
       - name: install miniconda
         uses: conda-incubator/setup-miniconda@v2
         with:
-          mamba-version: "*"
-          channels: conda-forge,bioconda,default
+          channels: conda-forge,bioconda,defaults
           channel-priority: true
           environment-file: test-environment.yml
-          use-only-tar-bz2: true
 
       - name: docker swarm init
         run: docker swarm init

diff --git a/test-environment.yml b/test-environment.yml
@@ -7,11 +7,11 @@ dependencies:
   - pip
   - pytest
   - pytest-runner
-  - docker-py >=3.0
+  - docker-py
   - cookiecutter
   - pep8
-  - pytest-cookies >=0.4.0
+  - pytest-cookies
   - pytest-timeout
   - pyflakes
   - urllib3
-  - cryptography <=37.0.0
+  - cryptography
diff --git a/tests/deploystack.sh b/tests/deploystack.sh
@@ -6,8 +6,8 @@
 DOCKER_COMPOSE=${DOCKER_COMPOSE:=docker-compose.yaml}
 
 # Images
-SNAKEMAKE_IMAGE=${SNAKEMAKE_IMAGE:=quay.io/biocontainers/snakemake:7.3.2--hdfd78af_0}
-HTCONDORIMAGE=${HTCONDORIMAGE:=htcondor/mini:el7}
+SNAKEMAKE_IMAGE=${SNAKEMAKE_IMAGE:=quay.io/biocontainers/snakemake:7.32.4--hdfd78af_1}
+HTCONDORIMAGE=${HTCONDORIMAGE:=htcondor/mini:23.0-el8}
 
 docker pull $SNAKEMAKE_IMAGE
 docker pull $HTCONDORIMAGE