Merge branch 'main' into main

qiskit-community · Jan 16, 2024 · 6254f95 · 6254f95
2 parents 29fa537 + 6122ebf
commit 6254f95
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 43 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -21,9 +21,11 @@ jobs:
           pip install -U tox==4.11.0 setuptools==67.3.1 virtualenv==20.24.3 wheel==0.38.4
           sudo apt update
           sudo apt install graphviz=2.42.2-6 pandoc=2.9.2.1-3ubuntu2 qtbase5-dev=5.15.3+dfsg-2ubuntu0.2 qt5-qmake=5.15.3+dfsg-2ubuntu0.2
-      - name: Build and publish
-        env:
-          encrypted_rclone_key: ${{ secrets.encrypted_rclone_key }}
-          encrypted_rclone_iv: ${{ secrets.encrypted_rclone_iv }}
-        run: |
-          tools/deploy_documentation.sh
+      - name: Build docs
+        run: tox -edocs -- -j auto
+      - name: Bypass Jekyll Processing # Necessary for setting the correct css path
+        run: touch docs/_build/html/.nojekyll
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: docs/_build/html/
diff --git a/qiskit_metal/analyses/quantization/lumped_capacitive.py b/qiskit_metal/analyses/quantization/lumped_capacitive.py
@@ -502,7 +502,7 @@ def levels_vs_ng_real_units(Cq, IC, N=301, do_disp=0, do_plots=0):
                      3,
                  ] / h / 1e9,
                  'g',
-                 LineWidth=2)
+                 linewidth=2)
         plt.xlabel('Gate charge, n_g [2e]')
         plt.ylabel('Energy, E_n [GHz]')
         plt.subplot(1, 2, 2)

diff --git a/tools/deploy_documentation.sh b/tools/deploy_documentation.sh
diff --git a/tools/rclone.conf.enc b/tools/rclone.conf.enc