Merge remote-tracking branch 'origin/master' into eqnn_forcefield_qjit

Author: paul0403

.github/workflows/artifacts.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Run CircleCI artifacts redirector
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Get artifact URL
         id: getArtifact

.github/workflows/demo_diff_check.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           access_token: ${{ github.token }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: dev
 
@@ -84,7 +84,7 @@ jobs:
         with:
           access_token: ${{ github.token }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: master
 
@@ -147,7 +147,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build-dev, build-master]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         # We checkout a dedicated unprotected branch and store the output of
         # the checker there

.github/workflows/deploy-pr.yml

@@ -13,9 +13,9 @@ jobs:
     steps:
       # Needed to Built pennylane.ai-react
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Download Build Context
         uses: XanaduAI/cloud-actions/download-github-workflow-artifact@main

.github/workflows/update-dev.yml

@@ -26,13 +26,30 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.NIGHTLY_TOKEN }}
+          fetch-depth: 0  # We want entire git-history to avoid any merge conflicts
 
       - name: Nightly Merge
-        uses: robotology/gh-action-nightly-merge@v1.3.3
-        with:
-          stable_branch: 'master'
-          development_branch: 'dev'
-          allow_ff: false
         env:
-          GITHUB_TOKEN: ${{ secrets.NIGHTLY_TOKEN }}
+          CONFIG_USERNAME: GitHub Nightly Merge Action
+          CONFIG_EMAIL: actions@github.com
+          MERGE_HEAD: master
+          MERGE_BASE: dev
+          MERGE_ARGS: --no-ff --allow-unrelated-histories --no-edit
+        run: |
+          # This script is adapted from the robotology/gh-action-nightly-merge@v1.5.2 GitHub action:
+          # https://github.com/robotology/gh-action-nightly-merge/blob/master/entrypoint.sh
+
+          git config --global user.name "$CONFIG_USERNAME"
+          git config --global user.email "$CONFIG_EMAIL"
+
+          git fetch origin $MERGE_HEAD
+          (git checkout $MERGE_HEAD && git pull origin $MERGE_HEAD)
+
+          git fetch origin $MERGE_BASE
+          (git checkout $MERGE_BASE && git pull origin $MERGE_BASE)
+
+          git merge $MERGE_ARGS $MERGE_HEAD
+          git push origin $MERGE_BASE

.github/workflows/upload-json.yml

@@ -54,7 +54,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.branch }}
           fetch-depth: 1

.github/workflows/upload-text.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.branch }}
           fetch-depth: 1
@@ -51,11 +51,21 @@ jobs:
           path: qml_text
 
       - name: Copy Concatenated Metadata into Build
-        run: >
-          jq -s .
-          $(find demonstrations -name "*.metadata.json" -type f
-          ! -name "demonstrations_categories.metadata.json")
-          > ${{ steps.qml_text.outputs.download-path }}/demos/metadata.json
+        run: |
+          tmp_metadata_json=$(mktemp)
+          out_metadata_json=${{ steps.qml_text.outputs.download-path }}/demos/metadata.json
+
+          filepaths=$(
+            find demonstrations -name "*.metadata.json" -type f \
+            ! -name "demonstrations_categories.metadata.json" \
+          )
+
+          for filepath in $filepaths; do
+              slug=$(basename $filepath .metadata.json)
+              jq ". += {\"slug\": \"$slug\"}" < $filepath >> $tmp_metadata_json
+          done
+
+          jq --slurp --sort-keys . < $tmp_metadata_json > $out_metadata_json
 
       - name: Upload
         uses: XanaduAI/cloud-actions/push-to-s3-and-invalidate-cloudfront@main

.github/workflows/validate-demo-metadata.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           ref: ${{ inputs.branch }}
@@ -74,7 +74,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           ref: ${{ inputs.branch }}
@@ -101,7 +101,7 @@ jobs:
           METADATA_FILE_LIST: ${{ needs.generate-metadata-file-list.outputs.metadata_files }}
         run: |
           cd metadata_schemas
-          ${{ steps.poetry.outputs.bin }} run check-jsonschema -v --traceback-mode full --schemafile demo.metadata.schema.0.1.1.json $METADATA_FILE_LIST
+          ${{ steps.poetry.outputs.bin }} run check-jsonschema -v --traceback-mode full --schemafile demo.metadata.schema.0.1.5.json $METADATA_FILE_LIST
 
   validate-metadata-preview-images:
     runs-on: ubuntu-latest
@@ -113,7 +113,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           ref: ${{ inputs.branch }}

Makefile

@@ -76,8 +76,8 @@ environment:
 			$$PYTHON_VENV_PATH/bin/python -m pip install --upgrade git+https://github.com/PennyLaneAI/pennylane-cirq.git#egg=pennylane-cirq;\
 			$$PYTHON_VENV_PATH/bin/python -m pip install --upgrade git+https://github.com/PennyLaneAI/pennylane-qiskit.git#egg=pennylane-qiskit;\
 			$$PYTHON_VENV_PATH/bin/python -m pip install --upgrade git+https://github.com/PennyLaneAI/pennylane-qulacs.git#egg=pennylane-qulacs;\
-			$$PYTHON_VENV_PATH/bin/python -m pip install --extra-index-url https://test.pypi.org/simple/ PennyLane-Lightning --pre --upgrade;\
 			$$PYTHON_VENV_PATH/bin/python -m pip install --extra-index-url https://test.pypi.org/simple/ PennyLane-Catalyst --pre --upgrade;\
+			$$PYTHON_VENV_PATH/bin/python -m pip install --extra-index-url https://test.pypi.org/simple/ PennyLane-Lightning --pre --upgrade;\
 			$$PYTHON_VENV_PATH/bin/python -m pip install --upgrade git+https://github.com/PennyLaneAI/pennylane.git#egg=pennylane;\
 		fi;\
 	fi

_static/authors/elaina_zhu.jpeg

@@ -0,0 +1,4 @@
+.. bio:: Elaina Zhu
+   :photo: ../_static/authors/elaina_zhu.jpeg
+
+   Elaina is a undergraduate student at Oxford University, interning at CQT. She is interested in research in the intersection of quantum technologies and computer science.