From c599b615fb445b47b8a191ba98846f8ba4c3d841 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Fri, 28 Feb 2025 08:14:22 +0100 Subject: [PATCH 1/4] Regenerate requirements --- requirements.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index a411df5b76c4..55722826e488 100644 --- a/requirements.txt +++ b/requirements.txt @@ -110,8 +110,6 @@ 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 @@ -361,8 +359,6 @@ schema==0.7.7 # via broadbean scipy==1.15.2 # via qcodes (pyproject.toml) -setuptools==75.8.2 - # via incremental six==1.17.0 # via python-dateutil snowballstemmer==2.2.0 @@ -463,6 +459,7 @@ types-tqdm==4.67.0.20250228 typing-extensions==4.12.2 # via # qcodes (pyproject.toml) + # beautifulsoup4 # mypy # pyvisa # pyvisa-sim From 5eebb27f1cc6069d1bb71ae79198c60c0d2bc527 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Fri, 28 Feb 2025 08:21:15 +0100 Subject: [PATCH 2/4] Remove legacy setup.py script All somewhat new versions of pip supports installing without this --- pyproject.toml | 1 - setup.py | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml index 88d1d0a83671..eff5378ddd5e 100644 --- a/pyproject.toml +++ b/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", diff --git a/setup.py b/setup.py deleted file mode 100644 index 2d95cecf834d..000000000000 --- a/setup.py +++ /dev/null @@ -1,9 +0,0 @@ -""" -This file only exists as a fallback for older versions of pip/setuptools -All configuration is done in pyproject.toml -""" - -from setuptools import setup - -if __name__ == "__main__": - setup() From f464c30c855415f26788b7d9b9b63bffdb7ffee7 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Fri, 28 Feb 2025 10:09:54 +0100 Subject: [PATCH 3/4] Upgrade precommit hooks --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 40f6258fc0f7..f7ca94c80ad4 100644 --- a/.pre-commit-config.yaml +++ b/.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 From 41beb85370143d0ea4923757c4d010dd03f21533 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Fri, 28 Feb 2025 10:19:05 +0100 Subject: [PATCH 4/4] Add newsfragment for 6919 --- docs/changes/newsfragments/6919.breaking | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 docs/changes/newsfragments/6919.breaking diff --git a/docs/changes/newsfragments/6919.breaking b/docs/changes/newsfragments/6919.breaking new file mode 100644 index 000000000000..ffbb7f6d1ac3 --- /dev/null +++ b/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.