Merge remote-tracking branch 'origin/released' into released

scqubits · Jul 2, 2022 · 63c1531 · 63c1531
2 parents e5b5d9b + 730a76b
commit 63c1531
Show file tree

Hide file tree

Showing 3 changed files with 3,210 additions and 4,279 deletions.
diff --git a/.github/workflows/pytests.yml b/.github/workflows/pytests.yml
@@ -6,6 +6,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    timeout-minutes: 100
     strategy:
       max-parallel: 1
       matrix:

diff --git a/examples/demo_parametersweep.ipynb b/examples/demo_parametersweep.ipynb
@@ -14,7 +14,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {
     "ExecuteTime": {
      "end_time": "2016-09-05T09:09:54.232690",
@@ -33,7 +33,7 @@
     "%config InlineBackend.figure_format = 'svg'\n",
     "\n",
     "import scqubits as scq\n",
-    "from scqubits import HilbertSpace, InteractionTerm, ParameterSweep\n",
+    "from scqubits import HilbertSpace, ParameterSweep\n",
     "\n",
     "import numpy as np"
    ]
@@ -29696,7 +29696,7 @@
  "metadata": {
   "celltoolbar": "Edit Metadata",
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -29757,4 +29757,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}