From 7a1d04fc2196274859bdc93cf9c317330468ba11 Mon Sep 17 00:00:00 2001
From: Mike Clark <github@wassname.org>
Date: Wed, 28 Apr 2021 11:44:50 +0000
Subject: [PATCH] Update Makefile

---
 {{ cookiecutter.repo_name }}/Makefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/{{ cookiecutter.repo_name }}/Makefile b/{{ cookiecutter.repo_name }}/Makefile
index d0c6f4f..d78d8da 100644
--- a/{{ cookiecutter.repo_name }}/Makefile	
+++ b/{{ cookiecutter.repo_name }}/Makefile	
@@ -17,8 +17,7 @@ PYTHON_INTERPRETER = {{ cookiecutter.python_interpreter }}
 
 ## Install Python Dependencies
 requirements: test_environment
-	$(PYTHON_INTERPRETER) -m pip install -U pip setuptools wheel
-	$(PYTHON_INTERPRETER) -m pip install -r requirements.txt
+	conda env create --name {{ cookiecutter.repo_name }} python=3.7 -f ./requirements/environment.yaml
 
 ## Make Dataset
 data: requirements
@@ -52,13 +51,9 @@ endif
 ## Set up python interpreter environment
 create_environment:
 	@echo ">>> Detected conda, creating conda environment."
-	conda create --name $(PROJECT_NAME) python=3 -f ./requirements/environment.yaml
+	conda env create --name $(PROJECT_NAME) python=3 -f ./requirements/environment.yaml
 	@echo ">>> New conda env created. Activate with:\nsource activate $(PROJECT_NAME)"
 
-## Test python environment is setup correctly
-test_environment:
-	$(PYTHON_INTERPRETER) test_environment.py
-
 ## Run pytest
 test:
 	$(PYTHON_INTERPRETER) -m pytest ./test -v -s
@@ -68,6 +63,7 @@ doc_reqs:
 	conda env export --no-builds --from-history --name $(PROJECT_NAME) > requirements/environment.min.yaml
 	conda env export  --name $(PROJECT_NAME) > requirements/environment.max.yaml
 	$(PYTHON_INTERPRETER) -m pip freeze > requirements/requirements.conda.txt --name
+	conda-lock -f requirements/environment.max.yml -p linux-64
 
 #################################################################################
 # PROJECT RULES                                                                 #