100 character width (#4)

Author: covracer

.github/workflows/check.yml

@@ -9,15 +9,40 @@ jobs:
         steps:
             - uses: actions/checkout@v4
             - uses: actions/setup-python@v4
-            - uses: actions/cache@v3
+
+            - uses: actions/cache/restore@v4
+              id: restore-pip
               with:
+                  key: |
+                      ${{ runner.os }}-pip
+                      ${{ hashFiles('pyproject.toml') }}
+                      ${{ hashFiles('requirements.in') }}
                   path: ~/.cache/pip
-                  key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('requirements.in') }}
-                  restore-keys: ${{ runner.os }}-pip-
-            - uses: actions/cache@v3
+            - run: pip install --upgrade pip && pip install --upgrade 'pip-tools>7' && pip-sync
+              env:
+                  PIP_PROGRESS_BAR: 'off'
+            - uses: actions/cache/save@v4
               with:
+                  key: ${{ steps.restore-pip.outputs.cache-primary-key }}
+                  path: ~/.cache/pip
+
+            - uses: actions/cache/restore@v4
+              id: restore-pre-commit
+              with:
+                  key: |
+                      ${{ runner.os }}-pre-commit
+                      ${{ hashFiles('.pre-commit-config.yaml') }}
+                  path: ~/.cache/pre-commit
+            - run: pre-commit install-hooks
+            - uses: actions/cache/save@v3
+              with:
+                  key: ${{ steps.restore-pre-commit.outputs.cache-primary-key }}
                   path: ~/.cache/pre-commit
-                  key: ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-                  restore-keys: ${{ runner.os }}-pre-commit-
-            - run: pip install pip-tools && pip-sync
+
             - run: source includes.sh && pcam --color always --show-diff-on-failure
