Implement fixes for most new ruff 0.16 default rules

benchmarking/benchmarks/dataset.py

@@ -50,8 +50,8 @@ class Adding5Params:
     timer = time.perf_counter
 
     def __init__(self):
-        self.parameters = list()
-        self.values = list()
+        self.parameters = []
+        self.values = []
         self.experiment = None
         self.runner = None
         self.datasaver = None
@@ -116,8 +116,8 @@ def teardown(self, bench_param):
             shutil.rmtree(self.tmpdir)
             self.tmpdir = None
 
-        self.parameters = list()
-        self.values = list()
+        self.parameters = []
+        self.values = []
 
     def time_test(self, bench_param):
         """Adding data for 5 parameters"""

docs/conf.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-#
 # QCoDeS documentation build configuration file, created by
 # sphinx-quickstart on Thu Jun  2 10:41:37 2016.
 #

docs/examples/DataSet/Accessing-data-in-DataSet.ipynb

@@ -502,7 +502,7 @@
     }
    ],
    "source": [
-    "for d in interdeps.dependencies.keys():\n",
+    "for d in interdeps.dependencies:\n",
     "    print(f\"Parameter {d.name!r} ({d.label}, {d.unit}) depends on:\")\n",
     "    for i in interdeps.dependencies[d]:\n",
     "        print(f\"- {i.name!r} ({i.label}, {i.unit})\")"
@@ -972,7 +972,7 @@
     "    print(f\"DataFrame for parameter {parameter_name}\")\n",
     "    print(\"-----------------------------\")\n",
     "    print(f\"{df.head()!r}\")\n",
-    "    print(\"\")"
+    "    print()"
    ]
   },
   {

docs/examples/DataSet/Offline Plotting Tutorial.ipynb

@@ -669,17 +669,11 @@
     "\n",
     "\n",
     "def no_x(xv):\n",
-    "    if xv > 0 and xv < 3:\n",
-    "        return True\n",
-    "    else:\n",
-    "        return False\n",
+    "    return bool(xv > 0 and xv < 3)\n",
     "\n",
     "\n",
     "def no_t(tv):\n",
-    "    if tv > 0 and tv < 450:\n",
-    "        return True\n",
-    "    else:\n",
-    "        return False\n",
+    "    return bool(tv > 0 and tv < 450)\n",
     "\n",
     "\n",
     "with meas.run() as datasaver:\n",

docs/examples/DataSet/Using_doNd_functions_in_comparison_to_Measurement_context_manager_for_performing_measurements.ipynb

@@ -1736,9 +1736,8 @@
     }
    ],
    "source": [
-    "with qcodes.logger.console_level(\"DEBUG\"):\n",
-    "    with qcodes.logger.filter_instrument(dac):\n",
-    "        dond(set_only_sweep, dmm.v1, dmm.v2)"
+    "with qcodes.logger.console_level(\"DEBUG\"), qcodes.logger.filter_instrument(dac):\n",
+    "    dond(set_only_sweep, dmm.v1, dmm.v2)"
    ]
   },
   {
@@ -1796,9 +1795,8 @@
     }
    ],
    "source": [
-    "with qcodes.logger.console_level(\"DEBUG\"):\n",
-    "    with qcodes.logger.filter_instrument(dac):\n",
-    "        dond(set_and_get_sweep, dmm.v1, dmm.v2)"
+    "with qcodes.logger.console_level(\"DEBUG\"), qcodes.logger.filter_instrument(dac):\n",
+    "    dond(set_and_get_sweep, dmm.v1, dmm.v2)"
    ]
   },
   {

docs/examples/Parameters/Parameter_defined_InterDependencies.ipynb

@@ -74,7 +74,7 @@
     "        super().__init__(name=name, get_cmd=False)\n",
     "        # dict of Parameter to (slope, offset) of components\n",
     "        self._components_dict: dict[Parameter, tuple[float, float]] = components\n",
-    "        for param in self._components_dict.keys():\n",
+    "        for param in self._components_dict:\n",
     "            self._has_control_of.add(param)\n",
     "            param.is_controlled_by.add(self)\n",
     "\n",

docs/examples/Parameters/Parameters.ipynb

@@ -412,7 +412,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 36,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -429,7 +429,6 @@
     }
    ],
    "source": [
-    "dac.ch1\n",
     "print(f\"Default validators: {dac.ch1.validators}\")\n",
     "\n",
     "# if we try to set a value outside the range of the default validator we get an error.\n",

docs/examples/basic_examples/Configuring_QCoDeS.ipynb

@@ -250,9 +250,7 @@
    ],
    "source": [
     "print(\n",
-    "    \"\\n\".join(\n",
-    "        [qc.config.home_file_name, qc.config.env_file_name, qc.config.cwd_file_name]\n",
-    "    )\n",
+    "    f\"{qc.config.home_file_name}\\n{qc.config.env_file_name}\\n{qc.config.cwd_file_name}\"\n",
     ")"
    ]
   },

