Updated pyproject.toml to fix the changes made in pypa/setuptools#4159 (

#3)

* Drop Python 3.7 support

* Added more pre-commit hooks

* Updated pyproject.toml to fix the changes made in pypa/setuptools#4159

.github/workflows/pre-commit.yml

@@ -0,0 +1,26 @@
+name: pre-commit
+
+on:
+  pull_request:
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: [ "3.12" ]
+
+    steps:
+    - name: Checkout source repository
+      uses: actions/checkout@v4
+    - name: Set up python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies for testing
+      run: |
+        python3 -m pip install --upgrade pip
+        python3 -m pip install .[test]
+    - name: Run pre-commit
+      uses: pre-commit/[email protected]

.github/workflows/publish-pypi.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [ "3.10" ]
+        python-version: [ "3.12" ]
 
     steps:
       - name: Checkout source repository

.github/workflows/publish-test-pypi.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [ "3.10" ]
+        python-version: [ "3.12" ]
 
     steps:
       - name: Checkout source repository

.github/workflows/pylint.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [ "3.10", "3.11" ]
+        python-version: [ "3.10", "3.11", "3.12" ]
 
     steps:
     - name: Checkout source repository

.pre-commit-config.yaml

@@ -2,19 +2,23 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
+    -   id: check-executables-have-shebangs
         # Check for invalid files
     -   id: check-toml
         # Check Python files
+    -   id: end-of-file-fixer
     -   id: fix-encoding-pragma
         args: [--remove]
-    -   id: end-of-file-fixer
     -   id: mixed-line-ending
         args: [--fix=lf]
     -   id: check-executables-have-shebangs
+    -   id: requirements-txt-fixer
+    -   id: trailing-whitespace
+        args: [--markdown-linebreak-ext=md]
 -   repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 24.4.2
     hooks:
     -   id: black
 -   repo: https://github.com/asottile/blacken-docs
@@ -23,7 +27,7 @@ repos:
     -   id: blacken-docs
         args: [--line-length=120]
 -   repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
     -   id: isort
 -   repo: local
@@ -35,6 +39,6 @@ repos:
         types: [python]
         require_serial: true
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.5.1'
+    rev: 'v1.10.0'
     hooks:
     -   id: mypy

README.md

@@ -83,7 +83,7 @@ The most obvious ones are the following:
 
 ## Versioning
 
-I use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](../../tags). 
+I use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](../../tags).
 
 ## Documentation
 I use the [Numpydoc](https://numpydoc.readthedocs.io/en/latest/format.html) style for documentation.

pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "ug_gpib"
+name = "ug-gpib"
 authors = [
   { name="Patrick Baus", email="[email protected]" },
   { name="Jacob Alexander", email="[email protected]" },
@@ -10,7 +10,6 @@ license = { text="GNU General Public License v3 (GPLv3)" }
 requires-python = ">=3.7"
 classifiers = [
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -42,7 +41,7 @@ dev = [
 ]
 
 test = [
-    "mypy", "pylint",
+    "mypy", "pylint", "setuptools",
 ]
 
 [tool.pylint.'MESSAGES CONTROL']

ug_gpib/__init__.py

@@ -1,5 +1,6 @@
 """
 A python library for the LQ Electronics Corp. UGPlus USB to GPIB Controller.
 """
+
 from ._version import __version__
 from .ug_gpib import UGPlusGpib

ug_gpib/_version.py

@@ -1,4 +1,5 @@
 """
 Version information.
 """
+
 __version__ = "1.2.1"

ug_gpib/gpib_helper.py

@@ -1,6 +1,7 @@
 """
 Helper functions supporting the UGPlusGpib library.
 """
+
 import errno
 from typing import Generator
 

ug_gpib/ug_gpib.py

@@ -1,6 +1,7 @@
 """
 A pure Python module for the LQ Electronics Corp UGPlus USB to GPIB Controller using pyUSB.
 """
+
 from __future__ import annotations
 
 import errno
@@ -208,7 +209,8 @@ def __device_read(self, command_expected: UgPlusCommands) -> bytes | None:
         byte_data = self._usb_read(length - 2)
 
         self.__logger.debug(
-            "Received packet:\n  Header:\n    Command: %(command)r\n    Length %(length)d\n  Payload:\n    %(payload)s.",
+            "Received packet:\n  Header:\n    Command: %(command)r\n    Length %(length)d\n  Payload:"
+            "\n    %(payload)s.",
             {"command": command, "length": length, "payload": [hex(i) for i in byte_data]},
         )