Merge pull request #709 from EESSI/add_back_ldjson

Clean up data generation, add test, include ldjson

Author: bedroge

.github/workflows/script_module_list.yml

@@ -34,12 +34,6 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-      - name: Make EESSI available
-        uses: eessi/github-action-eessi@v3
-      - name: Set up Python
-        uses: eessi/github-action-eessi@v3
-        with:
-          python-version: '3.7'
       - name: Install dependencies
         run: |
           python -m venv venv

.github/workflows/test_overview_available_software.yml

@@ -17,18 +17,12 @@ jobs:
           python-version: '3.10'
           architecture: x64
 
-      - name: Mount EESSI
-        uses: eessi/github-action-eessi@e1f8f20638ea417a18d23ab29443ee34794ff900 # v3.1.0
-        with:
-          eessi_stack_version: '2023.06'
-
       - name: test overview available software
         id: test_overview_available_software
         run: |
           # install required Python packages in virtual environment
           python -m venv venv
           . venv/bin/activate
-          pip install -r mkdocs-ldjson-plugin/requirements.txt
           pip install -r scripts/available_software/requirements.txt
 
           # download https://eessi.io/api_data/data/eessi_api_metadata_software.json
@@ -42,14 +36,11 @@ jobs:
           python scripts/available_software/available_software.py
           ./scripts/update_generated_time.sh mkdocs.yml
 
-          # determine whether pull request should be opened:
+          # determine whether pull request would need to be opened:
           # if detailed software pages in docs/available_software/detail have been updated, then a PR should be opened
           if [[ $(git status --porcelain ./docs/available_software/detail) ]]; then
             echo "Software pages have been changed, PR should be opened"
             git diff ./docs/available_software/detail
           else
             echo "Software pages have not been changed, no need to open PR"
           fi
-
-          # remove the data directory containing the original JSON file, or it'll end up in the PR being opened
-          rm -r ${data_dir}

.github/workflows/update_available_software.yml

@@ -17,11 +17,6 @@ jobs:
           python-version: '3.10'
           architecture: x64
 
-      - name: Mount EESSI
-        uses: eessi/github-action-eessi@e1f8f20638ea417a18d23ab29443ee34794ff900 # v3.1.0
-        with:
-          eessi_stack_version: '2023.06'
-
       - name: update overview of available software
         id: update_available_software
         run: |
@@ -38,7 +33,6 @@ jobs:
           curl -OL https://eessi.io/api_data/data/eessi_api_metadata_software.json
           cd -
 
-          export TIME_GENERATED_TEMPLATE="{{ generated_time }}"
           python scripts/available_software/available_software.py
           ./scripts/update_generated_time.sh mkdocs.yml
 
@@ -54,8 +48,8 @@ jobs:
             echo "json_data_changed=no" >> $GITHUB_OUTPUT
           fi
 
-          # remove the data directory containing the original JSON file, or it'll end up in the PR being opened
-          rm -r ${data_dir}
+          # remove the JSON file in the data directory, or it'll end up in the PR being opened
+          rm -r ${data_dir}/*.json
 
       - name: create pull request
         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8