Merge pull request #30 from dbast/poetry-update

Modernize packaging and CI for Poetry 2 and Python 3.10+

Author: steinnes

.circleci/config.yml

@@ -0,0 +1,64 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  tox:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # testing upper and lower bounds of non EOL Python versions
+          # according to https://devguide.python.org/versions/
+          - python-version: "3.10"
+            toxenv: py310
+          - python-version: "3.14"
+            toxenv: py314
+    name: ${{ matrix.python-version }}
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install tox
+        run: python -m pip install --upgrade pip "tox>=4"
+
+      - name: Run tox env
+        run: tox -e ${{ matrix.toxenv }}
+
+  package:
+    runs-on: ubuntu-latest
+    name: Build sdist
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
+
+      - name: Install Poetry
+        run: python -m pip install --upgrade pip "poetry>=2,<3"
+
+      - name: Build sdist
+        run: poetry build -f sdist
+
+      - name: Upload sdist artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: timing-asgi-sdist
+          path: dist/*.tar.gz

.github/workflows/ci.yml

@@ -1,5 +1,5 @@
 # timing-asgi
-[![CircleCI](https://circleci.com/gh/steinnes/timing-asgi.svg?style=svg&circle-token=4e141ed4d7231ab6d00dc7b14624d759cf16e1d2)](https://circleci.com/gh/steinnes/timing-asgi)
+[![CI](https://github.com/steinnes/timing-asgi/actions/workflows/ci.yml/badge.svg)](https://github.com/steinnes/timing-asgi/actions/workflows/ci.yml)
 [![PyPI Downloads](https://img.shields.io/pypi/dm/timing-asgi.svg)](https://pypi.org/project/timing-asgi/)
 [![PyPI Version](https://img.shields.io/pypi/v/timing-asgi.svg)](https://pypi.org/project/timing-asgi/)
 [![License](https://img.shields.io/badge/license-mit-blue.svg)](https://pypi.org/project/timing-asgi/)

README.md

@@ -1,28 +1,29 @@
-[tool.poetry]
+[project]
 name = "timing-asgi"
 version = "0.3.1"
 description = "ASGI middleware to emit timing metrics with something like statsd"
-authors = ["Steinn Eldjárn Sigurðarson <steinnes@gmail.com>"]
+authors = [
+  { name = "Steinn Eldjárn Sigurðarson", email = "steinnes@gmail.com" },
+]
 readme = "README.md"
 license = "MIT"
-include = ["LICENSE"]
+requires-python = ">=3.10"
 
 [project.urls]
 "Source" = "https://github.com/steinnes/timing-asgi"
 
-[tool.poetry.dependencies]
-python = "^3.6"
+[tool.poetry]
+include = ["LICENSE"]
 
-[tool.poetry.dev-dependencies]
-starlette = "^0.12.0"
-pytest = "^4.3"
-pytest-cov = "^2.6"
-requests = "^2.21"
-pytest-asyncio = "^0.10.0"
-asynctest = "^0.12.2"
-flake8 = "^3.7"
-black = {version = "^20.8b1", allow-prereleases = true}
+[tool.poetry.group.dev.dependencies]
+starlette = "^0.52.0"
+pytest = "^9"
+pytest-cov = "^7.0.0"
+requests = "^2.32.2"
+pytest-asyncio = "^1.3.0"
+flake8 = "^7.3"
+black = "^26.1.0"
 
 [build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core>=2.0.0,<3.0.0"]
+build-backend = "poetry.core.masonry.api"

pyproject.toml

@@ -1,4 +1,3 @@
-import asynctest
 import pytest
 
 from unittest import mock
@@ -8,29 +7,29 @@
 from timing_asgi import TimingMiddleware
 
 
-@pytest.yield_fixture(scope="function")
+@pytest.fixture(scope="function")
 def starlette_app():
     yield Starlette()
 
 
-@pytest.yield_fixture(scope="function")
+@pytest.fixture(scope="function")
 def timing_client(starlette_app):
     yield mock.MagicMock()
 
 
-@pytest.yield_fixture(scope="function")
+@pytest.fixture(scope="function")
 def mw(starlette_app, timing_client):
     yield TimingMiddleware(starlette_app, client=timing_client)
 
 
-@pytest.yield_fixture(scope="function")
+@pytest.fixture(scope="function")
 def send():
-    yield asynctest.CoroutineMock()
+    yield mock.AsyncMock()
 
 
-@pytest.yield_fixture(scope="function")
+@pytest.fixture(scope="function")
 def receive():
-    yield asynctest.CoroutineMock()
+    yield mock.AsyncMock()
 
 
 @pytest.fixture

tests/conftest.py

@@ -50,7 +50,7 @@ def test_timing_middleware_init_calls_ensure_compliance(starlette_app):
         "timing_asgi.TimingMiddleware.ensure_compliance"
     ) as mock_ensure_compliance:
         TimingMiddleware(starlette_app, client="foo")
-    assert mock_ensure_compliance.called_with("foo")
+    mock_ensure_compliance.assert_called_with("foo")
 
 
 @pytest.mark.asyncio

tests/test_middleware.py

@@ -1,15 +1,19 @@
 [tox]
-skipsdist=True
-isolated_build = true
-envlist =
-    py36,
-    py37,
-    py38
+min_version = 4.0
+requires =
+    tox>=4
+env_list =
+    py310,
+    py311,
+    py312,
+    py313,
+    py314
+package = skip
 
 [testenv]
-whitelist_externals = /usr/bin/make
+allowlist_externals = make
 commands =
-  pip install poetry
+  pip install "poetry>=2,<3"
   poetry install -v
   make lint
   make test