pr review updates

Author: stevebachmeier

CHANGELOG.rst

@@ -1,4 +1,4 @@
-**2.1.5 - TBD**
+**2.1.5 - 07/25/25**
 
  - Feature: Support new environment creation via 'make build-env'
 

Makefile

@@ -1,21 +1,30 @@
 # Check if we're running in Jenkins
 ifdef JENKINS_URL
-	# Files are already in workspace from shared library
+# 	Files are already in workspace from shared library
 	MAKE_INCLUDES := .
 else
-	# For local dev, use the installed vivarium_build_utils package
-	MAKE_INCLUDES := $(shell python -c "import vivarium_build_utils.resources" &>/dev/null && python -c "from vivarium_build_utils.resources import get_makefiles_path; print(get_makefiles_path())")
+# 	For local dev, use the installed vivarium_build_utils package if it exists
+# 	First, check if we can import vivarium_build_utils and assign 'yes' or 'no'.
+# 	We do this by importing the package in python and redirecting stderr to the null device.
+# 	If the import is successful (&&), it will print 'yes', otherwise (||) it will print 'no'.
+	VIVARIUM_BUILD_UTILS_AVAILABLE := $(shell python -c "import vivarium_build_utils" 2>/dev/null && echo "yes" || echo "no")
+# 	If vivarium_build_utils is available, get the makefiles path or else set it to empty
+	ifeq ($(VIVARIUM_BUILD_UTILS_AVAILABLE),yes)
+		MAKE_INCLUDES := $(shell python -c "from vivarium_build_utils.resources import get_makefiles_path; print(get_makefiles_path())")
+	else
+		MAKE_INCLUDES :=
+	endif
 endif
 
+# Set the package name as the last part of this file's parent directory path
 PACKAGE_NAME = $(notdir $(CURDIR))
 
+ifneq ($(MAKE_INCLUDES),) # not empty
 # Include makefiles from vivarium_build_utils
-ifneq ($(MAKE_INCLUDES),) # if not an empty string
 include $(MAKE_INCLUDES)/base.mk
 include $(MAKE_INCLUDES)/test.mk
-endif
-
-ifeq ($(MAKE_INCLUDES),) # empty string
+else # empty
+# Use this help message (since the vivarium_build_utils version is not available)
 help:
 	@echo
 	@echo "For Make's standard help, run 'make --help'."

setup.py

@@ -43,7 +43,7 @@
         long_description = f.read()
 
     install_requirements = [
-        "vivarium_build_utils>=1.1.0,<2.0.0",
+        "vivarium_build_utils>=2.0.1,<3.0.0",
         "numpy",
         "pandas",
         "scipy",