Skip to content

Commit 5a2c87a

Browse files
author
maarten.vandersande
committed
conda installer works again (hopefully)
1 parent 88e8113 commit 5a2c87a

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

requirements.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ channels:
55
dependencies:
66
- conda-forge::python=3.10
77
- bioconda::snakemake-minimal=7.25.0
8-
- conda-forge::conda=23.1.0
9-
- conda-forge::mamba=1.2.0
8+
- conda-forge::conda=24.1.2
9+
- conda-forge::mamba=1.5.9
1010
- bioconda::genomepy=0.16.1
1111
- conda-forge::biopython=1.81
1212
- conda-forge::filelock=3.10.7

seq2science/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python
22
"""
33
This is the user's entry-point for the seq2science tool.
44
"""

seq2science/util.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,8 @@ def _get_current_version(package):
10431043
# xdg keeps its version in a pyproject.toml (not included)
10441044
# argcomplete keeps its version in a setup.py (not included)
10451045
# trackhub versioning is weird
1046-
if package in ["conda-ecosystem-user-package-isolation", "xdg", "argcomplete", "trackhub"]:
1046+
# mamba is not a package
1047+
if package in ["conda-ecosystem-user-package-isolation", "xdg", "argcomplete", "trackhub", "mamba"]:
10471048
return None
10481049
if package == "python":
10491050
return sys.version.split()[0]

0 commit comments

Comments
 (0)