From aa9a5a084e1882c7e655b7a14b04fa68a2de0617 Mon Sep 17 00:00:00 2001 From: Jay Qi Date: Sun, 3 Mar 2024 12:54:30 -0500 Subject: [PATCH 1/3] Remove vestigial test_requirements check --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 772a002..6a809e0 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -60,10 +60,6 @@ else @echo ">>> New virtualenv created. Activate with:\nworkon $(PROJECT_NAME)" endif -## Test python environment is setup correctly -test_environment: - $(PYTHON_INTERPRETER) test_environment.py - ################################################################################# # PROJECT RULES # ################################################################################# From 1ff5b7cc8e632aa8597519825c96e87c202cc7aa Mon Sep 17 00:00:00 2001 From: Jay Qi Date: Sun, 3 Mar 2024 13:02:43 -0500 Subject: [PATCH 2/3] Use venv instead of virtualenvwrapper --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 6a809e0..bc65beb 100644 --- a/Makefile +++ b/Makefile @@ -53,11 +53,8 @@ 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 ################################################################################# From d7b61d07ec960df42cfe78209abb1c3231c2a09f Mon Sep 17 00:00:00 2001 From: Dan Joseph Date: Sun, 3 Mar 2024 14:25:45 -0500 Subject: [PATCH 3/3] duplicate activate command to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 175cf3c..6c41633 100644 --- a/README.md +++ b/README.md @@ -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