Merge pull request #5331 from jenshnielsen/ruff_ipynb

Run ruff on ipynb
microsoft · Aug 28, 2023 · 98d1f56 · 98d1f56
2 parents f13426c + 0ad010a
commit 98d1f56
Show file tree

Hide file tree

Showing 61 changed files with 123 additions and 255 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,26 +13,13 @@ repos:
     - id: debug-statements
     - id: mixed-line-ending
       args: ['--fix=no']
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
   - repo: https://github.com/akaihola/darker
     rev: 1.7.2
     hooks:
       - id: darker
-        args: [-i]
-        additional_dependencies: [isort]
-  - repo: https://github.com/nbQA-dev/nbQA
-    rev: 1.7.0
-    hooks:
-        - id: nbqa-pyupgrade
-          args: ['--py39-plus']
-          additional_dependencies: [pyupgrade]
-        - id: nbqa-isort
-          additional_dependencies: [isort]
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
     rev: 'v0.0.285'
     hooks:
       - id: ruff
+        types_or: [python, pyi, jupyter, toml]
diff --git a/docs/examples/DataSet/Accessing-data-in-DataSet.ipynb b/docs/examples/DataSet/Accessing-data-in-DataSet.ipynb
@@ -45,15 +45,13 @@
     "\n",
     "import numpy as np\n",
     "\n",
-    "import qcodes\n",
     "from qcodes.dataset import (\n",
     "    Measurement,\n",
     "    initialise_or_create_database_at,\n",
     "    load_or_create_experiment,\n",
     "    plot_dataset,\n",
     ")\n",
-    "from qcodes.parameters import Parameter\n",
-    "from qcodes.station import Station"
+    "from qcodes.parameters import Parameter"
    ]
   },
   {

diff --git a/docs/examples/DataSet/Benchmarking.ipynb b/docs/examples/DataSet/Benchmarking.ipynb
@@ -16,7 +16,6 @@
    "outputs": [],
    "source": [
     "%matplotlib inline\n",
-    "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "\n",
     "import qcodes as qc\n",
@@ -25,7 +24,6 @@
     "    initialise_database,\n",
     "    load_or_create_experiment,\n",
     "    new_data_set,\n",
-    "    new_experiment,\n",
     ")"
    ]
   },

diff --git a/docs/examples/DataSet/Cache/write_for_caching.ipynb b/docs/examples/DataSet/Cache/write_for_caching.ipynb
@@ -40,23 +40,11 @@
    "source": [
     "%matplotlib notebook\n",
     "import time\n",
-    "from functools import partial\n",
-    "from time import monotonic, sleep\n",
     "\n",
-    "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
-    "import numpy.random as rd\n",
     "\n",
     "import qcodes as qc\n",
-    "from qcodes.dataset import (\n",
-    "    Measurement,\n",
-    "    initialise_database,\n",
-    "    load_by_guid,\n",
-    "    load_by_run_spec,\n",
-    "    load_or_create_experiment,\n",
-    "    plot_dataset,\n",
-    ")\n",
-    "from qcodes.station import Station\n",
+    "from qcodes.dataset import Measurement, initialise_database, load_or_create_experiment\n",
     "from qcodes.tests.instrument_mocks import (\n",
     "    DummyInstrument,\n",
     "    DummyInstrumentWithMeasurement,\n",

diff --git a/docs/examples/DataSet/DataSet-class-walkthrough.ipynb b/docs/examples/DataSet/DataSet-class-walkthrough.ipynb
@@ -79,7 +79,6 @@
     "\n",
     "import numpy as np\n",
     "\n",
-    "import qcodes\n",
     "from qcodes.dataset import (\n",
     "    Measurement,\n",
     "    initialise_or_create_database_at,\n",

diff --git a/docs/examples/DataSet/Datasaver_Builder.ipynb b/docs/examples/DataSet/Datasaver_Builder.ipynb
@@ -49,11 +49,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from functools import partial\n",
     "from itertools import product\n",
-    "from typing import *\n",
     "\n",
-    "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "\n",
     "import qcodes as qc\n",
@@ -223,7 +220,7 @@
     "    datasets =[datasaver.dataset for datasaver in datasavers]\n",
     "\n",
     "plot_dataset(datasets[0])\n",
-    "plot_dataset(datasets[1]);"
+    "plot_dataset(datasets[1])"
    ]
   },
   {
@@ -276,7 +273,7 @@
     "    dond_into(datasaver, sweep2, meas1)\n",
     "    \n",
     "    dataset = datasaver.dataset\n",
-    "plot_dataset(dataset, marker=\".\");"
+    "plot_dataset(dataset, marker=\".\")"
    ]
   },
   {
@@ -345,7 +342,7 @@
     "    datasets =[datasaver.dataset for datasaver in datasavers]\n",
     "\n",
     "plot_dataset(datasets[0])\n",
-    "plot_dataset(datasets[1]);"
+    "plot_dataset(datasets[1])"
    ]
   },
   {
@@ -392,7 +389,7 @@
     "\n",
     "    datasets =[datasaver.dataset for datasaver in datasavers]\n",
     "\n",
-    "plot_dataset(datasets[0]);"
+    "plot_dataset(datasets[0])"
    ]
   }
  ],