docs/examples/driver_examples/QCoDeS Example with Keysight E4980A LCR meter.ipynb

@@ -441,7 +441,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -454,7 +454,7 @@
    ],
    "source": [
     "try:\n",
-    "    measurement.capacitance\n",
+    "    _ = measurement.capacitance\n",
     "except AttributeError as err:\n",
     "    print(err)"
    ]

docs/examples/driver_examples/QCodes example with Keithley S46.ipynb

@@ -177,7 +177,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -191,7 +191,7 @@
    "source": [
     "try:\n",
     "    s46.A2(\"close\")\n",
-    "    raise (\"We should not be here\")\n",
+    "    raise RuntimeError(\"We should not be here\")\n",
     "except KeithleyS46LockAcquisitionError as e:\n",
     "    print(e)"
    ]
@@ -216,7 +216,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -230,7 +230,7 @@
    "source": [
     "try:\n",
     "    s46.A1(\"close\")\n",
-    "    raise (\"We should not be here\")\n",
+    "    raise RuntimeError(\"We should not be here\")\n",
     "except KeithleyS46LockAcquisitionError as e:\n",
     "    print(e)"
    ]
@@ -246,7 +246,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -260,7 +260,7 @@
    "source": [
     "try:\n",
     "    s46.B2(\"close\")\n",
-    "    raise (\"We should not be here\")\n",
+    "    raise RuntimeError(\"We should not be here\")\n",
     "except KeithleyS46LockAcquisitionError as e:\n",
     "    print(e)"
    ]

docs/examples/driver_examples/Qcodes example with Keysight B1500 Parameter Analyzer.ipynb

@@ -79,32 +79,32 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
     "from IPython.display import Markdown, display\n",
     "from matplotlib import pyplot as plt\n",
     "from pyvisa.errors import VisaIOError\n",
     "\n",
-    "import qcodes as qc\n",
     "from qcodes.dataset import (\n",
     "    Measurement,\n",
     "    initialise_database,\n",
     "    load_or_create_experiment,\n",
     "    plot_dataset,\n",
     ")\n",
     "from qcodes.instrument_drivers.Keysight import KeysightB1500\n",
-    "from qcodes.instrument_drivers.Keysight.keysightb1500 import MessageBuilder, constants"
+    "from qcodes.instrument_drivers.Keysight.keysightb1500 import MessageBuilder, constants\n",
+    "from qcodes.station import Station"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
-    "station = qc.Station()  # Create a station to hold all the instruments"
+    "station = Station()  # Create a station to hold all the instruments"
    ]
   },
   {
@@ -215,9 +215,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "b1500.smu1  # first SMU in the system\n",
-    "b1500.cmu1  # first CMU in the system\n",
-    "b1500.smu2  # second SMU in the system"
+    "_smu1 = b1500.smu1  # first SMU in the system\n",
+    "_cmu1 = b1500.cmu1  # first CMU in the system\n",
+    "_smu2 = b1500.smu2  # second SMU in the system"
    ]
   },
   {

docs/examples/logging/logfile_parsing.ipynb

@@ -53,9 +53,8 @@
    "source": [
     "# put the 30MB into a zip file\n",
     "filepath = os.path.join(os.getcwd(), \"static\", \"pythonlog.zip\")\n",
-    "with ZipFile(filepath) as z:\n",
-    "    with z.open(\"pythonlog.log\", \"r\") as f:\n",
-    "        my_log = [line.decode() for line in f]"
+    "with ZipFile(filepath) as z, z.open(\"pythonlog.log\", \"r\") as f:\n",
+    "    my_log = [line.decode() for line in f]"
    ]
   },
   {

docs/examples/logging/logging_example.ipynb

@@ -292,9 +292,8 @@
    ],
    "source": [
     "driver.cartesian((0, 0, 0))\n",
-    "with logger.console_level(\"DEBUG\"):\n",
-    "    with logger.filter_instrument(mag_x):\n",
-    "        driver.cartesian((0, 0, 1))"
+    "with logger.console_level(\"DEBUG\"), logger.filter_instrument(mag_x):\n",
+    "    driver.cartesian((0, 0, 1))"
    ]
   },
   {
@@ -330,9 +329,8 @@
    ],
    "source": [
     "driver.cartesian((0, 0, 0))\n",
-    "with logger.console_level(\"DEBUG\"):\n",
-    "    with logger.filter_instrument((mag_x, mag_y)):\n",
-    "        driver.cartesian((0, 0, 1))"
+    "with logger.console_level(\"DEBUG\"), logger.filter_instrument((mag_x, mag_y)):\n",
+    "    driver.cartesian((0, 0, 1))"
    ]
   },
   {
@@ -360,7 +358,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "with logger.console_level(logging.WARN):\n",
+    "with logger.console_level(logging.WARNING):\n",
     "    driver.cartesian((0, 0, 0))\n",
     "    with capture_dataframe(level=\"DEBUG\") as (handler, get_dataframe):\n",
     "        driver.cartesian((0, 0, 1))\n",
@@ -1197,7 +1195,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -1319,12 +1317,14 @@
     }
    ],
    "source": [
-    "with logger.console_level(logging.WARN):\n",
+    "with logger.console_level(logging.WARNING):\n",
     "    driver.cartesian((0, 0, 0))\n",
-    "    with capture_dataframe(level=\"DEBUG\") as (handler, get_dataframe):\n",
-    "        with logger.filter_instrument(mag_x, handler=handler):\n",
-    "            driver.cartesian((0, 0, 1))\n",
-    "            df = get_dataframe()\n",
+    "    with (\n",
+    "        capture_dataframe(level=\"DEBUG\") as (handler, get_dataframe),\n",
+    "        logger.filter_instrument(mag_x, handler=handler),\n",
+    "    ):\n",
+    "        driver.cartesian((0, 0, 1))\n",
+    "        df = get_dataframe()\n",
     "df"
    ]
   },

