Skip to content

Commit a15bb3e

Browse files
hf-fveselyhf-fvesely
committed
Merge remote-tracking branch 'origin/main' into FST/Issue878_UpdateBO_Enums
2 parents b74faaa + 9b0da05 commit a15bb3e

247 files changed

Lines changed: 4569 additions & 3543 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ jobs:
3939

4040
steps:
4141
- name: Checkout repository
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v5
4343

4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v3
46+
uses: github/codeql-action/init@v4
4747
with:
4848
languages: ${{ matrix.language }}
4949
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
5454
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5555
# If this step fails, then you should remove it and run the build manually (see below)
5656
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v3
57+
uses: github/codeql-action/autobuild@v4
5858

5959
# ℹ️ Command-line programs to run using the OS shell.
6060
# 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
6868
# make release
6969

7070
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v3
71+
uses: github/codeql-action/analyze@v4

‎.github/workflows/coverage.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ jobs:
99
python-version: ["3.12"]
1010
os: [ubuntu-latest]
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
13+
with:
14+
fetch-depth: 0
1315
- name: Set up Python ${{ matrix.python-version }}
14-
uses: actions/setup-python@v5
16+
uses: actions/setup-python@v6
1517
with:
1618
python-version: ${{ matrix.python-version }}
1719
- name: Install dependencies

‎.github/workflows/docs_latest.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ jobs:
2929
- name: Set routing name to test-XXXXXX
3030
if: github.ref != 'refs/heads/main'
3131
run: echo "REF_NAME=test-$(shuf -i 100000-999999 -n 1)" >> "$GITHUB_ENV"
32-
- uses: actions/setup-python@v5
32+
- uses: actions/setup-python@v6
3333
with:
3434
python-version: ${{ matrix.python-version }}
3535
- name: Checkout
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737
with:
3838
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
3939
- name: Install dependencies
@@ -44,8 +44,6 @@ jobs:
4444
# Note: The sphinx action below can only install a single requirements file.
4545
- name: Build JSON Schemas
4646
run: tox -e generate_json_schemas
47-
env:
48-
TARGET_VERSION: ${{ env.REF_NAME }}
4947
- name: Build BO4E package
5048
# Note: This step necessary to correctly set the version in the JSON-Schema-links
5149
run: |

‎.github/workflows/formatting.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ jobs:
55
formatting:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
9-
- uses: actions/setup-python@v5
8+
- uses: actions/checkout@v5
9+
- uses: actions/setup-python@v6
1010
- uses: pre-commit/action@v3.0.1

‎.github/workflows/linting.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
os: [ubuntu-latest, windows-latest]
1111
linter-env: ["linting", "type_check", "dev"]
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- name: Set up Python ${{ matrix.python-version }}
15-
uses: actions/setup-python@v5
15+
uses: actions/setup-python@v6
1616
with:
1717
python-version: ${{ matrix.python-version }}
1818
- name: Install dependencies

‎.github/workflows/packaging_test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ jobs:
66
runs-on: ${{ matrix.os }}
77
strategy:
88
matrix:
9-
python-version: ["3.9", "3.10", "3.11", "3.12"]
9+
python-version: ["3.10", "3.11", "3.12"]
1010
os: [ubuntu-latest]
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- name: Set up Python ${{ matrix.python-version }}
14-
uses: actions/setup-python@v5
14+
uses: actions/setup-python@v6
1515
with:
1616
python-version: ${{ matrix.python-version }}
1717
- name: Install dependencies

‎.github/workflows/python-publish-scheduled.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
runs-on: ${{ matrix.os }}
1414
strategy:
1515
matrix:
16-
python-version: ["3.9", "3.10", "3.11", "3.12"]
16+
python-version: ["3.10", "3.11", "3.12"]
1717
os: [ubuntu-latest]
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
- name: Set up Python ${{ matrix.python-version }}
21-
uses: actions/setup-python@v5
21+
uses: actions/setup-python@v6
2222
with:
2323
python-version: ${{ matrix.python-version }}
2424
- name: Install tox
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout repository
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3636
- name: Calculate Tag Name
3737
id: calc_tag
3838
run: |
@@ -52,9 +52,9 @@ jobs:
5252
needs: tests
5353
steps:
5454
- name: Check out Git repository
55-
uses: actions/checkout@v4
55+
uses: actions/checkout@v5
5656
- name: Set up Python ${{ matrix.python-version }}
57-
uses: actions/setup-python@v5
57+
uses: actions/setup-python@v6
5858
with:
5959
python-version: ${{ matrix.python-version }}
6060
- name: Install tox
@@ -66,7 +66,7 @@ jobs:
6666
env:
6767
TARGET_VERSION: ${{ github.ref_name }}
6868
- name: Push schemas to BO4E-Schemas repo
69-
uses: cpina/github-action-push-to-another-repository@v1.7.2
69+
uses: cpina/github-action-push-to-another-repository@v1.7.3
7070
env:
7171
API_TOKEN_GITHUB: ${{ secrets.BO4E_PYTHON_GENERATE_SCHEMAS }} # this token expires on 2024-10-09
7272
# token with repo scope
@@ -98,9 +98,9 @@ jobs:
9898
id-token: write
9999
needs: [tests, generate]
100100
steps:
101-
- uses: actions/checkout@v4
101+
- uses: actions/checkout@v5
102102
- name: Set up Python
103-
uses: actions/setup-python@v5
103+
uses: actions/setup-python@v6
104104
with:
105105
python-version: "3.10.x"
106106
- name: Install dependencies

