Skip to content

Commit 395696c

Browse files
authored
fix: pin setuptools version to avoid deprecation error (#31)
fix: pin setuptools to avoid deprecation error in Snakemake 7 refactor: update deprecated setup-miniconda option chore: update test version string build: update pangolin environment build: update pangolin environment in Dockerfile
1 parent cb01079 commit 395696c

5 files changed

Lines changed: 13 additions & 10 deletions

File tree

.github/workflows/install.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
with:
1515
channel-priority: strict
1616
activate-environment: snakemake
17-
auto-activate-base: false
1817
environment-file: .test/environment_v7.yaml
1918
- name: Create environments
2019
shell: bash -el {0}
@@ -30,7 +29,6 @@ jobs:
3029
with:
3130
channel-priority: strict
3231
activate-environment: snakemake
33-
auto-activate-base: false
3432
environment-file: .test/environment_v7.yaml
3533
- name: Dry run
3634
shell: bash -el {0}

.test/Snakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import subprocess
88
min_version("7.19")
99

1010
# Workflow version
11-
__version__ = "1.3.0"
11+
__version__ = "test"
1212

1313
# Rules
1414
include: "../workflow/core.smk"

.test/environment_v7.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ dependencies:
77
- python==3.11.6
88
- snakemake==7.32.4
99
- pulp<2.8
10+
- setuptools<81

Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM condaforge/miniforge3:latest
22
LABEL io.github.snakemake.containerized="true"
3-
LABEL io.github.snakemake.conda_env_hash="a74592ad8bd4ec05cb4d3f2bde91dd12ba674df1828dc48cc7e2c39b95aed05c"
3+
LABEL io.github.snakemake.conda_env_hash="ed26b44bdff1bc9f7a99d3830ae812bf262f78427b95a45fa1ac1ce255c5f054"
44

55
# Step 2: Retrieve conda environments
66

@@ -89,14 +89,16 @@ COPY workflow/envs/nextalign.yaml /conda-envs/04a3347f94ddf7e21c34bc49e5246076/e
8989

9090
# Conda environment:
9191
# source: workflow/envs/pangolin.yaml
92-
# prefix: /conda-envs/fd645c541ee7a3d43fb9167441b77888
92+
# prefix: /conda-envs/fb978640cd765c8a63bbcdc01f3a206b
9393
# channels:
9494
# - conda-forge
9595
# - bioconda
96+
# - nodefaults
9697
# dependencies:
97-
# - pangolin==4.3.1
98-
RUN mkdir -p /conda-envs/fd645c541ee7a3d43fb9167441b77888
99-
COPY workflow/envs/pangolin.yaml /conda-envs/fd645c541ee7a3d43fb9167441b77888/environment.yaml
98+
# - pangolin==4.3.4
99+
# - setuptools<81
100+
RUN mkdir -p /conda-envs/fb978640cd765c8a63bbcdc01f3a206b
101+
COPY workflow/envs/pangolin.yaml /conda-envs/fb978640cd765c8a63bbcdc01f3a206b/environment.yaml
100102

101103
# Conda environment:
102104
# source: workflow/envs/quarto_render.yaml
@@ -169,7 +171,7 @@ RUN conda env create --prefix /conda-envs/9c24a867826615972cc288081976e7fc --fil
169171
conda env create --prefix /conda-envs/3fad3c9cdfa40bee9404f6a2e8fda69f --file /conda-envs/3fad3c9cdfa40bee9404f6a2e8fda69f/environment.yaml && \
170172
conda env create --prefix /conda-envs/0a608afb24723cb6fa8aef748f5efbc8 --file /conda-envs/0a608afb24723cb6fa8aef748f5efbc8/environment.yaml && \
171173
conda env create --prefix /conda-envs/04a3347f94ddf7e21c34bc49e5246076 --file /conda-envs/04a3347f94ddf7e21c34bc49e5246076/environment.yaml && \
172-
conda env create --prefix /conda-envs/fd645c541ee7a3d43fb9167441b77888 --file /conda-envs/fd645c541ee7a3d43fb9167441b77888/environment.yaml && \
174+
conda env create --prefix /conda-envs/fb978640cd765c8a63bbcdc01f3a206b --file /conda-envs/fb978640cd765c8a63bbcdc01f3a206b/environment.yaml && \
173175
conda env create --prefix /conda-envs/96f3c1cec4b3ce5d72f708992272e9c1 --file /conda-envs/96f3c1cec4b3ce5d72f708992272e9c1/environment.yaml && \
174176
conda env create --prefix /conda-envs/8ad6cdcf265d30289788da99d5bf9fff --file /conda-envs/8ad6cdcf265d30289788da99d5bf9fff/environment.yaml && \
175177
conda env create --prefix /conda-envs/0adafb79cb1bec58ef4c77bf4cca4f95 --file /conda-envs/0adafb79cb1bec58ef4c77bf4cca4f95/environment.yaml && \

workflow/envs/pangolin.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
channels:
22
- conda-forge
33
- bioconda
4+
- nodefaults
45
dependencies:
5-
- pangolin==4.3.1
6+
- pangolin==4.3.4
7+
- setuptools<81

0 commit comments

Comments
 (0)