diff --git a/docs/examples/DataSet/Dataset_Performance.ipynb b/docs/examples/DataSet/Dataset_Performance.ipynb
@@ -43,14 +43,7 @@
     "import numpy as np\n",
     "\n",
     "import qcodes as qc\n",
-    "from qcodes.dataset import (\n",
-    "    Measurement,\n",
-    "    initialise_database,\n",
-    "    load_last_experiment,\n",
-    "    load_or_create_experiment,\n",
-    "    new_experiment,\n",
-    ")\n",
-    "from qcodes.dataset.experiment_container import Experiment\n",
+    "from qcodes.dataset import Measurement, initialise_database, load_or_create_experiment\n",
     "from qcodes.parameters import ManualParameter"
    ]
   },

diff --git a/docs/examples/DataSet/Exporting-data-to-other-file-formats.ipynb b/docs/examples/DataSet/Exporting-data-to-other-file-formats.ipynb
@@ -62,9 +62,7 @@
     "import shutil\n",
     "from pathlib import Path\n",
     "\n",
-    "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
-    "import pandas as pd\n",
     "\n",
     "import qcodes as qc\n",
     "import qcodes.logger\n",

diff --git a/docs/examples/DataSet/InMemoryDataSet.ipynb b/docs/examples/DataSet/InMemoryDataSet.ipynb
diff --git a/docs/examples/DataSet/Offline Plotting Tutorial.ipynb b/docs/examples/DataSet/Offline Plotting Tutorial.ipynb
@@ -18,17 +18,14 @@
    "outputs": [],
    "source": [
     "%matplotlib inline\n",
-    "from typing import Any, Dict, List, Tuple\n",
     "\n",
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "\n",
-    "import qcodes as qc\n",
     "from qcodes.dataset import (\n",
     "    Measurement,\n",
     "    initialise_database,\n",
     "    load_or_create_experiment,\n",
-    "    new_experiment,\n",
     "    plot_dataset,\n",
     ")\n",
     "from qcodes.parameters import Parameter"

diff --git a/docs/examples/DataSet/Paramtypes explained.ipynb b/docs/examples/DataSet/Paramtypes explained.ipynb
@@ -48,10 +48,9 @@
     "from qcodes.dataset import (\n",
     "    Measurement,\n",
     "    initialise_or_create_database_at,\n",
-    "    load_by_id,\n",
     "    load_or_create_experiment,\n",
     ")\n",
-    "from qcodes.parameters import ArrayParameter, Parameter\n",
+    "from qcodes.parameters import ArrayParameter\n",
     "from qcodes.tests.instrument_mocks import DummyInstrument"
    ]
   },

