Update templates (#5)

* ignore envrc file used by direnv

* add Makefile with install command

* cleanup globals a la netid_arrest

* python 3.8 EOL, use Flask 3

Author: counik

.gitignore

@@ -84,6 +84,9 @@ ipython_config.py
 # pyenv
 .python-version
 
+# direnv
+.envrc
+
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
 #   However, in case of collaboration, if having platform-specific dependencies or dependencies

Makefile

@@ -0,0 +1,8 @@
+.ONESHELL:
+
+.PHONY: install
+install:          ## Install the project in dev mode.
+	@./venv/bin/pip install -U pip
+	@./venv/bin/pip install --no-input 'urllib3<2' keyring keyrings.google-artifactregistry-auth
+	@if ! poetry --version >/dev/null; then pip install poetry ; fi
+	@poetry install --with=dev

example_app/app.template.py

@@ -1,4 +1,5 @@
 import os
+import importlib.metadata as importlib_metadata  # Python ^3.9 change
 
 from flask import Flask, jsonify
 
@@ -13,6 +14,7 @@ def index():
 
 APP_VERSION = None
 
+
 @app.route("/status")
 def status():
     global APP_VERSION

pyproject.template.toml

@@ -5,8 +5,8 @@ description = ""
 authors = []
 
 [tool.poetry.dependencies]
-python = "^3.8"
-Flask = "^2.0.2"
+python = "^3.9"
+Flask = "^3.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2.5"

scripts/globals.template.sh

@@ -4,12 +4,13 @@ export APP_NAME="${template:app_name}"
 
 function get_instance_status {
     local stage="$1"
-    local url="https://${APP_NAME}.iam${stage}.s.uw.edu/status"
-    curl -sk $url
+    # substitute '_' for '-' in APP_NAME
+    local url="https://${APP_NAME//_/-}.iam${stage}.s.uw.edu/status"
+    curl -sk "$url" || >&2 echo "Failed to check $url"
 }
 
 function get_poetry_version {
-  cat pyproject.toml | grep 'version =' | cut -f2 -d\" | head -n1
+  grep 'version =' pyproject.toml | cut -f2 -d\" | head -n1
 }
 
 
@@ -20,13 +21,13 @@ function get_promotion_version {
   local target=$1
   case $target in
     dev)
-      echo $(get_poetry_version)
+      get_poetry_version
       ;;
     eval)
-      echo $(get_instance_status dev | jq -r .version)
+      get_instance_status dev | jq -r .version
       ;;
     prod)
-      echo $(get_instance_status eval | jq -r .version)
+      get_instance_status eval | jq -r .version
       ;;
   esac
 }