SSO, test additions, database work, ASGI middleware, and more

Makefile

@@ -1,5 +1,3 @@
-.ONESHELL:
-
 # Can be overridden to use a different directory name.
 VENV ?= .venv
 
@@ -39,15 +37,13 @@ PYTEST_REPORT := pytest
 # This variable is reassigned to whichever of the dev/cicd
 # targets actually runs.
 DEFAULT_TARGET ?= dev
-.DEFAULT_GOAL = $(DEFAULT_TARGET)
+.DEFAULT_GOAL := $(DEFAULT_TARGET)
 
 
 ifeq ($(DEFAULT_TARGET),dev)
-    CONFIGURE_TARGET := _dev_configure
-    BUILD_TARGET := _dev_build
+    BUILD_TARGET := $(SETUP_DEV_SENTINEL)
 else ifeq ($(DEFAULT_TARGET),cicd)
-    CONFIGURE_TARGET := _cicd_configure
-    BUILD_TARGET := _cicd_build
+    BUILD_TARGET := $(SETUP_CICD_SENTINEL) 
 else
     $(error DEFAULT_TARGET must be one of "dev" or "cicd")
 endif
@@ -61,167 +57,147 @@ PACKAGE_INSTALL_DIR := $(VENV)/lib/python*/site-packages/BL_Python
 # used to suppress outputs of targets (see `test` and `clean-test`)
 CMD_PREFIX=
 
-define package_to_dist
-$(VENV)/lib/python$(PYTHON_VERSION)/site-packages/BL_Python.$(1)-*.dist-info
-endef
-
-define package_to_inst
-$(VENV)/lib/python$(PYTHON_VERSION)/site-packages/BL_Python/$(1)/__init__.py
-endef
-
-define dep_to_venv_path
-$(VENV)/lib/python$(PYTHON_VERSION)/site-packages/$(1)
-endef
-
 PYPROJECT_FILES=./pyproject.toml $(wildcard src/*/pyproject.toml)
 PACKAGE_PATHS=$(subst /pyproject.toml,,$(PYPROJECT_FILES))
 PACKAGES=$(subst /pyproject.toml,,$(subst src/,BL_Python.,$(wildcard src/*/pyproject.toml)))
 
+
+MAKE_ARTIFACT_DIRECTORY = .make
+$(MAKE_ARTIFACT_DIRECTORY):
+	mkdir -p $(MAKE_ARTIFACT_DIRECTORY)
+
+SETUP_DEPENDENCIES_SENTINEL = $(MAKE_ARTIFACT_DIRECTORY)/dependencies_sentinel
+SETUP_DEV_SENTINEL = $(MAKE_ARTIFACT_DIRECTORY)/setup_dev_sentinel
+SETUP_CICD_SENTINEL = $(MAKE_ARTIFACT_DIRECTORY)/setup_cicd_sentinel
+
+PYPROJECT_FILES_SENTINEL = ./.pyproject_sentinel
+$(PYPROJECT_FILES_SENTINEL): $(VENV)
+	$(MAKE) $(PYPROJECT_FILES)
+	touch $@
+
 .PHONY: dev
-dev : $(VENV) $(SETUP_DEPENDENCIES)
-	$(MAKE) _dev_build DEFAULT_TARGET=dev
-_dev_configure : $(VENV) $(PYPROJECT_FILES)
-_dev_build : _dev_configure
-	@if [ -d $(call package_to_dist,all) ]; then
-		echo "Package $@ is already built, skipping..."
-	else
-		$(ACTIVATE_VENV)
-
-		pip install -e .[dev-dependencies]
-#		By default, psycopg2 is not installed
-#		but it should be for development
-		pip install -e src/database[postgres-binary]
-
-		rm -rf $(PACKAGE_INSTALL_DIR)
+dev :
+	$(MAKE) $(SETUP_DEV_SENTINEL) DEFAULT_TARGET=dev
+# By default, psycopg2 is not installed
+# but it should be for development
+$(SETUP_DEV_SENTINEL): $(VENV) $(SETUP_DEPENDENCIES_SENTINEL) $(PYPROJECT_FILES_SENTINEL) | $(MAKE_ARTIFACT_DIRECTORY)
+# `pip list` is multiple seconds faster than `pip show` ...
+	$(ACTIVATE_VENV) && \
+	if pip list -l --no-index | grep '^BL_Python\.all\s'; then \
+		echo "Package BL_Python.all is already built, skipping..."; \
+	else \
+		pip install -e .[dev-dependencies] && \
+		pip install -e src/database[postgres-binary] && \
+		rm -rf $(PACKAGE_INSTALL_DIR); \
 	fi