pyproject.toml

@@ -244,20 +244,21 @@ explicit-preview-rules = true
 # TID253 banned-module-level-imports
 # W pydocstyle
 # PLx pylint
-select = [
+extend-select = [
     "E", "F", "PT025", "UP", "RUF", "YTT", "INP",
     "I", "G", "ISC", "TID253", "NPY", "PLE",
     "PLR", "PLC", "PLW", "W",
     "D214", "D300", "D402", "D403", "D405", "D410", "D411", "D412", "D413", "D414", "D416", "D417", "D418", "D419",
     "TC", "PYI",
-    "RUF027", "PYI059", # these are preview rules that are not yet stable but explicitly enabled.
+    "RUF027", # these are preview rules that are not yet stable but explicitly enabled.
     ]
 # G004 We have a lot of use of f strings in log messages
 # so disable that lint for now
 # PLxxxx are pylint lints that generate a fair amount of warnings
 # it may be worth fixing some or these in the future
 # PYI036 disable until https://github.com/astral-sh/ruff/issues/9794 is fixed
-ignore = ["E501", "G004", "PLR2004", "PLR0913", "PLR0911", "PLR0912", "PLR0915", "PLW0602", "PLW0603", "PLW2901", "PYI036", "PLR0917"]
+ignore = ["E501", "G004", "PLR2004", "PLR0913", "PLR0911", "PLR0912", "PLR0915", "PLW0602", "PLW0603", "PLW2901", "PYI036", "PLR0917",
+    "DTZ007", "DTZ005", "DTZ006", "N999", "BLE001", "TRY004", "TRY002", "S110"] # new defaults of of 0.16.0 that we don't want to enable yet
 
 # we want to explicitly use the micro symbol
 # not the greek letter

src/qcodes/calibrations/keithley.py

@@ -104,7 +104,7 @@ def calibrate_keithley_smu_v_single(
     time_delay: float = 3.0,
 ) -> None:
     assert channel in {smu_channel.channel for smu_channel in smu.channels}
-    assert v_range in src_FS_map.keys()
+    assert v_range in src_FS_map
     src_FS = src_FS_map[v_range]
 
     sense_modes = ["SENSE_LOCAL"]

src/qcodes/dataset/data_set_cache.py

@@ -376,10 +376,7 @@ def _merge_data_single_param(
         )
     elif new_values is not None or shape is not None:
         (merged_data, new_write_status) = _create_new_data_dict(new_values, shape)
-    elif existing_values is not None:
-        merged_data = existing_values
-        new_write_status = single_tree_write_status
-    elif shape is None and new_values is None:
+    elif existing_values is not None or (shape is None and new_values is None):
         merged_data = existing_values
         new_write_status = single_tree_write_status
     else:
@@ -442,11 +439,13 @@ def _insert_into_data_dict(
                 data[j] = np.atleast_1d(new_values[i])
         return data, None
     else:
-        if existing_values.dtype.kind in ("U", "S"):
+        if (
+            existing_values.dtype.kind in ("U", "S")
+            and new_values.dtype.itemsize > existing_values.dtype.itemsize
+        ):
             # string type arrays may be too small for the new data
             # read so rescale if needed.
-            if new_values.dtype.itemsize > existing_values.dtype.itemsize:
-                existing_values = existing_values.astype(new_values.dtype)
+            existing_values = existing_values.astype(new_values.dtype)
         n_values = new_values.size
         new_write_status = write_status + n_values
         if new_write_status > existing_values.size: