From b1566f02a78302212da3e3a36eb10e27173ee29a Mon Sep 17 00:00:00 2001 From: Joe Lynch Date: Fri, 27 Sep 2024 08:57:43 +0000 Subject: [PATCH 1/2] Package for f40 --- .github/workflows/test.yml | 9 ++++---- Dockerfile.fedora | 2 +- pyproject.toml | 44 ++++++++++++++++---------------------- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a913267..242ec420 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,14 +12,13 @@ jobs: strategy: max-parallel: 4 matrix: - fedora-version: ["38", "39"] + fedora-version: ["39", "40"] include: - - fedora-version: "38" - python-version: "3.11" - fedora-version: "39" - # https://github.com/pydantic/pydantic/issues/9637 - python-version: "3.12.3" + python-version: "3.12.6" + - fedora-version: "40" + python-version: "3.12.6" steps: - uses: actions/checkout@v3 diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 93f2a1b3..dd3b022d 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -1,6 +1,6 @@ # -*- dockerfile -*- -FROM fedora:38 +FROM fedora:40 MAINTAINER "Markus Stenberg " RUN dnf install -y sudo make diff --git a/pyproject.toml b/pyproject.toml index 2a2c710c..b465e003 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,58 +43,52 @@ dependencies = [ cassandra = [ "cassandra-driver == 3.20.2", ] -f38 = [ +f39 = [ "cramjam == 2.8.3", - "cryptography == 37.0.2", - "fastapi == 0.99.0", - # h11 on Fedora 38 is actually 0.13.0, but 0.13.0 is rejeceted by httpcore 0.15.0 - # See: https://github.com/encode/httpcore/blob/0.15.0/setup.py#L56-L57 - # See also: https://github.com/python-hyper/h11/compare/v0.12.0...v0.13.0 if you're looking for meaningful differences. - "h11 == 0.12.0", - "httpcore == 0.15.0", - "httplib2 == 0.20.4", + "cryptography == 41.0.7", + "fastapi == 0.103.0", + "h11 == 0.14.0", + "httpcore == 0.17.3", + "httplib2 == 0.21.0", "httpx == 0.24.1", "msgspec == 0.18.6", "kazoo == 2.8.0", "protobuf == 3.19.6", - # pydantic on Fedora 38 is actually 1.10.2, but 1.10.2 is incompatible with - # mypy >= 1.4.0, this was fixed in pydantic 1.10.9: https://github.com/pydantic/pydantic/pull/5928 - # Further than that, rohmu >= 2.5.0 requires pydantic >= 1.10.17 because of the "v1" namespace broken compatibility. + "pyasyncore == 1.0.2", + # pydantic on Fedora 39 is actually 1.10.14. + # rohmu requires pydantic >= 1.10.17 because of the "v1" namespace broken compatibility. "pydantic == 1.10.17", - "pyyaml == 6.0.0", + "pyyaml == 6.0.1", "requests == 2.28.2", "starlette == 0.27.0", "tabulate == 0.9.0", "uritemplate == 4.1.1", "urllib3 == 1.26.18", - "uvicorn == 0.15.0", + "uvicorn == 0.23.2", "wcmatch == 8.4.1", "zstandard == 0.21.0", ] -f39 = [ +f40 = [ "cramjam == 2.8.3", "cryptography == 41.0.7", - "fastapi == 0.103.0", + "fastapi == 0.111.1", "h11 == 0.14.0", - "httpcore == 0.17.3", + "httpcore == 1.0.2", "httplib2 == 0.21.0", - "httpx == 0.24.1", + "httpx == 0.26.0", "msgspec == 0.18.6", "kazoo == 2.8.0", "protobuf == 3.19.6", "pyasyncore == 1.0.2", - # pydantic on Fedora 39 is actually 1.10.14. - # rohmu requires pydantic >= 1.10.17 because of the "v1" namespace broken compatibility. + # pydantic on Fedora 40 is actually v2. "pydantic == 1.10.17", "pyyaml == 6.0.1", - "requests == 2.28.2", - "starlette == 0.27.0", + "requests == 2.31.0", "tabulate == 0.9.0", "uritemplate == 4.1.1", - "urllib3 == 1.26.18", "uvicorn == 0.23.2", - "wcmatch == 8.4.1", - "zstandard == 0.21.0", + "wcmatch == 8.5.2", + "zstandard == 0.22.0", ] dev = [ # Needed by pre-commit to lint and test the project From 0af4ebd1b243e6f6f6f39c52dee66cbdb246910d Mon Sep 17 00:00:00 2001 From: Joe Lynch Date: Tue, 1 Oct 2024 07:12:25 +0000 Subject: [PATCH 2/2] Remove maintainer from Dockerfile Markus is no longer a maintainer. --- Dockerfile.fedora | 1 - Dockerfile.ubuntu | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile.fedora b/Dockerfile.fedora index dd3b022d..bd7f7a20 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -1,7 +1,6 @@ # -*- dockerfile -*- FROM fedora:40 -MAINTAINER "Markus Stenberg " RUN dnf install -y sudo make diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 9bfa7a32..f746e3d6 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,7 +1,6 @@ # -*- dockerfile -*- FROM ubuntu:22.04 -MAINTAINER "Markus Stenberg " RUN apt-get update RUN apt-get install -y sudo make