Merge pull request #2059 from ccnmtl/update-makefiles

Update makefiles

Author: ndittren

django.mk

@@ -2,30 +2,31 @@
 
 # CHANGES:
 # 1.10.0 - 2025-10-16 - Removed coverage, updated dependencies.
-# 1.9.0              - Use coverage tool directly to generate coverage
-#                      reports.
-#                    - wheel and pip updates
-#                    - Use pre-compiled binary wheel for cryptography
-#					 - Remove Travis references
-# 1.8.0 - 2019-10-21 - Don't run flake8 on local_settings.py
-# 1.7.0 - 2018-05-31 - Now using python 3 by default
-#                    - Removed virtualenv.py in favor of python 3's
-#                      builtin venv capability.
-# 1.6.0 - 2017-09-05 - add bandit secure analysis configuration
-# 1.5.0 - 2017-08-24 - remove jshint/jscs in favor of eslint
-# 1.4.0 - 2017-06-06 - backout the switch to eslint. that's not really ready yet.
-# 1.3.0 - 2017-06-05 - pypi location is not needed anymore
-# 1.2.0 - 2016-12-15 - bump wheel version to 0.29
-# 1.1.0 - 2016-11-08 - run flake8 tests before unit tests
-# 1.0.1 - 2016-05-02 - Remove deprecated syncdb command from make install
+# 1.9.0               - Use coverage tool directly to generate coverage
+#                       reports.
+#                     - wheel and pip updates
+#                     - Use pre-compiled binary wheel for cryptography
+#                     - Remove Travis references
+# 1.8.0  - 2019-10-21 - Don't run flake8 on local_settings.py
+# 1.7.0  - 2018-05-31 - Now using python 3 by default
+#                     - Removed virtualenv.py in favor of python 3's
+#                       builtin venv capability.
+# 1.6.0  - 2017-09-05 - add bandit secure analysis configuration
+# 1.5.0  - 2017-08-24 - remove jshint/jscs in favor of eslint
+# 1.4.0  - 2017-06-06 - backout the switch to eslint. that's not really ready yet.
+# 1.3.0  - 2017-06-05 - pypi location is not needed anymore
+# 1.2.0  - 2016-12-15 - bump wheel version to 0.29
+# 1.1.0  - 2016-11-08 - run flake8 tests before unit tests
+# 1.0.1  - 2016-05-02 - Remove deprecated syncdb command from make install
 
 VE ?= ./ve
 MANAGE ?= ./manage.py
 REQUIREMENTS ?= requirements.txt
 SYS_PYTHON ?= python3
 PY_SENTINAL ?= $(VE)/sentinal
 WHEEL_VERSION ?= 0.45.1
-PIP_VERSION ?= 25.2
+PIP_VERSION ?= 25.3
+SETUPTOOLS_VERSION ?= 80.9.0
 MAX_COMPLEXITY ?= 10
 INTERFACE ?= localhost
 RUNSERVER_PORT ?= 8000
@@ -34,19 +35,19 @@ BANDIT ?= $(VE)/bin/bandit
 FLAKE8 ?= $(VE)/bin/flake8
 PIP ?= $(VE)/bin/pip
 
-jenkins: check flake8 test eslint bandit
+jenkins: check flake8 test bandit
 
 $(PY_SENTINAL): $(REQUIREMENTS)
 	rm -rf $(VE)
 	$(SYS_PYTHON) -m venv $(VE)
 	$(PIP) install pip==$(PIP_VERSION)
-	$(PIP) install --upgrade setuptools
+	$(PIP) install setuptools==$(SETUPTOOLS_VERSION)
 	$(PIP) install wheel==$(WHEEL_VERSION)
 	$(PIP) install --no-deps --requirement $(REQUIREMENTS)
 	touch $@
 
 test: $(PY_SENTINAL)
-	$(MANAGE) test $(APP)
+	$(MANAGE) test $(PY_DIRS)
 
 parallel-tests: $(PY_SENTINAL)
 	$(MANAGE) test --parallel
@@ -77,26 +78,4 @@ clean:
 	rm -rf node_modules
 	find . -name '*.pyc' -exec rm {} \;
 
-pull:
-	git pull
-	make check
-	make test
-	make migrate
-	make flake8
-
-rebase:
-	git pull --rebase
-	make check
-	make test
-	make migrate
-	make flake8
-
-# run this one the very first time you check
-# this out on a new machine to set up dev
-# database, etc. You probably *DON'T* want
-# to run it after that, though.
-install: jenkins
-	createdb $(APP)
-	make migrate
-
-.PHONY: jenkins test flake8 runserver migrate check shell clean pull rebase install
+.PHONY: jenkins test flake8 runserver migrate check shell clean

docker.mk

@@ -1,37 +1,17 @@
-# VERSION=1.0.0
+# VERSION=2.0.0
 # Docker related stuff
-# use wheelhouse/requirements.txt as the sentinal so make
-# knows whether it needs to rebuild the wheel directory or not
-# has the added advantage that it can just pip install
-# from that later on as well
 
-ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-WHEELHOUSE ?= wheelhouse
-ORG ?= ccnmtl
-BUILDER_IMAGE ?= ccnmtl/django.build
+# Start up docker dev server with docker-compose
+docker:
+	docker compose up
 
-# make it easy to override the docker image created. eg:
-#     REGISTRY=localhost:5000/ TAG=release-5 make build
-# to make an image 'localhost:5000/ccnmtl/app:release-5'
-# defaults to docker hub (ie, no registry specified) and no tag.
+# Enter a command-line shell in the web container
+docker-shell:
+	docker compose run web bash
 
-ifeq ($(origin TAG), undefined)
-	IMAGE ?= $(REGISTRY)$(ORG)/$(APP)
-else
-	IMAGE ?= $(REGISTRY)$(ORG)/$(APP):$(TAG)
-endif
+# Enter an interactive django shell
+docker-django-shell:
+	docker compose run web python manage.py shell_plus \
+		--settings=$(APP).settings_docker
 
-$(WHEELHOUSE)/requirements.txt: $(REQUIREMENTS)
-	mkdir -p $(WHEELHOUSE)
-	docker run --rm \
-	-v $(ROOT_DIR):/app \
-	-v $(ROOT_DIR)/$(WHEELHOUSE):/wheelhouse \
-	$(BUILDER_IMAGE)
-	cp $(REQUIREMENTS) $@
-	touch $@
-
-# Run this target to rebuild the django image
-build: $(WHEELHOUSE)/requirements.txt
-	docker build -t $(IMAGE) .
-
-.PHONY: build
+.PHONY: docker docker-shell docker-django-shell

js.mk

@@ -23,13 +23,13 @@ NODE_MODULES ?= ./node_modules
 JS_SENTINAL ?= $(NODE_MODULES)/sentinal
 ESLINT ?= $(NODE_MODULES)/.bin/eslint
 
-NPM_OPTS = --also=dev
+NPM_OPTS = --include=dev
 
 ifeq ($(ENVIRONMENT),production)
-	NPM_OPTS = --only=prod
+	NPM_OPTS = --omit=dev
 endif
 ifeq ($(ENVIRONMENT),staging)
-	NPM_OPTS = --only=prod
+	NPM_OPTS = --omit=dev
 endif
 
 $(JS_SENTINAL): package.json