diff --git a/docs/examples/DataSet/Performing-measurements-using-qcodes-parameters-and-dataset.ipynb b/docs/examples/DataSet/Performing-measurements-using-qcodes-parameters-and-dataset.ipynb
diff --git a/docs/examples/DataSet/The-Experiment-Container.ipynb b/docs/examples/DataSet/The-Experiment-Container.ipynb
@@ -24,7 +24,6 @@
    "source": [
     "import os\n",
     "\n",
-    "import qcodes as qc\n",
     "from qcodes.dataset import (\n",
     "    connect,\n",
     "    experiments,\n",

diff --git a/docs/examples/DataSet/Threaded data acquisition.ipynb b/docs/examples/DataSet/Threaded data acquisition.ipynb
@@ -54,6 +54,7 @@
     "\n",
     "from qcodes.dataset import (\n",
     "    Measurement,\n",
+    "    ThreadPoolParamsCaller,\n",
     "    do1d,\n",
     "    initialise_database,\n",
     "    load_or_create_experiment,\n",
@@ -64,8 +65,7 @@
     "    DummyInstrument,\n",
     "    DummyInstrumentWithMeasurement,\n",
     ")\n",
-    "from qcodes.utils.threading import ThreadPoolParamsCaller, call_params_threaded\n",
-    "from qcodes.validators import Numbers"
+    "from qcodes.validators import Numbers\n"
    ]
   },
   {

diff --git a/..._functions_in_comparison_to_Measurement_context_manager_for_performing_measurements.ipynb b/..._functions_in_comparison_to_Measurement_context_manager_for_performing_measurements.ipynb
@@ -46,7 +46,6 @@
     "\n",
     "import qcodes.logger\n",
     "from qcodes.dataset import (\n",
-    "    ArraySweep,\n",
     "    LinSweep,\n",
     "    LogSweep,\n",
     "    Measurement,\n",

diff --git a/docs/examples/DataSet/Working with snapshots.ipynb b/docs/examples/DataSet/Working with snapshots.ipynb
@@ -30,7 +30,6 @@
     "import json  # for converting JSON data into python 'dict'\n",
     "from pprint import pprint  # for pretty-printing python variables like 'dict'\n",
     "\n",
-    "import qcodes\n",
     "from qcodes.dataset import Measurement, initialise_database, load_or_create_experiment\n",
     "from qcodes.parameters import Parameter\n",
     "from qcodes.station import Station\n",

diff --git a/docs/examples/DataSet/import-data-from-legacy-dat-files.ipynb b/docs/examples/DataSet/import-data-from-legacy-dat-files.ipynb
@@ -21,14 +21,10 @@
    "outputs": [],
    "source": [
     "%matplotlib inline\n",
-    "import numpy as np\n",
     "\n",
-    "import qcodes as qc\n",
     "from qcodes.dataset import (\n",
-    "    Measurement,\n",
     "    import_dat_file,\n",
     "    initialise_database,\n",
-    "    load_by_id,\n",
     "    load_or_create_experiment,\n",
     "    plot_by_id,\n",
     ")"

diff --git a/docs/examples/DataSet/subscriber json exporter.ipynb b/docs/examples/DataSet/subscriber json exporter.ipynb
@@ -16,7 +16,6 @@
    "outputs": [],
    "source": [
     "import copy\n",
-    "import json\n",
     "import logging\n",
     "\n",
     "import numpy as np"

diff --git a/docs/examples/Parameters/Parameter-With-Setpoints-defined-on-a-different-instrument.ipynb b/docs/examples/Parameters/Parameter-With-Setpoints-defined-on-a-different-instrument.ipynb
@@ -156,7 +156,7 @@
     "        self.sweep_start.source = start_parameter\n",
     "        self.sweep_stop.source = stop_parameter\n",
     "        self.setpoints.unit = start_parameter.unit\n",
-    "        if label != None:\n",
+    "        if label is not None:\n",
     "            self.setpoints.label = label\n",
     "\n",
     "\n",

diff --git a/docs/examples/Parameters/Parameters.ipynb b/docs/examples/Parameters/Parameters.ipynb
@@ -50,10 +50,8 @@
    "source": [
     "from typing import Optional\n",
     "\n",
-    "import numpy as np\n",
-    "\n",
     "from qcodes.instrument.base import InstrumentBase\n",
-    "from qcodes.parameters import ArrayParameter, ManualParameter, MultiParameter, Parameter\n",
+    "from qcodes.parameters import Parameter\n",
     "from qcodes.tests.instrument_mocks import DummyInstrument\n",
     "from qcodes.utils import validators"
    ]

diff --git a/docs/examples/Station.ipynb b/docs/examples/Station.ipynb
@@ -38,9 +38,7 @@
    "source": [
     "# Useful imports:\n",
     "\n",
-    "from pprint import pprint  # for pretty-printing python variables like 'dict'\n",
     "\n",
-    "import qcodes\n",
     "from qcodes.instrument import Parameter\n",
     "from qcodes.station import Station\n",
     "from qcodes.tests.instrument_mocks import DummyInstrument"

diff --git a/docs/examples/driver_examples/QCoDeS Example with Yokogawa GS200 and Keithley 7510.ipynb b/docs/examples/driver_examples/QCoDeS Example with Yokogawa GS200 and Keithley 7510.ipynb
@@ -23,7 +23,6 @@
     "import time\n",
     "\n",
     "import matplotlib.pyplot as plt\n",
-    "import numpy as np\n",
     "\n",
     "from qcodes.dataset import Measurement, plot_dataset\n",
     "from qcodes.instrument_drivers.Keithley import Keithley7510\n",

diff --git a/...examples/driver_examples/QCoDeS example with InstrumentGroup and DelegateInstrument.ipynb b/...examples/driver_examples/QCoDeS example with InstrumentGroup and DelegateInstrument.ipynb
@@ -99,7 +99,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import qcodes as qc\n",
     "from qcodes.station import Station"
    ]
   },

diff --git a/docs/examples/driver_examples/Qcodes example with AMI430.ipynb b/docs/examples/driver_examples/Qcodes example with AMI430.ipynb
@@ -198,9 +198,7 @@
     "plt.show()\n",
     "slope, offset = np.polyfit(t_setting, t_actual, 1)\n",
     "print(\n",
-    "    \"slope = {}. A value close to one means the correct ramp times are used\".format(\n",
-    "        slope\n",
-    "    )\n",
+    "    f\"slope = {slope}. A value close to one means the correct ramp times are used\"\n",
     ")\n",
     "print(\n",
     "    \"offset = {}. An offset indicates that there is a fixed delay is added to a ramp request\".format(\n",
@@ -254,13 +252,16 @@
    },
    "outputs": [],
    "source": [
+    "def field_is_along_z_and_less_that_3_t(x, y, z):\n",
+    "    # We can have higher field along the z-axis if x and y are zero.\n",
+    "    return  x == 0 and y == 0 and z < 3\n",
+    "def field_is_less_than_2_t(x, y, z):\n",
+    "    return np.linalg.norm([x, y, z]) < 2\n",
     "# Lets test the 3D driver now.\n",
     "field_limit = (\n",
     "    [  # If any of the field limit functions are satisfied we are in the safe zone.\n",
-    "        lambda x, y, z: x == 0\n",
-    "        and y == 0\n",
-    "        and z < 3,  # We can have higher field along the z-axis if x and y are zero.\n",
-    "        lambda x, y, z: np.linalg.norm([x, y, z]) < 2,\n",
+    "        field_is_along_z_and_less_that_3_t,\n",
+    "        field_is_less_than_2_t,\n",
     "    ]\n",
     ")\n",
     "\n",
@@ -428,7 +429,7 @@
     "try:\n",
     "    i3d.cartesian([2.1, 0, 0])\n",
     "    print(\"something went wrong... we should not be able to do this :-(\")\n",
-    "except:\n",
+    "except Exception:\n",
     "    print(\"error successfully raised. The driver does not let you do stupid stuff\")"
    ]
   },
