switch from black to ruff and use uv overall

Author: attwad

.github/workflows/publish-pypi.yml

@@ -9,24 +9,12 @@ jobs:
           id-token: write
         steps:
             - uses: actions/checkout@v4
-            - name: Set up Python
-              uses: actions/setup-python@v5
+            - name: Set up uv
+              uses: astral-sh/setup-uv@v5
               with:
                 python-version: "3.x"
-            - name: Install pypa/build
-              run: >-
-                  python3 -m
-                  pip install
-                  build
-                  --user
             - name: Build a binary wheel and a source tarball
-              run: >-
-                  python3 -m
-                  build
-                  --sdist
-                  --wheel
-                  --outdir dist/
-                  .
+              run: uv build
             - name: Publish distribution 📦 to PyPI
               if: startsWith(github.ref, 'refs/tags')
-              uses: pypa/gh-action-pypi-publish@release/v1
+              run: uv publish

.github/workflows/python-test.yml

@@ -17,47 +17,42 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - name: Set up uv
+      uses: astral-sh/setup-uv@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install flake8 pytest mypy
-    - name: Lint with flake8
+      run: uv sync --group dev
+    - name: Lint with ruff
       run: |
         # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        uv run ruff check .
     - name: Check with mypy
-      run: mypy pythonosc examples
+      run: uv run mypy pythonosc examples
     - name: Test with pytest
-      run: pytest
+      run: uv run pytest
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: psf/black@stable
+      - uses: actions/checkout@v4
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v5
+      - name: Run ruff format
+        run: uv run ruff format --check .
 
   check-types-published:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v4
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: '3.12'
-      - run: |
-          pip install build
-          python -m build --sdist --wheel
-
+      - name: Build package
+        run: uv build
+      - name: Verify package installation and types
+        run: |
           temp=$(mktemp -d)
-
-          python -m venv $temp/venv
-          source $temp/venv/bin/activate
-
-          pip install mypy ./dist/*whl
-
-          cd $temp
-
-          echo 'import pythonosc' > demo.py
-          mypy demo.py
+          uv run --with mypy --with ./dist/*.whl --no-project -- python -c "import pythonosc"
+          echo 'import pythonosc' > $temp/demo.py
+          uv run --with mypy --with ./dist/*.whl --no-project -- mypy $temp/demo.py

examples/async_server.py

@@ -24,7 +24,10 @@ async def loop():
 
 async def init_main():
     server = AsyncIOOSCUDPServer((ip, port), dispatcher, asyncio.get_event_loop())
-    transport, protocol = (
+    (
+        transport,
+        protocol,
+    ) = (
         await server.create_serve_endpoint()
     )  # Create datagram endpoint and start serving
 

examples/simple_echo_server.py

@@ -5,7 +5,6 @@
 """
 
 import argparse
-import math
 
 from pythonosc.dispatcher import Dispatcher
 from pythonosc import osc_server

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+requires = ["uv-build"]
+build-backend = "uv_build"
 
 [project]
 name = "python-osc"
@@ -21,10 +21,23 @@ classifiers = [
     "Topic :: Multimedia :: Sound/Audio",
     "Topic :: System :: Networking",
 ]
+dependencies = []
 
 [project.urls]
 Repository = "https://github.com/attwad/python-osc"
 
+[dependency-groups]
+dev = [
+    "pytest",
+    "mypy",
+    "ruff",
+    "pytest-cov",
+]
+
+[tool.uv.build-backend]
+module-name = "pythonosc"
+module-root = "."
+
 [tool.mypy]
 # Would be great to turn this on, however there's too many cases it would break
 # right now.

pythonosc/dispatcher.py

@@ -350,7 +350,7 @@ async def async_call_handlers_for_packet(
                             )
                     if result:
                         results.append(result)
-        except osc_packet.ParseError as e:
+        except osc_packet.ParseError:
             pass
         return results
 

pythonosc/osc_message_builder.py

@@ -195,7 +195,6 @@ def build(self) -> osc_message.OscMessage:
 
 def build_msg(address: str, value: ArgValue = "") -> osc_message.OscMessage:
     builder = OscMessageBuilder(address=address)
-    values: ArgValue
     if value == "":
         values = []
     elif not isinstance(value, Iterable) or isinstance(value, (str, bytes)):

pythonosc/osc_packet.py

@@ -72,8 +72,7 @@ def __init__(self, dgram: bytes) -> None:
             else:
                 # Empty packet, should not happen as per the spec but heh, UDP...
                 raise ParseError(
-                    "OSC Packet should at least contain an OscMessage or an "
-                    "OscBundle."
+                    "OSC Packet should at least contain an OscMessage or an OscBundle."
                 )
         except (osc_bundle.ParseError, osc_message.ParseError) as pe:
             raise ParseError(f"Could not parse packet {pe}")

pythonosc/test/test_osc_bundle.py

@@ -46,7 +46,7 @@
     b"?\x00\x00\x00"
 )
 
-_DGRAM_EMPTY_BUNDLE = b"#bundle\x00" b"\x00\x00\x00\x00\x00\x00\x00\x01"
+_DGRAM_EMPTY_BUNDLE = b"#bundle\x00\x00\x00\x00\x00\x00\x00\x00\x01"
 
 _DGRAM_BUNDLE_IN_BUNDLE = (
     b"#bundle\x00"
@@ -60,20 +60,14 @@
     b"?\x00\x00\x00"
 )
 
-_DGRAM_INVALID = b"#bundle\x00" b"\x00\x00\x00"
+_DGRAM_INVALID = b"#bundle\x00\x00\x00\x00"
 
 _DGRAM_INVALID_INDEX = (
-    b"#bundle\x00"
-    b"\x00\x00\x00\x00\x00\x00\x00\x01"
-    b"\x00\x00\x00\x20"
-    b"/SYNC\x00\x00\x00\x00"
+    b"#bundle\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x20/SYNC\x00\x00\x00\x00"
 )
 
 _DGRAM_UNKNOWN_TYPE = (
-    b"#bundle\x00"
-    b"\x00\x00\x00\x00\x00\x00\x00\x01"
-    b"\x00\x00\x00\x10"
-    b"iamnotaslash"
+    b"#bundle\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x10iamnotaslash"
 )
 
 

pythonosc/test/test_osc_message.py

@@ -5,11 +5,11 @@
 from datetime import datetime
 
 # Datagrams sent by Reaktor 5.8 by Native Instruments (c).
-_DGRAM_KNOB_ROTATES = b"/FB\x00" b",f\x00\x00" b">xca=q"
+_DGRAM_KNOB_ROTATES = b"/FB\x00,f\x00\x00>xca=q"
 
-_DGRAM_SWITCH_GOES_OFF = b"/SYNC\x00\x00\x00" b",f\x00\x00" b"\x00\x00\x00\x00"
+_DGRAM_SWITCH_GOES_OFF = b"/SYNC\x00\x00\x00,f\x00\x00\x00\x00\x00\x00"
 
-_DGRAM_SWITCH_GOES_ON = b"/SYNC\x00\x00\x00" b",f\x00\x00" b"?\x00\x00\x00"
+_DGRAM_SWITCH_GOES_ON = b"/SYNC\x00\x00\x00,f\x00\x00?\x00\x00\x00"
 
 _DGRAM_NO_PARAMS = b"/SYNC\x00\x00\x00"