Merge branch 'release/4.43.0' into master

ets-labs · Nov 4, 2024 · abf2a25 · abf2a25
2 parents 13a7ef6 + 3777a94
commit abf2a25
Show file tree

Hide file tree

Showing 17 changed files with 204,514 additions and 144,766 deletions.
diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml
@@ -15,11 +15,11 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.12
+          python-version: 3.13
       - run: pip install tox
       - run: tox
         env:
-          TOXENV: 3.12
+          TOXENV: 3.13
 
   linters:
     name: Run linters
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.12
+          python-version: 3.13
       - run: pip install tox
       - run: tox
         env:
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.12
+          python-version: 3.13
       - run: |
           python -m pip install --upgrade pip setuptools
           python setup.py sdist
@@ -61,7 +61,7 @@ jobs:
       matrix:
         os: [ubuntu-22.04, windows-2019, macos-14]
     env:
-      CIBW_SKIP: cp27-* cp313-*
+      CIBW_SKIP: cp27-*
     steps:
       - uses: actions/checkout@v3
       - name: Build wheels
@@ -75,7 +75,7 @@ jobs:
     needs: [tests, linters]
     runs-on: ubuntu-22.04
     env:
-      CIBW_SKIP: cp27-* cp313-*
+      CIBW_SKIP: cp27-*
     steps:
       - uses: actions/checkout@v3
       - name: Set up QEMU
@@ -114,7 +114,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.12
+          python-version: 3.13
       - run: pip install awscli
       - run: pip install -r requirements-doc.txt
       - run: pip install -e .

diff --git a/.github/workflows/tests-and-linters.yml b/.github/workflows/tests-and-linters.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
+        python-version: [3.8, 3.9, "3.10", 3.11, 3.12, 3.13]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -40,18 +40,18 @@ jobs:
     name: Run tests with coverage
     runs-on: ubuntu-latest
     env:
-      # Cython's version <3 issue with tracing: "error: no member named 'use_tracing' in 'struct _PyCFrame'"
-      # DEPENDENCY_INJECTOR_DEBUG_MODE: 1
+      DEPENDENCY_INJECTOR_DEBUG_MODE: 1
+      PIP_VERBOSE: 1
       COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: 3.12
-      - run: pip install tox cython==0.29.37
+      - run: pip install tox 'cython>=3,<4'
       - run: make cythonize
-      - run: tox
+      - run: tox -vv
         env:
           TOXENV: coveralls
 
@@ -65,7 +65,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.12
+          python-version: 3.13
       - run: pip install tox
       - run: tox
         env:

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
@@ -21,3 +21,4 @@ Dependency Injector Contributors
 + Thiago Hiromi (thiromi)
 + Felipe Rubio (krouw)
 + Anton Petrov (anton-petrov)
++ ZipFile (ZipFile)
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ VERSION := $(shell python setup.py --version)
 
 CYTHON_SRC := $(shell find src/dependency_injector -name '*.pyx')
 
-CYTHON_DIRECTIVES = -Xlanguage_level=2
+CYTHON_DIRECTIVES = -Xlanguage_level=3
 
 ifdef DEPENDENCY_INJECTOR_DEBUG_MODE
 	CYTHON_DIRECTIVES += -Xprofile=True

diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst
@@ -7,6 +7,12 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly
 follows `Semantic versioning`_
 
+4.43.0
+--------
+- Add support for Python 3.13.
+- Migrate to Cython 3 (version 3.0.11). Many thanks to `ZipFile <https://github.com/ZipFile>`_ for
+  this contribution `#813 <https://github.com/ets-labs/python-dependency-injector/pull/813>`_.
+
 4.42.0
 --------
 - Promote release ``4.42.0b1`` to a production release.

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,4 +1,5 @@
-cython==0.29.37
+cython==3.0.11
+setuptools
 pytest
 pytest-asyncio
 tox

diff --git a/requirements-ext.txt b/requirements-ext.txt
@@ -1,3 +1,3 @@
 flask==2.1.3
 werkzeug==2.2.2
-aiohttp==3.9.0b1
+aiohttp
diff --git a/setup.py b/setup.py
@@ -111,6 +111,7 @@ def _open(filename):
           "Programming Language :: Python :: 3.10",
           "Programming Language :: Python :: 3.11",
           "Programming Language :: Python :: 3.12",
+          "Programming Language :: Python :: 3.13",
           "Programming Language :: Python :: Implementation :: CPython",
           "Programming Language :: Python :: Implementation :: PyPy",
           "Framework :: AsyncIO",

diff --git a/src/dependency_injector/__init__.py b/src/dependency_injector/__init__.py
@@ -1,6 +1,6 @@
 """Top-level package."""
 
-__version__ = "4.42.0"
+__version__ = "4.43.0"
 """Version number.
 
 :type: str