@@ -548,6 +549,9 @@
    "source": [
     "i3d.ramp_mode(\"simultaneous\")\n",
     "i3d.vector_ramp_rate(0.05)  # requires all axes to have same ramp rate units!!!\n",
+    "x = 0\n",
+    "y = 0\n",
+    "z = 0\n",
     "i3d.cartesian((x, y, z))  # or any other parameter call that initiates a ramp"
    ]
   },
@@ -741,7 +745,7 @@
     "\n",
     "import xarray as xr\n",
     "\n",
-    "from qcodes.dataset import LinSweep, do2d, dond, load_or_create_experiment\n",
+    "from qcodes.dataset import LinSweep, dond, load_or_create_experiment\n",
     "from qcodes.parameters import ElapsedTimeParameter\n",
     "from qcodes.tests.instrument_mocks import (\n",
     "    DummyInstrument,\n",

diff --git a/docs/examples/driver_examples/Qcodes example with Agilent 34400A.ipynb b/docs/examples/driver_examples/Qcodes example with Agilent 34400A.ipynb
@@ -60,9 +60,7 @@
    "outputs": [],
    "source": [
     "%matplotlib nbagg\n",
-    "import os\n",
     "\n",
-    "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "\n",
     "from qcodes.dataset import Measurement, load_or_create_experiment, plot_dataset\n",