Drop support for Python 3.8 and 3.9 and add support for Python 3.13 (#…

…451)

* update copyright

* cis: update ci config

* drop support for Python 3.8 and 3.9

* cis: update release workflow

.github/workflows/ci.yml

@@ -48,10 +48,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
-        exclude:
-          - python-version: '3.9'
-            os: macos-latest
+        python-version: ["3.10", "3.11", "3.12", "3.13-dev"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}

.github/workflows/release.yml

@@ -33,8 +33,8 @@ jobs:
       - name: Store artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: artifact-sdist
-          path: dist/*.tar.gz
+          name: cibw-sdist
+          path: dist/*
 
   build_wheel:
     name: Build wheel
@@ -61,53 +61,66 @@ jobs:
       - name: Store artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: artifact-wheel
-          path: dist/*.whl
+          name: cibw-wheel
+          path: dist/*
 
-  release_upload:
-    name: Create Release and Upload Release Asset
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-    needs: [build_wheel, build_sdist]
-    steps:
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          draft: false
-          prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref, 'a') || contains(github.ref, 'b')}}
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: articfact-*
-          path: dist
-          merge-multiple: true
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: shogo82148/actions-upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/*
-
-  upload_pypi:
+  publish:
     if: github.event_name == 'push'
     needs: [build_wheel, build_sdist]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4
+      - name: Download all the dists
+        uses: actions/[email protected]
         with:
-          pattern: artifact-*
+          pattern: cibw-*
           path: dist
           merge-multiple: true
 
-      - uses: pypa/gh-action-pypi-publish@master
+      - uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}
           # To test:
           # repository_url: https://test.pypi.org/legacy/
+
+  github-release:
+    name: >-
+      Sign the Python 🐍 distribution 📦 with Sigstore
+      and create a GitHub Release
+    runs-on: ubuntu-latest
+    needs:
+    - publish
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+    - name: Download all the dists
+      uses: actions/[email protected]
+      with:
+        pattern: cibw-*
+        path: dist
+        merge-multiple: true
+    - name: Sign the dists with Sigstore
+      uses: sigstore/[email protected]
+      with:
+        password: ${{ secrets.pypi_password }}
+        inputs: >-
+          ./dist/*.tar.gz
+          ./dist/*.whl
+    - name: Create GitHub Release
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: >-
+        gh release create
+        '${{ github.ref_name }}'
+        --repo '${{ github.repository }}'
+        --generate-notes
+    - name: Upload artifact signatures to GitHub Release
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: >-
+        gh release upload
+        '${{ github.ref_name }}' dist/**
+        --repo '${{ github.repository }}'

docs/source/conf.py

@@ -13,12 +13,7 @@
 import datetime
 import os
 import sys
-
-if sys.version_info >= (3, 8):
-    from importlib.metadata import version as get_version
-else:
-    from importlib_metadata import version as get_version
-
+from importlib.metadata import version as get_version
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

pyproject.toml

@@ -2,7 +2,7 @@
   name = "PyVISA-py"
   description = "Pure Python implementation of a VISA library."
   readme = "README.rst"
-  requires-python = ">=3.8"
+  requires-python = ">=3.10"
   license = { file = "LICENSE" }
   authors = [{ name = "Hernan E. Grecco", email = "[email protected]" }]
   maintainers = [{ name = "Matthieu C. Dartiailh", email = "[email protected]" }]
@@ -18,11 +18,10 @@
     "Programming Language :: Python",
     "Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator",
     "Topic :: Software Development :: Libraries :: Python Modules",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
   ]
   dependencies = ["pyvisa>=1.13.0", "typing_extensions"]
   dynamic = ["version"]

pyvisa_py/__init__.py

@@ -2,17 +2,12 @@
 """Pure Python backend for PyVISA.
 
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """
 
-import sys
-
-if sys.version_info >= (3, 8):
-    from importlib.metadata import PackageNotFoundError, version
-else:
-    from importlib_metadata import PackageNotFoundError, version  # type: ignore
+from importlib.metadata import PackageNotFoundError, version
 
 __version__ = "unknown"
 try:

pyvisa_py/attributes.py

@@ -3,7 +3,7 @@
 
 For additional information and VISA attributes see pyvisa.constants
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 """
 

pyvisa_py/common.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Common code.
 
-:copyright: 2014-2020 by PyVISA-sim Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-sim Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/gpib.py

@@ -2,7 +2,7 @@
 """GPIB Session implementation using linux-gpib or gpib-ctypes.
 
 
-:copyright: 2015-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2015-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/highlevel.py

@@ -2,7 +2,7 @@
 """Highlevel wrapper of the VISA Library.
 
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/protocols/__init__.py

@@ -2,7 +2,7 @@
 """Implements protocols on top of lower level libraries to talk to instruments.
 
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/protocols/hislip.py

@@ -1,7 +1,7 @@
 """
 Python implementation of HiSLIP protocol.  Based on the HiSLIP spec:
 
-http://www.ivifoundation.org/downloads/Class%20Specifications/IVI-6.1_HiSLIP-1.1-2011-02-24.pdf
+http://www.ivifoundation.org/downloads/Class%20Specifications/IVI-6.1_HiSLIP-1.1-2024-02-24.pdf
 """
 
 import socket

pyvisa_py/protocols/rpc.py

@@ -13,7 +13,7 @@
     http://svn.python.org/projects/python/trunk/Demo/rpc/rpc.py
 
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/protocols/usbraw.py

@@ -6,7 +6,7 @@
 
 This file is an offspring of the Lantz Project.
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/protocols/usbtmc.py

@@ -6,7 +6,7 @@
 
 This file is an offspring of the Lantz Project.
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/protocols/usbutil.py

@@ -7,7 +7,7 @@
 
 This file is an offspring of the Lantz Project.
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/protocols/vxi11.py

@@ -5,7 +5,7 @@
 
 This file is an offspring of the Lantz project.
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/serial.py

@@ -2,7 +2,7 @@
 """Serial Session implementation using PySerial.
 
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/sessions.py

@@ -2,7 +2,7 @@
 """Base Session class.
 
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/tcpip.py

@@ -2,7 +2,7 @@
 """TCPIP Session implementation using Python Standard library.
 
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/testsuite/keysight_assisted_tests/__init__.py

@@ -9,7 +9,7 @@
 
 See pyvisa/testsuite/keysight_assisted_tests/__init__.py for more details.
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/testsuite/test_highlevel.py

@@ -1,7 +1,7 @@
 """Test creating a resource manager using PyVISA-Py as a backend.
 
 
-:copyright: 2014-2023 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/testsuite/test_serial.py

@@ -1,7 +1,7 @@
 """Test creating a resource manager using PyVISA-Py as a backend.
 
 
-:copyright: 2014-2023 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/testsuite/test_sessions.py

@@ -1,7 +1,7 @@
 """Test loading resources.
 
 
-:copyright: 2014-2023 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """

pyvisa_py/usb.py

@@ -2,7 +2,7 @@
 """Serial Session implementation using PyUSB.
 
 
-:copyright: 2014-2020 by PyVISA-py Authors, see AUTHORS for more details.
+:copyright: 2014-2024 by PyVISA-py Authors, see AUTHORS for more details.
 :license: MIT, see LICENSE for more details.
 
 """