Down-convert OAS 3.1 constructs for SDK generation

.github/workflows/publish.yaml

@@ -25,10 +25,11 @@ jobs:
         with:
           node-version: "20" # Specify the Node.js version to use
 
-      # Step 3: Install openapi-merge-cli and openapi-generator-cli
+      # Step 3: Install openapi-merge-cli, openapi-down-convert and openapi-generator-cli
       - name: Install openapi-merge-cli
         run: |
           npm i openapi-merge-cli ajv uri-js
+          npm i @apiture/openapi-down-convert@^0.14.2
           npm i @openapitools/openapi-generator-cli@~2.20.2
 
       # Step 4: Set up Python
@@ -60,6 +61,11 @@ jobs:
       - name: Merge the yaml files
         run: npx openapi-merge-cli --config ./openapi-merge.json
 
+      # Step 8b: Down-convert any OAS 3.1-only constructs (openapi-merge always declares
+      # 3.0.3 regardless of input, so source specs written for 3.1 need this to stay valid)
+      - name: Down-convert OpenAPI 3.1 constructs to 3.0
+        run: npx openapi-down-convert --input ./wordliftApiSpec.yaml --output ./wordliftApiSpec.yaml
+
       # Step 9: Normalize security scheme aliases in the merged spec
       - name: Normalize security scheme aliases
         run: python3 ./utils/normalize_security_schemes.py

.github/workflows/python.yml

@@ -1,4 +1,6 @@
-# NOTE: This file is auto generated by OpenAPI Generator.
+# NOTE: This file was originally auto generated by OpenAPI Generator, but is now
+# hand-maintained (listed in .openapi-generator-ignore) since the generator's
+# default matrix includes EOL Python versions unavailable on current runners.
 # URL: https://openapi-generator.tech
 #
 # ref: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
@@ -13,12 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

.openapi-generator-ignore

@@ -23,3 +23,7 @@
 #!docs/README.md
 
 .gitignore
+
+# Hand-maintained: the generator's default matrix includes EOL Python 3.7, which
+# GitHub-hosted Ubuntu runners no longer ship (Ubuntu 24.04 has no 3.7 build).
+.github/workflows/python.yml

package.json

@@ -4,6 +4,7 @@
   "description": "Analyse content using Linked Data and Knowledge Graphs.",
   "license": "Apache License 2.0",
   "dependencies": {
+    "@apiture/openapi-down-convert": "^0.14.2",
     "@openapitools/openapi-generator-cli": "~2.20.2",
     "ajv": "^8.20.0",
     "openapi-merge-cli": "^1.3.2",