consolidates make install

Author: jritsema

hooks/post_gen_project.py

@@ -32,10 +32,6 @@ def post_gen_project():
     else:
         remove_file(".envrc")
 
-    if "{{ cookiecutter.enable_aws }}" == "True":
-        with open("requirements.txt", "w") as f:
-            f.write(f"boto3")
-
     print("Creating virtual python environment...")
     os.system("python -m venv .venv")
 
@@ -47,7 +43,7 @@ def post_gen_project():
     if "{{ cookiecutter.enable_direnv }}" != "True":
         out += " && . .venv/bin/activate"
     if "{{ cookiecutter.enable_aws }}" == "True":
-        out += " && make piplock"
+        out += " && make install boto3"
     print(out)
 
 

{{cookiecutter.project_slug}}/Makefile

@@ -15,18 +15,24 @@ init:
 	direnv allow .
 	type python
 
-## piplock: installs dependencies in requirements.txt and generates piplock.txt
-.PHONY: piplock
-piplock:
-	python -m pip install --upgrade pip
-	pip install -r requirements.txt
-	pip freeze > piplock.txt
-
-## install: install project dependencies from piplock.txt
+## install: add a new package (make install <package>), or install all project dependencies from piplock.txt (make install)
 .PHONY: install
 install:
 	python -m pip install --upgrade pip
+ifeq ($(filter-out $@,$(MAKECMDGOALS)),)
+	@echo "Installing dependencies from piplock.txt"
 	pip install -r piplock.txt
+else
+	@echo "Adding package $(filter-out $@,$(MAKECMDGOALS)) to requirements.txt"
+	@grep -q "^$(filter-out $@,$(MAKECMDGOALS))$$" requirements.txt || echo "$(filter-out $@,$(MAKECMDGOALS))" >> requirements.txt
+	pip install $(filter-out $@,$(MAKECMDGOALS))
+	pip install -r requirements.txt
+	pip freeze > piplock.txt
+endif
+
+# Empty rule to handle package name argument
+%:
+	@:
 
 ## start: run local project
 .PHONY: start

{{cookiecutter.project_slug}}/README.md

@@ -8,8 +8,7 @@
  Choose a make command to run
 
   init      initialize a new python project
-  piplock   installs dependencies in requirements.txt and generates piplock.txt
-  install   install project dependencies from piplock.txt
+    install: add a new package (make install <package>), or install all project dependencies from piplock.txt (make install)
   start     run local project
 ```