clean

.github/workflows/ci.yaml

@@ -1,7 +1,11 @@
-name: CI
+name: ci
 
 on:
   pull_request: # Start the job on all PRs
+  push:
+    branches:
+      - master
+      - main
 
 jobs:
   precommit:
@@ -10,18 +14,14 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: "3.10"
 
-      - name: Install Rust Toolchain
-        uses: dtolnay/rust-toolchain@nightly
-
-      - name: Set shfmt version environment variable
-        run: echo "SHFMT_VERSION=v3.7.0" >> $GITHUB_ENV
-
       - name: Cache pip dependencies
         uses: actions/cache@v3
         with:
@@ -34,9 +34,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /usr/local/bin/shfmt
-          key: ${{ runner.os }}-shfmt-${{ env.SHFMT_VERSION }}
+          key: ${{ runner.os }}-shfmt-
           restore-keys: |
-            ${{ runner.os }}-shfmt-${{ env.SHFMT_VERSION }}
             ${{ runner.os }}-shfmt-
 
       - name: Cache Pre-Commit environments
@@ -50,38 +49,15 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install pre-commit
-          pre-commit install
-
-      - name: Install shfmt
-        run: |
-          SHFMT_VERSION=${{ env.SHFMT_VERSION }}
-          SHFMT_BIN="shfmt_${SHFMT_VERSION}_linux_amd64"
-          if [[ ! -f /usr/local/bin/shfmt ]]; then
-            wget -O shfmt "https://github.com/mvdan/sh/releases/download/${SHFMT_VERSION}/${SHFMT_BIN}"
-            chmod +x shfmt
-            sudo mv shfmt /usr/local/bin/
-          fi
-          sudo apt-get install shellcheck
-          rustup component add clippy
-          rustup component add rustfmt
+          make setuppc
 
       - name: Run pre-commits
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          REPO_NAME=$(echo $GITHUB_REPOSITORY | sed 's/^.*\///')
-          DEFAULT_BRANCH=$(curl -H "Authorization: token $GITHUB_TOKEN" \
-            "https://api.github.com/repos/$GITHUB_REPOSITORY" | jq -r '.default_branch')
-
-          git fetch
-          CUR_SHA=$(git log --pretty=tformat:"%H" -n1 . | tail -n1)
+          DEFAULT_BRANCH=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')
 
-          echo "Default branch is $DEFAULT_BRANCH"
-          echo "Current SHA is $CUR_SHA"
+          echo "Default branch = $DEFAULT_BRANCH"
+          echo "Current SHA    = ${{ github. sha }}"
 
-          if [[ $GITHUB_REF == "refs/heads/$DEFAULT_BRANCH" ]]; then
-            pre-commit run --all
-          else
-            pre-commit run --from-ref origin/$DEFAULT_BRANCH --to-ref $CUR_SHA
-          fi
+          pre-commit run --from-ref origin/$DEFAULT_BRANCH --to-ref "${{ github. sha }}"

.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+  "recommendations": [
+    "ms-python.python",
+    "ms-python.vscode-pylance",
+    "ms-python.isort",
+    "ms-python.black-formatter",
+    "ms-python.flake8"
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "[python]": {
+    "editor.formatOnType": true,
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "ms-python.black-formatter"
+  },
+  "flake8.args": ["--config=.ci/flake8.cfg"],
+  "files.insertFinalNewline": true
+}

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cpa"
-version = "0.1.0"
+version = "0.1.5"
 edition = "2021"
 
 [dependencies]

Makefile

@@ -24,7 +24,7 @@ endif
 
 .PHONY: reqtxt
 reqtxt:
-	poetry export -f requirements.txt --output requirements.txt --without-hashes
+	poetry export -f requirements.txt --output requirements.txt
 
 .PHONY: pcao
 pcao:

example/base/.github/workflows/ci.yaml

@@ -0,0 +1,63 @@
+name: ci
+
+on:
+  pull_request: # Start the job on all PRs
+  push:
+    branches:
+      - master
+      - main
+
+jobs:
+  precommit:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Cache pip dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - name: Cache shfmt binary
+        uses: actions/cache@v3
+        with:
+          path: /usr/local/bin/shfmt
+          key: ${{ runner.os }}-shfmt-
+          restore-keys: |
+            ${{ runner.os }}-shfmt-
+
+      - name: Cache Pre-Commit environments
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pre-commit
+          key: ${{ runner.os }}-pc-${{ hashFiles('.pre-commit-config.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pc-${{ hashFiles('.pre-commit-config.yaml') }}
+            ${{ runner.os }}-pc-
+
+      - name: Install dependencies
+        run: |
+          make setuppc
+
+      - name: Run pre-commits
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          DEFAULT_BRANCH=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')
+
+          echo "Default branch = $DEFAULT_BRANCH"
+          echo "Current SHA    = ${{ github. sha }}"
+
+          pre-commit run --from-ref origin/$DEFAULT_BRANCH --to-ref "${{ github. sha }}"

example/base/.gitignore

@@ -0,0 +1,189 @@
+##########################################################################################
+# Python
+# From: https://github.com/github/gitignore/blob/main/Python.gitignore
+##########################################################################################
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# 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
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+##########################################################################################
+# Rust
+# From: https://github.com/github/gitignore/blob/main/Rust.gitignore
+##########################################################################################
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb
+
+
+##########################################################################################
+# Misc
+##########################################################################################
+tmp*