Skip to content

Commit

Permalink
Merge pull request #21 from AmericanRedCross/jyq-remove-vestigial-tes…
Browse files Browse the repository at this point in the history
…t-environment

Improve/fix make create_environment
  • Loading branch information
danbjoseph authored Mar 3, 2024
2 parents 61b671f + d7b61d0 commit 262c1c6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
13 changes: 3 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endif
#################################################################################

## Install Python Dependencies
requirements: test_environment
requirements:
$(PYTHON_INTERPRETER) -m pip install -U pip setuptools wheel
$(PYTHON_INTERPRETER) -m pip install -r requirements.txt

Expand Down Expand Up @@ -53,17 +53,10 @@ else
endif
@echo ">>> New conda env created. Activate with:\nsource activate $(PROJECT_NAME)"
else
$(PYTHON_INTERPRETER) -m pip install -q virtualenv virtualenvwrapper
@echo ">>> Installing virtualenvwrapper if not already installed.\nMake sure the following lines are in shell startup file\n\
export WORKON_HOME=$$HOME/.virtualenvs\nexport PROJECT_HOME=$$HOME/Devel\nsource /usr/local/bin/virtualenvwrapper.sh\n"
@bash -c "source `which virtualenvwrapper.sh`;mkvirtualenv $(PROJECT_NAME) --python=$(PYTHON_INTERPRETER)"
@echo ">>> New virtualenv created. Activate with:\nworkon $(PROJECT_NAME)"
$(PYTHON_INTERPRETER) -m venv .venv
@echo ">>> New virtual environment created. Activate with:\nsource .venv/bin/activate"
endif

## Test python environment is setup correctly
test_environment:
$(PYTHON_INTERPRETER) test_environment.py

#################################################################################
# PROJECT RULES #
#################################################################################
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ If you are interested in joining the project, please check out [`CONTRIBUTING.md
1. Create a Python virtual environment.
- You can use the shortcut command `make create_environment`.
- The log will tell you how to activate the environment. Do so with: `source .venv/bin/activate`
2. Install requirements.
```bash
pip install -r requirements.txt
Expand Down

0 comments on commit 262c1c6

Please sign in to comment.