Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Update dependencies to latest versions - less complex #1011

Merged
merged 4 commits into from
Oct 21, 2024
Merged

feat: Update dependencies to latest versions - less complex #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4560e5
updates
bgruening Oct 18, 2024
f3d1805
patch versioneer
bgruening Oct 18, 2024
aa0dc8d
Update bioconda_utils-requirements.txt
bgruening Oct 18, 2024
0ef7da9
missing jinja var now throws CondaBuildUserError
aliciaaevans Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions bioconda_utils/bioconda_utils-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.*
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
Expand Down
4 changes: 2 additions & 2 deletions test/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
bgruening marked this conversation as resolved.
Show resolved Hide resolved

from bioconda_utils import __version__
from bioconda_utils import utils
Expand Down Expand Up @@ -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:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, we might need to update line 644 as well, if that behavior also changed.

pkg_paths = utils.built_package_paths(r.recipe_dirs['one'])
build.build(
recipe=r.recipe_dirs['one'],
Expand Down
4 changes: 2 additions & 2 deletions versioneer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
bgruening marked this conversation as resolved.
Show resolved Hide resolved
VCS = parser.get("versioneer", "VCS") # mandatory

def get(parser, name):
Expand Down