-
+	touch $@
 	@$(REPORT_VENV_USAGE)
 
-cicd : $(VENV) $(SETUP_DEPENDENCIES)
-	$(MAKE) _cicd_build DEFAULT_TARGET=cicd
-_cicd_configure : $(VENV) $(PYPROJECT_FILES)
-_cicd_build : _cicd_configure
-	@if [ -f $(call package_to_inst,) ]; then
-		echo "Package is already built, skipping..."
-	else
-		$(ACTIVATE_VENV)
-
-		pip install .[dev-dependencies]
-#		By default, psycopg2 is not installed
-#		but it should be for CI/CD
-		pip install src/database[postgres-binary]
+.PHONY: cicd
+cicd :
+	$(MAKE) $(SETUP_CICD_SENTINEL) DEFAULT_TARGET=cicd
+$(SETUP_CICD_SENTINEL): $(VENV) $(SETUP_DEPENDENCIES_SENTINEL) $(PYPROJECT_FILES_SENTINEL) | $(MAKE_ARTIFACT_DIRECTORY)
+# `pip list` is multiple seconds faster than `pip show` ...
+	$(ACTIVATE_VENV) && \
+	if pip list -l --no-index | grep '^BL_Python\.all\s'; then \
+		echo "Package BL_Python.all is already built, skipping..."; \
+	else \
+		pip install .[dev-dependencies] && \
+		pip install src/database[postgres-binary]; \
 	fi
-
+	touch $@
 	@$(REPORT_VENV_USAGE)
 
+.PHONY: BL_Python.all $(PACKAGES)
 BL_Python.all: $(DEFAULT_TARGET)
-$(PACKAGES) : BL_Python.%: src/%/pyproject.toml $(VENV) $(CONFIGURE_TARGET) $(PYPROJECT_FILES)
-	@if [ -d $(call package_to_dist,$*) ]; then
-		@echo "Package $@ is already built, skipping..."
-	else
-		$(ACTIVATE_VENV)
-
-		if [ "$@" = "BL_Python.database" ]; then
-			pip install -e $(dir $<)[postgres-binary]
-		else
-			pip install -e $(dir $<)
-		fi
-
-		rm -rf $(PACKAGE_INSTALL_DIR)
+$(PACKAGES) : BL_Python.%: src/%/pyproject.toml $(VENV) $(PYPROJECT_FILES_SENTINEL) | $(MAKE_ARTIFACT_DIRECTORY)
+# `pip list` is multiple seconds faster than `pip show` ...
+	$(ACTIVATE_VENV) && \
+	if pip list -l --no-index | grep '^BL_Python\.$*\s'; then \
+		echo "Package $* is already built, skipping..."; \
+	else \
+		if [ "$@" = "BL_Python.database" ]; then \
+			pip install -e $(dir $<)[postgres-binary]; \
+		else \
+			pip install -e $(dir $<); \
+		fi; \
+		rm -rf $(PACKAGE_INSTALL_DIR); \
 	fi
-
 	@$(REPORT_VENV_USAGE)
 
+$(SETUP_DEPENDENCIES_SENTINEL): $(VENV) | $(MAKE_ARTIFACT_DIRECTORY)
+	$(ACTIVATE_VENV) && \
+	if ! pip list -l --no-index | grep '^toml$*\s'; then \
+		pip install toml; \
+	fi
 
-SETUP_DEPENDENCIES=$(call dep_to_venv_path,toml/__init__.py) $(call dep_to_venv_path,typing_extensions.py)
- $(call dep_to_venv_path,toml/__init__.py): $(VENV)
-	$(ACTIVATE_VENV)
-
-	pip install toml
-
- $(call dep_to_venv_path,typing_extensions.py): $(VENV)
-	$(ACTIVATE_VENV)
-
-	pip install typing_extensions
+	$(ACTIVATE_VENV) && \
+	if ! pip list -l --no-index | grep '^typing_extensions$*\s'; then \
+		pip install typing_extensions; \
+	fi
 
-$(PACKAGE_PATHS) : $(VENV) $(SETUP_DEPENDENCIES)
-$(PYPROJECT_FILES) : $(VENV) $(SETUP_DEPENDENCIES)
-	$(ACTIVATE_VENV)
+	touch $@
 