+            - run: python -m build
+            - run: twine check dist/*
+            - run: python -m manage check
+            - run: python -m manage makemigrations --check
+            - run: docker compose build
+            - run: docker compose run web python -m manage test

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
       hooks:
           - id: black
     - repo: https://github.com/jazzband/pip-tools
-      rev: 6.13.0
+      rev: 7.3.0
       hooks:
           - id: pip-compile
             args:
@@ -34,6 +34,10 @@ repos:
                 - json
                 - yaml
                 - toml
+    - repo: https://github.com/stephen-ra-king/piptools-sync
+      rev: v1.0.4
+      hooks:
+          - id: piptools_sync
 
     # Linters
     - repo: https://github.com/abravalheri/validate-pyproject
@@ -50,7 +54,9 @@ repos:
     - repo: local
       hooks:
           - id: gitignore
-            entry: curl -so .gitignore https://raw.githubusercontent.com/github/gitignore/main/Python.gitignore
+            entry: |
+                curl -so .gitignore
+                https://raw.githubusercontent.com/github/gitignore/main/Python.gitignore
             language: system
             name: gitignore
             pass_filenames: false

.prettierrc.toml

@@ -2,4 +2,4 @@ trailingComma = 'all'
 tabWidth = 4
 semi = false
 singleQuote = true
-printWidth = 120
+printWidth = 100

.yamllint.yaml

@@ -7,6 +7,6 @@ rules:
     indentation:
         spaces: 4
     line-length:
-        max: 120
+        max: 100
     truthy:
         level: error

includes.sh

@@ -16,9 +16,20 @@ if ! [[ -x $(command -v nvm) ]]; then
     [[ -s "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh" || echo ERROR: nvm missing
 fi
 
+# F: no-op for single page, R: color, X: keep text when exiting, i: case insensitive searching
+LESS="-FRXi"
+export LESS
+
 # Aliases only work in interactive shells
+alias jq='jq --color-output'
 alias ls='ls --color=auto'
 
+pathver() {
+    : Print path and version
+    (type "$1" && "$1" --version) |
+        sed -Ee N -e 's,^[^/(]*,,' -e 's,\((.+)\),\1,' -e 's/\n/ /'
+}
+
 a() {
     : Activate virtual environment after changing directory
 
@@ -35,12 +46,24 @@ a() {
 
     cd "$directory" || return 1
 
+    # TODO pyenv-virtualenv wants `. deactivate`
+    # TODO conda wants `conda deactivate`
     [[ $(command -v deactivate) ]] && deactivate
 
-    if [[ -f $directory/.venv/bin/activate ]]; then
+    if [[ -f .venv/bin/activate ]]; then
         # shellcheck disable=SC1091
-        source "$directory/.venv/bin/activate"
-        python --version
+        source .venv/bin/activate
+        pathver python
+    elif [[ -d conda ]]; then
+        # shellcheck disable=SC1091
+        source "$HOME/miniconda3/etc/profile.d/conda.sh"
+        conda activate "$(basename "$directory")"
+        pathver python
+    fi
+
+    if [[ -f .nvmrc ]]; then
+        nvm install && nvm use
+        pathver node
     fi
 }
 
@@ -53,16 +76,26 @@ devready() {
     [[ $(git config --global push.default) == current ]] || echo WARNING: git push.default != current
 }
 
+pc() {
+    : run Pre-Commit on modified files
+    pre-commit run "$@"
+}
+
 pca() {
     : run Pre-Commit on All files
     pre-commit run --all-files "$@"
 }
 
 pcam() {
-    : run Pre-Commit on All files but just Manual stage hooks
+    : run Pre-Commit on All files including Manual stage hooks
     pre-commit run --all-files --hook-stage manual "$@"
 }
 
+pcm() {
+    : run Pre-Commit on modified files including Manual stage hooks
+    pre-commit run --hook-stage manual "$@"
+}
+
 resourcerun() {
     : RE-SOURCE this file and RUN the specified function with tracing enabled
     # shellcheck source=includes.sh

requirements.in

@@ -10,5 +10,6 @@ django-stubs
 mypy
 pre-commit
 types-requests
+twine
 
 # pip-tools and wheel will be installed by Dockerfile

requirements.txt

@@ -15,7 +15,9 @@ cfgv==3.3.1
 charset-normalizer==3.1.0
     # via requests
 cryptography==41.0.5
-    # via -r requirements.in
+    # via
+    #   -r requirements.in
+    #   secretstorage
 distlib==0.3.6
     # via virtualenv
 django==4.2.1
@@ -30,34 +32,77 @@ django-stubs==4.2.0
     # via -r requirements.in
 django-stubs-ext==4.2.0
     # via django-stubs
+docutils==0.20.1
+    # via readme-renderer
 filelock==3.12.0
     # via virtualenv
 identify==2.5.24
     # via pre-commit
 idna==3.4
     # via requests
+importlib-metadata==7.0.1
+    # via
+    #   keyring
+    #   twine
+jaraco-classes==3.3.0
+    # via keyring
+jeepney==0.8.0
+    # via
+    #   keyring
+    #   secretstorage
+keyring==24.3.0
+    # via twine
+markdown-it-py==3.0.0
+    # via rich
+mdurl==0.1.2
+    # via markdown-it-py
+more-itertools==10.2.0
+    # via jaraco-classes
 mypy==1.3.0
     # via
     #   -r requirements.in
     #   django-stubs
 mypy-extensions==1.0.0
     # via mypy
+nh3==0.2.15
+    # via readme-renderer
 nodeenv==1.8.0
     # via pre-commit
+pkginfo==1.9.6
+    # via twine
 platformdirs==3.5.1
     # via virtualenv
 pre-commit==3.3.2
     # via -r requirements.in
 pycparser==2.21
     # via cffi
+pygments==2.17.2
+    # via
+    #   readme-renderer
+    #   rich
 pyjwt==2.8.0
     # via -r requirements.in
 pyyaml==6.0.1
     # via pre-commit
+readme-renderer==42.0
+    # via twine
 requests==2.31.0
-    # via -r requirements.in
+    # via
+    #   -r requirements.in
+    #   requests-toolbelt
+    #   twine
+requests-toolbelt==1.0.0
+    # via twine
+rfc3986==2.0.0
+    # via twine
+rich==13.7.0
+    # via twine
+secretstorage==3.3.3
+    # via keyring
 sqlparse==0.4.4
     # via django
+twine==4.0.2
+    # via -r requirements.in
 types-pytz==2023.3.0.0
     # via django-stubs
 types-pyyaml==6.0.12.10
@@ -72,9 +117,13 @@ typing-extensions==4.6.3
     #   django-stubs-ext
     #   mypy
 urllib3==2.0.3
-    # via requests
+    # via
+    #   requests
+    #   twine
 virtualenv==20.23.0
     # via pre-commit
+zipp==3.17.0
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools