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

fix: Update galaxy-lib to galaxy-tool-util #813

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: Update galaxy-lib to galaxy-tool-util #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion bioconda_utils/bioconda_utils-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ conda-forge-pinning=2022.08.25.15.20.42

# tools
anaconda-client=1.6.* # anaconda_upload
galaxy-tool-util # mulled test and container build
involucro=1.1.* # mulled test and container build
skopeo=0.1.35 # docker upload
git=2.* # well - git
Expand All @@ -52,7 +53,6 @@ pyjwt>=2.4.0 # githubhandler (JWT signing), needs >=2.4.0, CVE-2022

# unknown
beautifulsoup4=4.6.*
galaxy-lib>=18.9.1
jinja2>=2.10.1,<3
markupsafe<2.1 # markupsafe 2.1 breaks jinja2

Expand Down
3 changes: 2 additions & 1 deletion bioconda_utils/pkg_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,13 @@ def test_package(
cmd += channel_args
cmd += shlex.split(mulled_args)

# galaxy-lib always downloads involucro, unless it's in cwd or its path is explicitly given.
# We inject a POSTINSTALL to the involucro command with a small wrapper to
# create activation / entrypoint scripts for the container.
involucro_path = os.path.join(os.path.dirname(__file__), 'involucro')
if not os.path.exists(involucro_path):
raise RuntimeError('internal involucro wrapper missing')
# Explicitly pass --involucro-path since otherwise mulled always downloads
# involucro (unless it is in the cwd).
cmd += ['--involucro-path', involucro_path]

logger.debug('mulled-build command: %s' % cmd)
Expand Down
2 changes: 1 addition & 1 deletion docs/source/contributor/build-system.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ N.B., due to transitioning to Azure, the remainder of this section is no longer

- Upon successfully building and testing via ``conda-build``, the built package
is added to a minimal BusyBox container using ``mulled-build`` (maintained in
`galaxy-lib <https://github.com/galaxyproject/galaxy-lib>`_). This acts as
`galaxy <https://github.com/galaxyproject/galaxy>`_). This acts as
a more stringent test than ``conda-build`` alone. The BusyBox container
purposefully is missing many system libraries (like libgcc) that may be
present in the CentOS 7 container. Note that it is common for a package to
Expand Down