+$(PACKAGE_PATHS) : $(VENV) $(SETUP_DEPENDENCIES_SENTINEL)
+$(PYPROJECT_FILES) : $(VENV) $(SETUP_DEPENDENCIES_SENTINEL)
+	$(ACTIVATE_VENV) && \
 	REWRITE_DEPENDENCIES=$(REWRITE_DEPENDENCIES) \
 	GITHUB_REF=$(GITHUB_REF) \
 	GITHUB_WORKSPACE=$(GITHUB_WORKSPACE) \
 	./.github/workflows/CICD-scripts/pyproject_dependency_rewrite.py -c $@
 
-
 $(VENV) :
 	test -d $(VENV) || env python$(PYTHON_VERSION) -m venv $(VENV)
-
-	$(ACTIVATE_VENV)
-
+	$(ACTIVATE_VENV) && \
 	pip install -U pip
 
-
 format-isort : $(VENV) $(BUILD_TARGET)
-	$(ACTIVATE_VENV)
-
+	$(ACTIVATE_VENV) && \
 	isort src
 
 format-ruff : $(VENV) $(BUILD_TARGET)
-	$(ACTIVATE_VENV)
-
+	$(ACTIVATE_VENV) && \
 	ruff format --preview --respect-gitignore
 
 .PHONY: format format-ruff format-isort
 format : $(VENV) $(BUILD_TARGET) format-isort format-ruff
 
-
 test-isort : $(VENV) $(BUILD_TARGET)
-	$(ACTIVATE_VENV)
-
+	$(ACTIVATE_VENV) && \
 	isort --check-only src
 
 test-ruff : $(VENV) $(BUILD_TARGET)
-	$(ACTIVATE_VENV)
-
+	$(ACTIVATE_VENV) && \
 	ruff format --preview --respect-gitignore --check
 
 test-pyright : $(VENV) $(BUILD_TARGET)
-	$(ACTIVATE_VENV)
-
-  ifeq "$(PYRIGHT_MODE)" "pip"
+ifeq ($(PYRIGHT_MODE),pip)
+	$(ACTIVATE_VENV) && \
 	pyright
-  else
-  ifeq "$(PYRIGHT_MODE)" "npm"
-#	this isn't the real install path everywhere,
-#	but this is used for CI/CD
+else ifeq ($(PYRIGHT_MODE),npm)
+# this isn't the real install path everywhere,
+# but this is used for CI/CD
+	$(ACTIVATE_VENV) && \
 	./node_modules/bin/pyright
-  else
-	@echo "Invalid PYRIGHT_MODE '$(PYRIGHT_MODE)'"
-	@exit 1
-  endif
-  endif
+else
+	@echo "Invalid PYRIGHT_MODE '$(PYRIGHT_MODE)'"; \
+	exit 1
+endif
 
+# don't exit with an error
+# while testing bandit.
 test-bandit : $(VENV) $(BUILD_TARGET)
-	$(ACTIVATE_VENV)
-
-#	don't exit with an error
-#	while testing bandit.
-	-bandit -c pyproject.toml \
+	-$(ACTIVATE_VENV) && \
+	bandit -c pyproject.toml \
 		--format sarif \
 		--output $(REPORTS_DIR)/$(BANDIT_REPORT) \
 		-r .
 
 test-pytest : $(VENV) $(BUILD_TARGET)
-	$(ACTIVATE_VENV)
-
-	pytest $(PYTEST_FLAGS) \
-		&& PYTEST_EXIT_CODE=0 \
-		|| PYTEST_EXIT_CODE=$$?
-
-	-coverage html --data-file=$(REPORTS_DIR)/$(PYTEST_REPORT)/.coverage
-	-junit2html $(REPORTS_DIR)/$(PYTEST_REPORT)/pytest.xml $(REPORTS_DIR)/$(PYTEST_REPORT)/pytest.html
-
+	-$(ACTIVATE_VENV) && \
+	pytest $(PYTEST_FLAGS) && PYTEST_EXIT_CODE=0 || PYTEST_EXIT_CODE=$$?; \
+	coverage html --data-file=$(REPORTS_DIR)/$(PYTEST_REPORT)/.coverage; \
+	junit2html $(REPORTS_DIR)/$(PYTEST_REPORT)/pytest.xml $(REPORTS_DIR)/$(PYTEST_REPORT)/pytest.html; \
 	exit $$PYTEST_EXIT_CODE
 
 .PHONY: test test-pytest test-bandit test-pyright test-ruff test-isort
