Merge branch 'release/4.42.0b1' into master

ets-labs · Aug 7, 2024 · b1a3a69 · b1a3a69
2 parents 68da747 + a8b5442
commit b1a3a69
Show file tree

Hide file tree

Showing 19 changed files with 1,101 additions and 1,077 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,5 +1,5 @@
 [run]
-source = src/dependency_injector
+source = dependency_injector
 omit = tests/unit
 plugins = Cython.Coverage
 

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.11
+          python-version: 3.12
       - run: pip install tox
       - run: tox
         env:
-          TOXENV: 3.11
+          TOXENV: 3.12
 
   linters:
     name: Run linters
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.12
       - 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.11
+          python-version: 3.12
       - run: python setup.py sdist
       - uses: actions/upload-artifact@v3
         with:
@@ -110,7 +110,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.12
       - run: pip install -r requirements-doc.txt
       - run: pip install awscli
       - run: pip install -e .

diff --git a/.github/workflows/tests-and-linters.yml b/.github/workflows/tests-and-linters.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, pypy2.7, pypy3.9]
+        python-version: [3.7]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", 3.11]
+        python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -40,15 +40,16 @@ jobs:
     name: Run tests with coverage
     runs-on: ubuntu-latest
     env:
-      DEPENDENCY_INJECTOR_DEBUG_MODE: 1
+      # Cython's version <3 issue with tracing: "error: no member named 'use_tracing' in 'struct _PyCFrame'"
+      # DEPENDENCY_INJECTOR_DEBUG_MODE: 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.11
-      - run: pip install tox cython
+          python-version: 3.12
+      - run: pip install tox cython==0.29.37
       - run: make cythonize
       - run: tox
         env:
@@ -64,7 +65,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.12
       - run: pip install tox
       - run: tox
         env:

diff --git a/.gitignore b/.gitignore
@@ -73,3 +73,5 @@ src/dependency_injector/providers/*.so
 
 # Workspace for samples
 .workspace/
+
+.vscode/
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
@@ -20,3 +20,4 @@ Dependency Injector Contributors
 + Ngo Thanh Loi (Leonn) (loingo95)
 + Thiago Hiromi (thiromi)
 + Felipe Rubio (krouw)
++ Anton Petrov (anton-petrov)
diff --git a/LICENSE.rst b/LICENSE.rst
@@ -1,4 +1,4 @@
-Copyright (c) 2022, Roman Mogylatov
+Copyright (c) 2024, Roman Mogylatov
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
Original file line number	Diff line number	Diff line change
Expand Up		@@ -73,3 +73,5 @@ src/dependency_injector/providers/*.so

		# Workspace for samples
		.workspace/

		.vscode/