Skip to content

Commit

Permalink
remove overwritten
Browse files Browse the repository at this point in the history
  • Loading branch information
patricktnast committed Jan 23, 2025
1 parent 126bfd7 commit 29ea924
Showing 1 changed file with 16 additions and 17 deletions.
33 changes: 16 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,24 @@ ifdef JENKINS_URL
# Files are already in workspace from shared library
MAKE_INCLUDES := .
else
# For local dev, fetch from GitHub
MAKE_INCLUDES := .make-includes
# For local dev, search in parent directory
MAKE_INCLUDES := ../vivarium_build_utils/resources/makefiles
endif

PACKAGE_NAME = vivarium
# Include the makefiles
include $(MAKE_INCLUDES)/base.mk
include $(MAKE_INCLUDES)/test.mk

$(MAKE_INCLUDES)/%.mk:
mkdir -p $(MAKE_INCLUDES)
curl -s -o $@ https://raw.githubusercontent.com/ihmeuw/vivarium_build_utils/feature/pnast/mic-5587-shared-makefiles/resources/makefiles/$*.mk

.PHONY: integration
integration: $(MAKE_SOURCES)
export COVERAGE_FILE=./output/.coverage.integration
pytest -vvv --cov --cov-report term --cov-report html:./output/htmlcov_integration tests
.PHONY: install
install: ## Install setuptools, package, and build utilities
pip install --upgrade pip setuptools
pip install -e .[DEV]
@echo "----------------------------------------"
@if [ ! -d "../vivarium_build_utils" ]; then \
# Clone the build utils repo if it doesn't exist. \
git clone -b feature/pnast/mic-5587-shared-makefiles https://github.com/ihmeuw/vivarium_build_utils.git ../vivarium_build_utils; \
else \
echo "vivarium_build_utils already exists. Skipping clone."; \
fi

.PHONY: integration-runslow
integration-runslow: $(MAKE_SOURCES)
export COVERAGE_FILE=./output/.coverage.integration
pytest -vvv --runslow --cov --cov-report term --cov-report html:./output/htmlcov_integration tests
# Include the makefiles
include $(MAKE_INCLUDES)/base.mk
include $(MAKE_INCLUDES)/test.mk

0 comments on commit 29ea924

Please sign in to comment.