@@ -230,17 +206,14 @@ test : CMD_PREFIX=@
 test : clean-test
 	$(MAKE) -j --keep-going _test
 
-
 .PHONY: publish-all
 # Publishing should use a real install, which `cicd` fulfills
 publish-all : REWRITE_DEPENDENCIES=false
 # Publishing should use a real install. Reset the build env.
 publish-all : reset $(VENV)
-	$(ACTIVATE_VENV)
-
+	$(ACTIVATE_VENV) && \
 	./publish_all.sh $(PYPI_REPO)
 
-
 clean-build :
 	find . -type d \
 	\( \
@@ -253,7 +226,7 @@ clean-build :
 		-o -name __pycache__ \
 		-o -name \*.egg-info \
 		-o -name .pytest-cache \
-	\) -prune -exec rm -rf {} \;
+	\) -prune -exec rm -rf {} +
 
 clean-test :
 	$(CMD_PREFIX)rm -rf \
@@ -263,7 +236,7 @@ clean-test :
 .PHONY: clean clean-test clean-build
 clean : clean-build clean-test
 	rm -rf $(VENV)
-
+	rm -rf $(MAKE_ARTIFACT_DIRECTORY)
 	@echo '\nDeactivate your venv with `deactivate`'
 
 .PHONY: remake
@@ -272,10 +245,11 @@ remake :
 	$(MAKE)
 
 reset-check:
-#	https://stackoverflow.com/a/47839479
+# https://stackoverflow.com/a/47839479
 	@echo -n "This will make destructive changes! Considering stashing changes first.\n"
 	@( read -p "Are you sure? [y/N]: " response && case "$$response" in [yY]) true;; *) false;; esac )
 
 .PHONY: reset reset-check
 reset : reset-check clean
 	git checkout -- $(PYPROJECT_FILES)
+

publish_all.sh

@@ -83,6 +83,7 @@
     src/database \
     src/development \
     src/GitHub\
+    src/identity \
     src/platform \
     src/programming \
     src/testing \
@@ -91,14 +92,15 @@
 
 initialize
 
 for package in ${packages[@]}; do
     build $package
 done
 
 # default to testpypi
 [ -n "$1" ] && repository="$1" || repository="testpypi"
 
 tput init 2> /dev/null
 for package in ${packages[@]}; do
     publish $package $repository
-done
+done
+

pyproject.toml

@@ -32,6 +32,7 @@ dependencies = [
     "BL_Python.database",
     "BL_Python.development",
     "BL_Python.GitHub",
+    "BL_Python.identity",
     "BL_Python.platform",
     "BL_Python.programming",
     "BL_Python.testing",
@@ -55,6 +56,7 @@ readme = {file = ["README.md"], content-type = "text/markdown"}
 "BL_Python.database" = "src/database/BL_Python/database"
 "BL_Python.development" = "src/development/BL_Python/development"
 "BL_Python.GitHub" = "src/GitHub/BL_Python/GitHub"
+"BL_Python.identity" = "src/identity/BL_Python/identity"
 "BL_Python.platform" = "src/platform/BL_Python/platform"
 "BL_Python.programming" = "src/programming/BL_Python/programming"
 "BL_Python.testing" = "src/testing/BL_Python/testing"
@@ -67,6 +69,7 @@ packages = [
     "BL_Python.database",
     "BL_Python.development",
     "BL_Python.GitHub",
+    "BL_Python.identity",
     "BL_Python.platform",
     "BL_Python.programming",
     "BL_Python.testing",
@@ -117,6 +120,7 @@ extraPaths = [
     "src/database",
     "src/development",
     "src/GitHub",
+    "src/identity",
     "src/platform",
     "src/programming",
     "src/testing",
@@ -149,6 +153,7 @@ pythonpath = [
     "src/database",
     "src/development",
     "src/GitHub",
+    "src/identity",
     "src/platform",
     "src/programming",
     "src/testing",
@@ -161,6 +166,7 @@ testpaths = [
     "src/database/test",
     "src/development/test",
     "src/GitHub/test",
+    "src/identity/test",
     "src/platform/test",
     "src/programming/test",
     "src/testing/test",