From a4560e5941347947a8ec33e0c94564365ef53af7 Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Fri, 18 Oct 2024 17:51:08 +0200 Subject: [PATCH 1/4] updates --- bioconda_utils/bioconda_utils-requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bioconda_utils/bioconda_utils-requirements.txt b/bioconda_utils/bioconda_utils-requirements.txt index 1fec6cc898..25ba379df4 100644 --- a/bioconda_utils/bioconda_utils-requirements.txt +++ b/bioconda_utils/bioconda_utils-requirements.txt @@ -7,13 +7,13 @@ conda-forge-pinning=2024.06.01.05.54.15 # basics python=3.10.* -conda=24.5.* +conda=24.9.* conda-libmamba-solver=24.1.* -conda-build=24.5.* -conda-index=0.4.* -conda-package-streaming=0.9.* +conda-build=24.9.* +conda-index=0.5.* +conda-package-streaming=0.11.* mamba=1.5.* -boa=0.17.* +#boa=0.17.* argh=0.31.* # CLI colorlog=6.* # Logging From f3d180549675e937f37248d1c94fbdb2e15ff098 Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Fri, 18 Oct 2024 18:34:29 +0200 Subject: [PATCH 2/4] patch versioneer --- versioneer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versioneer.py b/versioneer.py index 64fea1c892..3aa5da3720 100644 --- a/versioneer.py +++ b/versioneer.py @@ -339,9 +339,9 @@ def get_config_from_root(root): # configparser.NoOptionError (if it lacks "VCS="). See the docstring at # the top of versioneer.py for instructions on writing your setup.cfg . setup_cfg = os.path.join(root, "setup.cfg") - parser = configparser.SafeConfigParser() + parser = configparser.ConfigParser() with open(setup_cfg, "r") as f: - parser.readfp(f) + parser.read_file(f) VCS = parser.get("versioneer", "VCS") # mandatory def get(parser, name): From aa0dc8d96fb9e35101382fad3ece1bca1ef1ec5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Fri, 18 Oct 2024 19:06:33 +0200 Subject: [PATCH 3/4] Update bioconda_utils-requirements.txt --- bioconda_utils/bioconda_utils-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bioconda_utils/bioconda_utils-requirements.txt b/bioconda_utils/bioconda_utils-requirements.txt index 25ba379df4..5b506f56fc 100644 --- a/bioconda_utils/bioconda_utils-requirements.txt +++ b/bioconda_utils/bioconda_utils-requirements.txt @@ -9,7 +9,7 @@ conda-forge-pinning=2024.06.01.05.54.15 python=3.10.* conda=24.9.* conda-libmamba-solver=24.1.* -conda-build=24.9.* +conda-build=24.7.* conda-index=0.5.* conda-package-streaming=0.11.* mamba=1.5.* From 0ef7da94a745e895773789b82dd5b81a50da254a Mon Sep 17 00:00:00 2001 From: aliciaaevans Date: Fri, 18 Oct 2024 14:58:49 -0400 Subject: [PATCH 4/4] missing jinja var now throws CondaBuildUserError --- test/test_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_utils.py b/test/test_utils.py index 4ec044dd7f..5c90751e8f 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -14,7 +14,7 @@ from pathlib import Path from textwrap import dedent -from conda_build import api, metadata +from conda_build import api, metadata, exceptions from bioconda_utils import __version__ from bioconda_utils import utils @@ -652,7 +652,7 @@ def test_rendering_sandboxing(): assert ("'GITHUB_TOKEN' is undefined" in str(excinfo.value.stdout)) else: # recipe for "one" should fail because GITHUB_TOKEN is not a jinja var. - with pytest.raises(SystemExit) as excinfo: + with pytest.raises(exceptions.CondaBuildUserError) as excinfo: pkg_paths = utils.built_package_paths(r.recipe_dirs['one']) build.build( recipe=r.recipe_dirs['one'],