From 91dc173705b1ccaa992ff274d40ac2c7cacbf9b7 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Mon, 4 Sep 2023 07:19:53 +0200 Subject: [PATCH 1/6] port setuotools specific config to pyproject.toml --- pyproject.toml | 13 ++++++++++++- setup.cfg | 12 ------------ 2 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 setup.cfg diff --git a/pyproject.toml b/pyproject.toml index f65ffd6cc..b9c3bc651 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools >= 61.2", + "setuptools >= 68.1.2", "versioningit >= 2.0.1" ] build-backend = 'setuptools.build_meta' @@ -68,6 +68,17 @@ module = [ ] ignore_missing_imports = true +[tool.setuptools] +zip-safe = false +license-files = [ + "LICENSE_TEKTRONIX_AWG520_KEITHLEY_2700", + "LICENSE", +] +include-package-data = false + +[tool.setuptools.packages] +find = {namespaces = false} + [tool.versioningit] default-version = "0.0" diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 145b74fdd..000000000 --- a/setup.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# note that only setuptools specific configuration is -# in this file. Std configuration as defined by pep621 -# and configuration for other tools goes into pyproject.toml - -[metadata] -license_files = - LICENSE_TEKTRONIX_AWG520_KEITHLEY_2700 - LICENSE - -[options] -zip_safe = False -packages = find: From b491f5aad056e5b0d610d461336bf071fdedf540 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Mon, 4 Sep 2023 07:24:08 +0200 Subject: [PATCH 2/6] Drop python 3.8 and mark 3.11 as supported --- .github/workflows/docs.yaml | 6 +++--- .github/workflows/pytest.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index bbc663777..fe9597ce7 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -19,12 +19,12 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10", "3.11"] exclude: - - os: windows-latest - python-version: "3.9" - os: windows-latest python-version: "3.10" + - os: windows-latest + python-version: "3.11" env: DISPLAY: ':99.0' OS: ${{ matrix.os }} diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index 36c592744..bc207eb42 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -21,12 +21,12 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10". "3.11"] exclude: - - os: windows-latest - python-version: "3.9" - os: windows-latest python-version: "3.10" + - os: windows-latest + python-version: "3.11" env: DISPLAY: ':99.0' OS: ${{ matrix.os }} From eb346fb941568f1f3aca6b5df14887efc77bfb9d Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Mon, 4 Sep 2023 07:39:32 +0200 Subject: [PATCH 3/6] Mark 3.9 as the earliest supported version --- pyproject.toml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b9c3bc651..d3bf46667 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,8 +8,17 @@ build-backend = 'setuptools.build_meta' [project] name = "qcodes_contrib_drivers" description = "User contributed drivers for QCoDeS" -classifiers = [ "Development Status :: 3 - Alpha", "Intended Audience :: Science/Research", "License :: OSI Approved :: MIT License", "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Topic :: Scientific/Engineering",] -requires-python = ">=3.8" +classifiers = [ + "Development Status :: 3 - Alpha", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: MIT License", + "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Topic :: Scientific/Engineering",] +requires-python = ">=3.9" dependencies = [ "qcodes>=0.37.0", "versioningit>=2.0.1", "packaging"] dynamic = [ "version",] From 6df19695f165290981827af50afc5b2a6cbdb221 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Mon, 4 Sep 2023 07:40:12 +0200 Subject: [PATCH 4/6] update comment --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index b095ba7af..d4e045a50 100644 --- a/setup.py +++ b/setup.py @@ -3,9 +3,8 @@ from versioningit import get_cmdclasses # this file does not contain configuration -# std configuration as defined by pep621 -# is in pyproject.toml -# and setuptools specific config in setup.cfg +# all config should be in pyproject.toml + if int(setuptools.__version__.split(".")[0]) < 61: raise RuntimeError( From ce554da3f0576d2ad1fad7b8cc9103bda1080e84 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Mon, 4 Sep 2023 07:44:35 +0200 Subject: [PATCH 5/6] Fix typo --- .github/workflows/pytest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index bc207eb42..e6b89d0c5 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -21,7 +21,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ["3.9", "3.10". "3.11"] + python-version: ["3.9", "3.10", "3.11"] exclude: - os: windows-latest python-version: "3.10" From 6d40993a269091d50c1b241707a76945c7900d3f Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Mon, 4 Sep 2023 08:03:54 +0200 Subject: [PATCH 6/6] read cov config from pyproject.toml --- .github/workflows/pytest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index e6b89d0c5..6c41d144b 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -57,7 +57,7 @@ jobs: run: mypy qcodes_contrib_drivers - name: Run tests run: | - pytest --cov=qcodes_contrib_drivers --cov-report xml --cov-config=setup.cfg qcodes_contrib_drivers + pytest --cov=qcodes_contrib_drivers --cov-report xml --cov-config=pyproject.toml qcodes_contrib_drivers - name: Upload coverage to Codecov uses: codecov/codecov-action@v3.1.4 with: