Dealing with broken hexkit stuff

ghga-de · May 22, 2024 · b2eb96e · b2eb96e
1 parent a0d2242
commit b2eb96e
Show file tree

Hide file tree

Showing 27 changed files with 1,388 additions and 881 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.9-bullseye
+FROM mcr.microsoft.com/devcontainers/python:1-3.12-bookworm
 
 ENV PYTHONUNBUFFERED 1
 

diff --git a/.github/workflows/check_config_docs.yaml b/.github/workflows/check_config_docs.yaml
@@ -9,12 +9,12 @@ jobs:
   check-config:
     name: Check config schema and example
     needs: get-changed-services
-    if: ${{ needs.get-changed-services.outputs.since-last-commit != '' }}
+    if: ${{ needs.get-changed-services.outputs.services != '' }}
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        service: ${{ fromJson(needs.get-changed-services.outputs.since-last-commit) }}
+        service: ${{ fromJson(needs.get-changed-services.outputs.services) }}
       fail-fast: false
 
     env:

diff --git a/.github/workflows/check_openapi_specs.yaml b/.github/workflows/check_openapi_specs.yaml
@@ -10,12 +10,12 @@ jobs:
   check-openapi-specs:
     name: Check config schema and example
     needs: get-changed-services
-    if: ${{ needs.get-changed-services.outputs.since-last-commit != '' }}
+    if: ${{ needs.get-changed-services.outputs.services != '' }}
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        service: ${{ fromJson(needs.get-changed-services.outputs.since-last-commit) }}
+        service: ${{ fromJson(needs.get-changed-services.outputs.services) }}
       fail-fast: false
 
     env:

diff --git a/.github/workflows/check_readmes.yaml b/.github/workflows/check_readmes.yaml
@@ -27,11 +27,11 @@ jobs:
   check-service-readme:
     name: Check README file for ${{matrix.service}}
     needs: get-changed-services
-    if: ${{ needs.get-changed-services.outputs.all-changes != '' }}
+    if: ${{ needs.get-changed-services.outputs.services != '' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        service: ${{ fromJson(needs.get-changed-services.outputs.since-last-commit) }}
+        service: ${{ fromJson(needs.get-changed-services.outputs.services) }}
       fail-fast: false
     env:
       IFRS_CONFIG_YAML: ./services/ifrs/dev_config.yaml

diff --git a/.github/workflows/get_affected_services.yaml b/.github/workflows/get_affected_services.yaml
@@ -3,15 +3,12 @@ name: Get services affected by changes
 on:
   workflow_call:
     outputs:
-      all-changes:
-        description: "Services affected by changes for all commits on branch"
-        value: ${{ jobs.get_changed_services_pr.outputs.services }}
-      since-last-commit:
+      services:
         description: "Services affected by changes since last commit"
-        value: ${{ jobs.get_changed_services_commit.outputs.services }}
+        value: ${{ jobs.get-changed-services.outputs.services }}
 
 jobs:
-  get_changed_services_commit:
+  get-changed-services:
     runs-on: ubuntu-latest
     outputs:
       services: ${{ steps.services-changed.outputs.affected }}
@@ -34,27 +31,3 @@ jobs:
         id: services-changed
         run: |
           echo "affected=$(python3 ./scripts/get_affected_services.py ${{ steps.changed-files.outputs.all_changed_files }} )" >> $GITHUB_OUTPUT
-
-  get_changed_services_pr:
-    runs-on: ubuntu-latest
-    outputs:
-      services: ${{ steps.services-changed.outputs.affected }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Changed Files
-        id: changed-files
-        uses: tj-actions/changed-files@v44
-
-      - name: Install Typer to check changed services
-        id: install-typer
-        run: pip install typer>=0.9.0
-
-      - name: Generate list of changed services
-        id: services-changed
-        run: |
-          echo "affected=$(python3 ./scripts/get_affected_services.py ${{ steps.changed-files.outputs.all_changed_files }} )" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/tests_on_pr.yaml b/.github/workflows/tests_on_pr.yaml
diff --git a/.github/workflows/tests_on_push.yaml b/.github/workflows/tests_on_push.yaml
@@ -11,11 +11,11 @@ jobs:
 
   test:
     needs: get-changed-services
-    if: ${{ needs.get-changed-services.outputs.since-last-commit != '' }}
+    if: ${{ needs.get-changed-services.outputs.services != '' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        service: ${{ fromJson(needs.get-changed-services.outputs.since-last-commit) }}
+        service: ${{ fromJson(needs.get-changed-services.outputs.services) }}
       fail-fast: false
 
     env:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 
 default_language_version:
-  python: python3.9
+  python: python3.12
 
 minimum_pre_commit_version: 3.6.0
 
@@ -49,7 +49,7 @@ repos:
       - id: no-commit-to-branch
         args: [--branch, dev, --branch, int, --branch, main]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.2
+    rev: v0.4.4
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

diff --git a/lock/requirements-dev-template.in b/lock/requirements-dev-template.in
@@ -20,7 +20,7 @@ httpx>=0.27
 pytest-httpx>=0.30
 
 urllib3>=1.26.18
-requests>=2.31
+requests>=2.31,<2.32
 
 stringcase>=1.2
 jsonschema2md>=1.1