Merge pull request #486 from open-contracting/0.9-dev

0.9.5: Merge the development branch onto the live branch

Author: jpmckinney

.github/workflows/ci.yml

@@ -2,45 +2,13 @@ name: CI
 on: [push, pull_request]
 jobs:
   build:
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-          cache: pip
-          cache-dependency-path: '**/requirements*.txt'
-      # Don't install editable projects in the current working directory.
-      # https://pip.pypa.io/en/latest/reference/pip_install/#install-src
-      - run: pip install --src $GITHUB_WORKSPACE/../src -r requirements.txt
-      - if: github.repository == 'open-contracting/standard_profile_template'
-        run: make update extract
-      - run: make
-      # Disable linkcheck as it is too slow for development.
-      # - run: |
-      #     make linkcheck
-      #     find . \( -name output.json -o -name output.txt \) -exec rm -r "{}" \;
-      - run: pytest -W error
-      # Deploy the built documentation to the staging directory.
-      - if: github.event_name == 'push'
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.PRIVATE_KEY }}
-          known_hosts: standard.open-contracting.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGveFGTJ9yyObNGDUCUyzyFkm6Kzh3YqIt1qB7B/KU6E
-      - if: github.event_name == 'push'
-        uses: bcomnes/netrc-creds@v2
-        with:
-          machine: standard.open-contracting.org
-          login: manage
-          password: ${{ secrets.ELASTICSEARCH_PASSWORD }}
-      - if: github.event_name == 'push' && success() && github.repository != 'open-contracting/standard_profile_template'
-        env:
-          PATH_PREFIX: infrastructure/
-          PRODUCTION: ${{ startsWith(github.ref, 'refs/tags') || github.ref == 'refs/heads/latest' || github.ref == 'refs/heads/0.9' }}
-          RELEASE: ${{ startsWith(github.ref, 'refs/tags') }}
-          VERSION: "0.9"
-        shell: bash
-        run: curl -sS https://raw.githubusercontent.com/open-contracting/deploy/main/deploy-docs.sh | bash -
+    uses: open-contracting/.github/.github/workflows/ci-profile.yml@main
+    secrets:
+      private-key: ${{ secrets.PRIVATE_KEY }}
+      elasticsearch-password: ${{ secrets.ELASTICSEARCH_PASSWORD }}
+    with:
+      path-prefix: infrastructure/
+      version: '0.9'
+      production-refs: '["refs/heads/0.9"]'
+      # Linkcheck is slow for development.
+      linkcheck: false

.github/workflows/js.yml

@@ -1,13 +1,7 @@
 name: Lint JavaScript
 on: [push, pull_request]
 jobs:
-  build:
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      - run: npm install standard
-      - run: npx standard docs/_static/json-example-format.js
+  lint:
+    uses: open-contracting/.github/.github/workflows/js.yml@main
+    with:
+      filenames: docs/_static/json-example-format.js

.github/workflows/lint.yml

@@ -1,19 +1,11 @@
 name: Lint
 on: [push, pull_request]
-env:
-  BASEDIR: https://raw.githubusercontent.com/open-contracting/standard-maintenance-scripts/main
 jobs:
-  build:
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-          cache: pip
-          cache-dependency-path: '**/requirements*.txt'
-      - shell: bash
-        run: curl -s -S --retry 3 $BASEDIR/tests/install.sh | bash -
-      - shell: bash
-        run: curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
+  lint:
+    uses: open-contracting/.github/.github/workflows/lint.yml@main
+    permissions:
+      contents: write
+    secrets:
+      personal-access-token: ${{ secrets.PAT }}
+    with:
+      python-version: '3.10'

.github/workflows/shell.yml

@@ -1,15 +1,5 @@
 name: Lint Shell
 on: [push, pull_request]
 jobs:
-  build:
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install shellcheck
-        run: |
-          sudo apt update
-          sudo apt install shellcheck
-      - run: sudo snap install shfmt
-      - run: shellcheck $(shfmt -f .)
-      - run: shfmt -d -i 4 -sr $(shfmt -f .)
+  lint:
+    uses: open-contracting/.github/.github/workflows/shell.yml@main

.github/workflows/spellcheck.yml

@@ -1,13 +1,8 @@
 name: Spell-check
 on: [push, pull_request]
 jobs:
-  build:
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-      - run: pip install codespell
-      - run: codespell -S .git,docson,locale,country.csv,currency.csv -L fo,tne,zar .
+  lint:
+    uses: open-contracting/.github/.github/workflows/spellcheck.yml@main
+    with:
+      ignore: fo,tne,zar
+      skip: docson,locale,country.csv,currency.csv

.pre-commit-config.yaml

@@ -0,0 +1,18 @@
+ci:
+  autoupdate_schedule: quarterly
+  skip: [pip-compile]
+default_language_version:
+    python: python3.10
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.8.6
+    hooks:
+      - id: ruff
+      - id: ruff-format
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.5.14
+    hooks:
+      - id: pip-compile
+        name: pip-compile common-requirements.in
+        args: [common-requirements.in, -o, common-requirements.txt]
+        files: ^common-requirements\.(in|txt)$

.python-version

@@ -0,0 +1 @@
+3.10