From 4a16284cc1963720261c381779ca49227e60cba5 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Wed, 5 Oct 2022 13:04:40 +0200 Subject: [PATCH 1/4] Drop python 3.7 support --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3880bed59..497ce0980 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,7 +12,6 @@ classifiers = 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.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 @@ -29,7 +28,7 @@ project_urls = [options] zip_safe = False packages = find: -python_requires = >=3.7 +python_requires = >=3.8 install_requires = qcodes>=0.29.0 versioningit>=1.1.0 From 8777d065675615eec98907e906dd0e4a1805aa4e Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Wed, 5 Oct 2022 13:05:01 +0200 Subject: [PATCH 2/4] CI run on 3.10 rather than 3.7 --- .github/workflows/docs.yaml | 6 +++--- .github/workflows/pytest.yaml | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 02e232d9e..e68215cec 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -16,12 +16,12 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.7, 3.8, 3.9] + python-version: ["3.8", "3.9", "3.10"] exclude: - os: windows-latest - python-version: 3.8 + python-version: "3.9" - os: windows-latest - python-version: 3.9 + python-version: "3.10" env: DISPLAY: ':99.0' OS: ${{ matrix.os }} diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index 49f3aaa27..e7e275fe4 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -18,12 +18,12 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.7, 3.8, 3.9] + python-version: ["3.8", "3.9", "3.10"] exclude: - os: windows-latest - python-version: 3.8 + python-version: "3.9" - os: windows-latest - python-version: 3.9 + python-version: "3.10" env: DISPLAY: ':99.0' OS: ${{ matrix.os }} @@ -55,7 +55,6 @@ jobs: pip install .[test] -c requirements.txt - name: Run Mypy run: mypy qcodes_contrib_drivers - if: matrix.python-version != '3.7' - name: Run tests run: | pytest --cov=qcodes_contrib_drivers --cov-report xml --cov-config=setup.cfg qcodes_contrib_drivers From d6667f6d64bd07b154eba1f14b0542f8e73bd42d Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Wed, 5 Oct 2022 13:05:20 +0200 Subject: [PATCH 3/4] publish packages from 3.10 --- .github/workflows/upload_to_pypi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload_to_pypi.yaml b/.github/workflows/upload_to_pypi.yaml index f0384ad7f..f6cf948d7 100644 --- a/.github/workflows/upload_to_pypi.yaml +++ b/.github/workflows/upload_to_pypi.yaml @@ -15,7 +15,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4.2.0 with: - python-version: '3.7' + python-version: '3.10' - name: Install build deps run: pip install --upgrade pip setuptools wheel build - name: Build From c7345e620756d5ee7da6e6c52ec8c73ff08ea3cd Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Wed, 5 Oct 2022 13:17:23 +0200 Subject: [PATCH 4/4] Add explicit import of ctypes.wintypes --- qcodes_contrib_drivers/drivers/SignalCore/SignalCore.py | 1 + 1 file changed, 1 insertion(+) diff --git a/qcodes_contrib_drivers/drivers/SignalCore/SignalCore.py b/qcodes_contrib_drivers/drivers/SignalCore/SignalCore.py index 3777ce5f9..06711e2ca 100644 --- a/qcodes_contrib_drivers/drivers/SignalCore/SignalCore.py +++ b/qcodes_contrib_drivers/drivers/SignalCore/SignalCore.py @@ -1,4 +1,5 @@ import ctypes +import ctypes.wintypes import os import sys from typing import Dict, Optional