If pipenv is in path, install requirements with pipenv to avoid version incompatabilities (#50)

* If pipenv is in path, install requirements with pipenv to avoid version incompatabilities

* Remove docker-compose, for now

* Revert "Remove docker-compose, for now"

This reverts commit 9bd1e46.

Author: charlieparkes

Makefile.venv

@@ -1,6 +1,8 @@
 BUILD_HARNESS_REQ_TEMPLATE:=$(BUILD_HARNESS_PATH)/requirements.template
 BUILD_HARNESS_REQ_NAME:=.build-harness.requirements.txt
 BUILD_HARNESS_REQ:=$(CURDIR)/$(BUILD_HARNESS_REQ_NAME)
+BUILD_HARNESS_PIPFILE_NAME:=.build-harness.Pipfile
+BUILD_HARNESS_PIPFILE:=$(CURDIR)/$(BUILD_HARNESS_PIPFILE_NAME)
 BUILD_HARNESS_VENV_NAME:=.build-harness.venv
 BUILD_HARNESS_VENV:=$(CURDIR)/$(BUILD_HARNESS_VENV_NAME)
 WITH_BH_VENV=$(shell test -f $(BUILD_HARNESS_REQ) && echo "source $(BUILD_HARNESS_VENV)/bin/activate 2>/dev/null &&")
@@ -26,10 +28,25 @@ $(BUILD_HARNESS_REQ): $(BUILD_HARNESS_REQ_TEMPLATE)
 	@if [ -f $@ ]; then echo "Removing previously generated build-harness requirements" && rm $@; fi
 	@cat $(BUILD_HARNESS_REQ_TEMPLATE) | xargs -I % bash -c 'if [ -z "$$(which % 2>/dev/null)" ]; then echo "% not found" && echo "%" >> $@; fi'
 
-$(BUILD_HARNESS_VENV): $(BUILD_HARNESS_REQ)
+$(BUILD_HARNESS_PIPFILE): $(BUILD_HARNESS_REQ)
+	@if [ -f $@ ]; then echo "Removing previously generated build-harness Pipfile" && rm $@; fi
+	@if [ -n "$$(which pipenv 2>/dev/null)" ]; then \
+		echo "[packages]" >> $@; \
+		cat $(BUILD_HARNESS_REQ) | xargs -I % bash -c 'if [ -z "$$(which % 2>/dev/null)" ]; then echo "% = \"*\"" >> $@; fi'; \
+	fi
+
+$(BUILD_HARNESS_VENV): $(BUILD_HARNESS_REQ) $(BUILD_HARNESS_PIPFILE)
 	@if [ -s $(BUILD_HARNESS_REQ) ]; then echo "Installing: $$(cat $(BUILD_HARNESS_REQ) | tr '\n' ' ')"; fi
-	@test -f $(BUILD_HARNESS_REQ) \
-		&& ( \
+	@if [ -n "$$(which pipenv 2>/dev/null)" ]; then \
+		echo "Installing build-harness requirements with pipenv..."; \
+		( \
+			$(shell if [ $$(python -c 'import platform; ver=int(platform.python_version()[0]); print(ver)' 2>/dev/null) -eq 2 ] && [ -n "$$(which python3 2>/dev/null)" ]; then echo "python3"; else echo "python"; fi) -m venv $@ \
+			&& source $@/bin/activate && pip install -r <(PIPENV_PIPFILE=$(BUILD_HARNESS_PIPFILE) PIPENV_QUIET=1 pipenv --bare lock -r --pre) --ignore-installed \
+		); if [ $$? -ne 0 ]; then rm -rf $@; fi; \
+	else \
+		echo "WARNING: Installing build-harness requirements with venv + pip because pipenv was not installed..."; \
+		( \
 			$(shell if [ $$(python -c 'import platform; ver=int(platform.python_version()[0]); print(ver)' 2>/dev/null) -eq 2 ] && [ -n "$$(which python3 2>/dev/null)" ]; then echo "python3"; else echo "python"; fi) -m venv $@ \
 			&& source $@/bin/activate && pip install -r $(BUILD_HARNESS_REQ) --ignore-installed \
-		); if [ $$? -ne 0 ]; then rm -rf $@; fi
+		); if [ $$? -ne 0 ]; then rm -rf $@; fi; \
+	fi

modules/python/Makefile.style

@@ -27,7 +27,7 @@ python/lint/announce/%:
 .PHONY: python/lint
 ## Check python files using black
 python/lint: bh/venv reports/
-	@$(MAKE) python/lint/targets python/isort/check python/black/check python/flake8 # python/autoflake/check
+	@$(MAKE) python/lint/targets python/isort/check python/black/check python/flake8 python/autoflake/check
 	@echo "Done."
 
 .PHONY: python/autoflake/check
@@ -78,4 +78,4 @@ python/flake8: bh/venv
 
 .PHONY: python/fmt
 ## Format python files
-python/fmt: python/isort python/black # python/autoflake
+python/fmt: python/isort python/black python/autoflake

requirements.template

@@ -2,3 +2,5 @@ advbumpversion
 black
 flake8
 isort
+autoflake
+docker-compose