Skip to content

Commit c0d4a7c

Browse files
support pinning vivarium_build_utils (#269)
1 parent f6c1660 commit c0d4a7c

File tree

4 files changed

+37
-3
lines changed

4 files changed

+37
-3
lines changed

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
**2.1.15 - 07/16/25**
2+
3+
- Support pinning of vivarium_build_utils; pin vivarium_build_utils>=1.1.0,<2.0.0
4+
15
**2.1.14 - 06/16/25**
26

37
- Type-hinting: Fix mypy errors in psimulate/cluster/cli_options.py

Jenkinsfile

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,32 @@
1-
@Library("vivarium_build_utils") _
1+
/* This Jenkinsfile simply loads the `reusable_pipeline` pipeline from the
2+
vivariu_build_utils repository (https://github.com/ihmeuw/vivarium_build_utils).
3+
4+
vivarium_build_utils is loaded as a Jenkins shared library
5+
(https://www.jenkins.io/doc/book/pipeline/shared-libraries/).
6+
Jenkins shared library convention dictates that importable modules must be stored
7+
in the 'vars' folder.
8+
9+
Jenkins shared libraries can be configured in the Jenkins UI:
10+
* Manage Jenkins
11+
* Configure System
12+
* Global Pipeline Libraries section
13+
* Library subsection
14+
* Name: The Name for the lib
15+
* Version: The branch you want to use. Throws an error
16+
for nonexistent branches.
17+
* Project Repository: Url to the shared lib
18+
* Credentials: SSH key to access the repo
19+
20+
Note that updating the shared repo will take affect on the next pipeline invocation.
21+
*/
22+
23+
// Load the get_vbu_version function from vivarium_build_utils/bootstrap/
24+
// (the directory to load from is defined in the Jenkins shared library configuration)
25+
@Library("get_vbu_version@main") _
26+
27+
// Load the full vivarium_build_utils library at the expected version
28+
library("vivarium_build_utils@${get_vbu_version()}")
29+
230
reusable_pipeline(
331
scheduled_branches: ["main"],
432
upstream_repos: ["vivarium", "layered_config_tree"],

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ ifdef JENKINS_URL
33
# Files are already in workspace from shared library
44
MAKE_INCLUDES := .
55
else
6-
# For local dev, search in parent directory
7-
MAKE_INCLUDES := ../vivarium_build_utils/resources/makefiles
6+
# For local dev, use the installed vivarium_build_utils package
7+
MAKE_INCLUDES := $(shell python -c "from vivarium_build_utils.resources import get_makefiles_path; print(get_makefiles_path())")
88
endif
99

1010
PACKAGE_NAME = vivarium_cluster_tools
1111

12+
# Include makefiles from vivarium_build_utils
1213
include $(MAKE_INCLUDES)/base.mk
1314
include $(MAKE_INCLUDES)/test.mk

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
long_description = f.read()
4343

4444
install_requires = [
45+
"vivarium_build_utils>=1.1.0,<2.0.0",
4546
"pandas",
4647
"numpy<2.0.0",
4748
"tables",

0 commit comments

Comments
 (0)