Merge branch 'master' into changelog-2023-12-04

.github/workflows/generate_foreign_keys.yml

@@ -3,8 +3,8 @@ on:
   push:
     paths:
       - '**-foreign-keys.yml'
-    branches:
-      - '!master'
+    branches-ignore:
+      - 'master'
 
 jobs:
   generate-foreign-keys:
@@ -23,6 +23,7 @@ jobs:
         with:
           packages: |
             pyyaml
+            pandas
 
       - name: Generate foreign keys
         run: python generate_foreign_keys.py
@@ -38,5 +39,5 @@ jobs:
           git add -A
           git config --global user.email "[email protected]"
           git config --global user.name 'github-actions'
-          git commit -am "Automated commit: Generate JSON schemas"
+          git commit -am "Automated commit: Generate foreign keys"
           git push

.github/workflows/get_json_schema_from_catalog.yml

@@ -24,7 +24,7 @@ on:
         required: true
 
 jobs:
-  generate-changelog:
+  get-json-schemas:
     runs-on: ubuntu-latest
     steps:      
       - name: Get current date
@@ -51,7 +51,7 @@ jobs:
             pyyaml
 
       - name: Get JSON files
-        run: python manual_json_import.py ${{ secrets.GITHUB_TOKEN }} ${{ github.event.inputs.tap }} ${{ github.event.inputs.version }} ${{ github.event.inputs.file }}
+        run: python manual_json_import.py ${{ github.event.inputs.tap }} ${{ github.event.inputs.version }} ${{ github.event.inputs.file }}
         working-directory: ./scripts/json
 
       - name: Check for changes
@@ -74,11 +74,11 @@ jobs:
           branch: ${{ github.event.inputs.branch }}
 
       - name: Create pull request
-        if: steps.get_changes.outputs.changed != 0 && ${{ github.event.inputs.pr }} == true
+        if: steps.get_changes.outputs.changed != 0 && github.event.inputs.pr == 'true'
         uses: repo-sync/pull-request@v2
         with:
           source_branch: ${{ github.event.inputs.branch }}
-          destination_branch: "master"
+          destination_branch: "TDL-23186-json-schema"
           github_token: ${{ secrets.GITHUB_TOKEN }}
           pr_label: "json-schemas-update"
           pr_title: ${{ github.event.inputs.tap }} JSON schema updates ${{ env.date }}

.github/workflows/import_json_schemas.yml

@@ -12,7 +12,7 @@ on:
         required: false
 
 jobs:
-  generate-changelog:
+  import-schemas:
     runs-on: ubuntu-latest
     steps:      
       - name: Get current date
@@ -28,7 +28,7 @@ jobs:
         run: |
           git config --global user.email "[email protected]"
           git fetch
-          git checkout TDL-23186-json-schema
+          git checkout master
           git branch ${{ env.branch }}
       
       - name: Checkout branch
@@ -47,6 +47,7 @@ jobs:
         with:
           packages: |
             requests
+            pyyaml
 
       - name: Get JSON files
         run: python get_json_files.py ${{ secrets.GITHUB_TOKEN }} ${{ github.event.inputs.repo }} ${{ github.event.inputs.branch }}
@@ -62,7 +63,7 @@ jobs:
           git add -A
           git config --global user.email "[email protected]"
           git config --global user.name 'github-actions'
-          git commit -am "Automated commit: Add JSON schemas"
+          git commit -am "Automated commit: Import JSON schemas"
       
       - name: Push changes
         if: steps.get_changes.outputs.changed != 0
@@ -76,7 +77,7 @@ jobs:
         uses: repo-sync/pull-request@v2
         with:
           source_branch: ${{ env.branch }}
-          destination_branch: "master"
+          destination_branch: "TDL-23186-json-schema"
           github_token: ${{ secrets.GITHUB_TOKEN }}
           pr_label: "json-schemas-update"
           pr_title: ${{ github.event.inputs.repo }} JSON schema updates ${{ env.date }}

.gitignore

@@ -13,3 +13,5 @@ Thumbs.db
 *~
 *.scssc
 .cache_ggshield
+__pycache__
+*.pyc