From e100459656f502c3319d33db59209dcb35a1aba1 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Sat, 21 Dec 2024 13:27:18 +0100 Subject: [PATCH 1/4] drop python3.8 --- .github/workflows/test.yml | 2 +- pyproject.toml | 5 ++--- src/execnet/gateway_base.py | 4 ++-- src/execnet/multi.py | 6 +++--- testing/conftest.py | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d9969c95..4c176e91 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,7 @@ jobs: fail-fast: false matrix: os: [ windows-latest, ubuntu-latest ] - python: [ "3.8","3.10","3.11","3.12", "pypy-3.8" ] + python: [ "3.9","3.10","3.11","3.12", "pypy-3.9" ] steps: - uses: actions/checkout@v4 diff --git a/pyproject.toml b/pyproject.toml index 3c304f3e..3d8dd18b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ dynamic = ["version"] description = "execnet: rapid multi-Python deployment" readme = {"file" = "README.rst", "content-type" = "text/x-rst"} license = "MIT" -requires-python = ">=3.8" +requires-python = ">=3.9" authors = [ { name = "holger krekel and others" }, ] @@ -22,7 +22,6 @@ classifiers = [ "Operating System :: MacOS :: MacOS X", "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -96,7 +95,7 @@ include = [ ] [tool.mypy] -python_version = "3.8" +python_version = "3.9" mypy_path = ["src"] files = ["src", "testing"] strict = true diff --git a/src/execnet/gateway_base.py b/src/execnet/gateway_base.py index 22756778..2d77606d 100644 --- a/src/execnet/gateway_base.py +++ b/src/execnet/gateway_base.py @@ -18,12 +18,12 @@ import traceback import weakref from _thread import interrupt_main +from collections.abc import Iterator +from collections.abc import MutableSet from io import BytesIO from typing import Any from typing import Callable -from typing import Iterator from typing import Literal -from typing import MutableSet from typing import Protocol from typing import cast from typing import overload diff --git a/src/execnet/multi.py b/src/execnet/multi.py index 90742f26..8a3d1a26 100644 --- a/src/execnet/multi.py +++ b/src/execnet/multi.py @@ -8,15 +8,15 @@ import atexit import types +from collections.abc import Iterable +from collections.abc import Iterator +from collections.abc import Sequence from functools import partial from threading import Lock from typing import TYPE_CHECKING from typing import Any from typing import Callable -from typing import Iterable -from typing import Iterator from typing import Literal -from typing import Sequence from typing import overload from . import gateway_bootstrap diff --git a/testing/conftest.py b/testing/conftest.py index a7c2eede..ad7e59d0 100644 --- a/testing/conftest.py +++ b/testing/conftest.py @@ -2,10 +2,10 @@ import shutil import sys +from collections.abc import Generator +from collections.abc import Iterator from functools import lru_cache from typing import Callable -from typing import Generator -from typing import Iterator import pytest From c4edc00fac83755efcb7c7d84898f036f6270edf Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Sat, 21 Dec 2024 13:34:05 +0100 Subject: [PATCH 2/4] fix tox envlist --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 4c743a66..bcff5eea 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=py{38,39,310,311,312,pypy38},docs,linting +envlist=py{39,310,311,312,pypy39},docs,linting isolated_build = true [testenv] From 79ae5a225bd46ef765be7fcea6e7249c5135e0bf Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Sat, 21 Dec 2024 13:36:30 +0100 Subject: [PATCH 3/4] prepare for main branch usage --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4c176e91..b9e15081 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,11 +4,13 @@ on: push: branches: - "master" + - "main" - "test-me-*" pull_request: branches: - "master" + - "main" # Cancel running jobs for the same workflow and branch. concurrency: From 2fbc11005f5caeba43bc08fb1567c4cd26c3812f Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Sat, 21 Dec 2024 13:53:34 +0100 Subject: [PATCH 4/4] add towncrier config - releasing needs fixing --- changelog.d/.keep | 0 changelog.d/320.misc.rst | 1 + changelog.d/320.removal.rst | 1 + pyproject.toml | 4 ++++ 4 files changed, 6 insertions(+) create mode 100644 changelog.d/.keep create mode 100644 changelog.d/320.misc.rst create mode 100644 changelog.d/320.removal.rst diff --git a/changelog.d/.keep b/changelog.d/.keep new file mode 100644 index 00000000..e69de29b diff --git a/changelog.d/320.misc.rst b/changelog.d/320.misc.rst new file mode 100644 index 00000000..c2f0fc68 --- /dev/null +++ b/changelog.d/320.misc.rst @@ -0,0 +1 @@ +add towncrier configuration diff --git a/changelog.d/320.removal.rst b/changelog.d/320.removal.rst new file mode 100644 index 00000000..63aefbab --- /dev/null +++ b/changelog.d/320.removal.rst @@ -0,0 +1 @@ +remove python3.8 support diff --git a/pyproject.toml b/pyproject.toml index 3d8dd18b..7fa93a5a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -111,3 +111,7 @@ module = [ "gevent.thread.*", ] ignore_missing_imports = true + +[tool.towncrier] +filename = "CHANGELOG.rst" +directory = "changelog.d" \ No newline at end of file