‎.github/workflows/python-publish.yml‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
python-version: ["3.12"]
1717
os: [ubuntu-latest]
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
- name: Set up Python ${{ matrix.python-version }}
21-
uses: actions/setup-python@v5
21+
uses: actions/setup-python@v6
2222
with:
2323
python-version: ${{ matrix.python-version }}
2424
- name: Install tox
@@ -33,11 +33,11 @@ jobs:
3333
runs-on: ubuntu-latest
3434
steps:
3535
- name: Check out Git repository
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737
with:
3838
fetch-depth: 0
3939
- name: Set up Python ${{ matrix.python-version }}
40-
uses: actions/setup-python@v5
40+
uses: actions/setup-python@v6
4141
with:
4242
python-version: "3.12"
4343
- name: Install dependencies
@@ -51,30 +51,36 @@ jobs:
5151
TARGET_VERSION: ${{ github.ref_name }}
5252
- name: Check version tag
5353
run: |
54-
python -m docs.compatibility.versioning --gh-version ${{ github.ref_name }} \
55-
--gh-token ${{ secrets.GITHUB_TOKEN }} --major-bump-disallowed
54+
# Get last version tag
55+
LAST_VERSION=$(bo4e repo versions -qcn 1 -r ${{ github.ref_name }})
56+
bo4e pull -t $LAST_VERSION -o tmp/last_schemas
57+
bo4e diff schemas tmp/last_schemas json_schemas -o tmp/diff.json
58+
bo4e diff version-bump tmp/diff.json -aq
5659
json_schemas:
5760
name: Generate JSON-Schemas
5861
runs-on: ubuntu-latest
5962
needs: [tests, check_version_tag]
6063
concurrency: build-n-publish-json-schemas
6164
steps:
6265
- name: Check out Git repository
63-
uses: actions/checkout@v4
66+
uses: actions/checkout@v5
6467
- name: Set up Python ${{ matrix.python-version }}
65-
uses: actions/setup-python@v5
68+
uses: actions/setup-python@v6
6669
with:
6770
python-version: "3.12"
6871
- name: Install tox
6972
run: |
7073
python -m pip install --upgrade pip
7174
pip install tox
7275
- name: Build JSON Schemas
73-
run: tox -e generate_json_schemas
76+
run: |
77+
tox -e generate_json_schemas
78+
# Remove .version file as we don't want to commit it to BO4E-Schemas
79+
rm json_schemas/.version
7480
env:
7581
TARGET_VERSION: ${{ github.ref_name }}
7682
- name: Push schemas to BO4E-Schemas repo
77-
uses: cpina/github-action-push-to-another-repository@v1.7.2
83+
uses: cpina/github-action-push-to-another-repository@v1.7.3
7884
env:
7985
API_TOKEN_GITHUB: ${{ secrets.BO4E_PYTHON_GENERATE_SCHEMAS }} # this token expires on 2024-10-09
8086
# token with repo scope
@@ -107,11 +113,11 @@ jobs:
107113
needs: [tests, check_version_tag]
108114
concurrency: build-n-publish-docs
109115
steps:
110-
- uses: actions/checkout@v4
116+
- uses: actions/checkout@v5
111117
with:
112118
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
113119
- name: Set up Python
114-
uses: actions/setup-python@v5
120+
uses: actions/setup-python@v6
115121
with:
116122
python-version: "3.12"
117123
- name: Install dependencies
@@ -177,9 +183,9 @@ jobs:
177183
needs: [tests, json_schemas, docs]
178184
concurrency: build-n-publish-distributions
179185
steps:
180-
- uses: actions/checkout@v4
186+
- uses: actions/checkout@v5
181187
- name: Set up Python
182-
uses: actions/setup-python@v5
188+
uses: actions/setup-python@v6
183189
with:
184190
python-version: "3.10.x"
185191
- name: Install dependencies

‎.github/workflows/test_docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
python-version: ["3.12"]
1010
os: [ubuntu-latest]
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
with:
1414
fetch-depth: 0
1515
- name: Set up Python ${{ matrix.python-version }}
16-
uses: actions/setup-python@v5
16+
uses: actions/setup-python@v6
1717
with:
1818
python-version: ${{ matrix.python-version }}
1919
- name: Run kroki with docker

‎.github/workflows/tests.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ jobs:
66
runs-on: ${{ matrix.os }}
77
strategy:
88
matrix:
9-
python-version: ["3.9", "3.10", "3.11", "3.12"]
9+
python-version: ["3.10", "3.11", "3.12"]
1010
os: [ubuntu-latest]
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
13+
with:
14+
fetch-depth: 0
1315
- name: Set up Python ${{ matrix.python-version }}
14-
uses: actions/setup-python@v5
16+
uses: actions/setup-python@v6
1517
with:
1618
python-version: ${{ matrix.python-version }}
1719
- name: Install tox

0 commit comments

Comments
 (0)