Merge branch 'main' into feature/parameter-database-callback

.github/package.json

@@ -1,6 +1,6 @@
 {
 "devDependencies": {
-	"pyright": "1.1.394"
+	"pyright": "1.1.396"
 },
 "packageManager": "npm@11"
 }

.github/workflows/docs.yaml

@@ -120,7 +120,7 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Download artifact
-      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
       with:
         name: docs_3.11_ubuntu-latest
         path: build_docs

.github/workflows/pytest.yaml

@@ -108,7 +108,7 @@ jobs:
       run: |
         pytest -m "serial" -n 0 --dist no --cov --cov-report xml --cov-append --hypothesis-profile ci $PYTEST_OPT tests
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
       with:
         files: ./coverage.xml
         env_vars: OS,PYTHON

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.9.5'
+    rev: 'v0.9.8'
     hooks:
     - id: ruff
       types_or: [python, pyi, jupyter, toml]
@@ -22,7 +22,7 @@ repos:
     - id: mixed-line-ending
       args: ['--fix=no']
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.23.3
+    rev: v8.24.0
     hooks:
     - id: gitleaks
   - repo: https://github.com/jumanjihouse/pre-commit-hooks

docs/changes/newsfragments/6919.breaking

@@ -0,0 +1,2 @@
+QCoDeS no longer ships a ``setup.py`` script and all package config is done in ``pyproject.toml``
+A version of `pip` or other package manager supporting ``PEP621`` is required to build from source.

pyproject.toml

@@ -90,7 +90,6 @@ test = [
     "sphinx>=4.5.0",  # sphinx extension tests
     "types-jsonschema>=4.16.0",
     "types_requests>=0.1.8",
-    "types-setuptools>=57.0.0",
     "types-tabulate>=0.1.0",
     "types-tqdm>=4.64.6",
     "types_pywin32>=305.0.0.7",
@@ -109,7 +108,7 @@ docs = [
     "sphinx-jsonschema>=1.19.1",
     "furo>=2024.8.6",
     "sphinxcontrib-towncrier>=0.3.0a0",
-    "towncrier>=22.8.0,<24.0.0", #  sphinxcontrib-towncrier does not yet support latest
+    "towncrier>=22.8.0,<25.0.0", #  sphinxcontrib-towncrier is likely to break with new versions
     "scipy>=1.8.0", # examples using scipy
     "qcodes_loop>=0.1.1", # legacy dataset import examples
     "jinja2>=3.1.3", # transitive dependency pin due to cve in earlier version

requirements.txt

@@ -64,7 +64,7 @@ dask==2025.2.0
     #   qcodes
 debugpy==1.8.12
     # via ipykernel
-decorator==5.2.0
+decorator==5.2.1
     # via ipython
 deepdiff==8.2.0
     # via qcodes (pyproject.toml)
@@ -102,23 +102,22 @@ h5py==3.13.0
     #   qcodes-loop
 hickle==5.0.3
     # via qcodes-loop
-hypothesis==6.127.1
+hypothesis==6.127.6
     # via qcodes (pyproject.toml)
 idna==3.10
     # via requests
 imagesize==1.4.1
     # via sphinx
 importlib-metadata==8.5.0
     # via opentelemetry-api
-incremental==24.7.2
-    # via towncrier
 iniconfig==2.0.0
     # via pytest
 ipykernel==6.29.5
     # via
     #   qcodes (pyproject.toml)
     #   qcodes
-ipython==8.32.0
+ipython==8.33.0; python_version < '3.11'
+ipython==9.0.1; python_version >= '3.11'
     # via
     #   qcodes (pyproject.toml)
     #   ipykernel
@@ -181,7 +180,7 @@ markupsafe==3.0.2
     # via
     #   jinja2
     #   nbconvert
-matplotlib==3.10.0
+matplotlib==3.10.1
     # via
     #   qcodes (pyproject.toml)
     #   broadbean
@@ -293,7 +292,7 @@ pygments==2.19.1
     #   sphinx
 pyparsing==3.2.1
     # via matplotlib
-pytest==8.3.4
+pytest==8.3.5
     # via
     #   qcodes (pyproject.toml)
     #   pytest-asyncio
@@ -361,8 +360,6 @@ schema==0.7.7
     # via broadbean
 scipy==1.15.2
     # via qcodes (pyproject.toml)
-setuptools==75.8.0
-    # via incremental
 six==1.17.0
     # via python-dateutil
 snowballstemmer==2.2.0
@@ -371,7 +368,8 @@ sortedcontainers==2.4.0
     # via hypothesis
 soupsieve==2.6
     # via beautifulsoup4
-sphinx==8.1.3
+sphinx==8.1.3; python_version < '3.11'
+sphinx==8.2.3; python_version >= '3.11'
     # via
     #   qcodes (pyproject.toml)
     #   autodocsumm
@@ -401,7 +399,7 @@ sphinxcontrib-qthelp==2.0.0
     # via sphinx
 sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
-sphinxcontrib-towncrier==0.4.0a0
+sphinxcontrib-towncrier==0.5.0a0
     # via qcodes (pyproject.toml)
 stack-data==0.6.3
     # via ipython
@@ -423,7 +421,7 @@ tornado==6.4.2
     #   ipykernel
     #   jupyter-client
     #   qcodes
-towncrier==23.11.0
+towncrier==24.8.0
     # via
     #   qcodes (pyproject.toml)
     #   sphinxcontrib-towncrier
@@ -450,19 +448,18 @@ types-pytz==2025.1.0.20250204
     # via pandas-stubs
 types-pywin32==308.0.0.20250128
     # via qcodes (pyproject.toml)
-types-requests==2.32.0.20241016
+types-requests==2.32.0.20250301
     # via
     #   qcodes (pyproject.toml)
     #   types-tqdm
-types-setuptools==75.8.0.20250210
-    # via qcodes (pyproject.toml)
 types-tabulate==0.9.0.20241207
     # via qcodes (pyproject.toml)
-types-tqdm==4.67.0.20241221
+types-tqdm==4.67.0.20250301
     # via qcodes (pyproject.toml)
 typing-extensions==4.12.2
     # via
     #   qcodes (pyproject.toml)
+    #   beautifulsoup4
     #   mypy
     #   pyvisa
     #   pyvisa-sim

src/qcodes/logger/logger.py

@@ -287,9 +287,7 @@ def start_command_history_logger(log_dir: str | None = None) -> None:
             to ``~/.qcodes/logs/command_history.log``
 
     """
-    # get_ipython is part of the public api but IPython does
-    # not use __all__ to mark this
-    from IPython import get_ipython  # type: ignore[attr-defined]
+    from IPython.core.getipython import get_ipython
 
     ipython = get_ipython()
     if ipython is None:
@@ -300,8 +298,8 @@ def start_command_history_logger(log_dir: str | None = None) -> None:
     filename = os.path.join(log_dir, HISTORY_LOG_NAME)
     os.makedirs(os.path.dirname(filename), exist_ok=True)
 
-    ipython.magic("%logstop")
-    ipython.magic("%logstart -t -o {} {}".format(filename, "append"))
+    ipython.run_line_magic("logstop", "")
+    ipython.run_line_magic("logstart", f"-t -o {filename} append")
     log.info("Started logging IPython history")