Merge branch 'release/4.42.0' into master

ets-labs · Sep 10, 2024 · 13a7ef6 · 13a7ef6
2 parents 2c998b8 + 7a88a8e
commit 13a7ef6
Show file tree

Hide file tree

Showing 27 changed files with 69 additions and 21 deletions.
diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml
@@ -115,8 +115,8 @@ jobs:
  - uses: actions/setup-python@v4
  with:
  python-version: 3.12
- - run: pip install -r requirements-doc.txt
  - run: pip install awscli
+ - run: pip install -r requirements-doc.txt
  - run: pip install -e .
  - run: (cd docs && make clean html)
  - run: |

diff --git a/docs/_static/custom.css b/docs/_static/custom.css
@@ -0,0 +1,9 @@
+.no-border {
+ border: 0 !important;
+ box-shadow: none !important;
+ -webkit-box-shadow: none !important;
+}
+.no-border td {
+ border: 0px !important;
+ padding: 0px 10px 0px 0px !important;
+}
diff --git a/docs/_static/disqus.js b/docs/_static/disqus.js
diff --git a/docs/_static/sponsor.html b/docs/_static/sponsor.html
@@ -0,0 +1 @@
+<iframe src="https:/sponsors/rmk135/button" title="Sponsor Dependency Injector" height="32" width="114" style="border: 0; border-radius: 6px;"></iframe>
diff --git a/docs/conf.py b/docs/conf.py
@@ -33,7 +33,7 @@
 extensions = [
  "alabaster",
  "sphinx.ext.autodoc",
- "sphinxcontrib.disqus",
+ "sphinx_disqus.disqus",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -52,7 +52,7 @@
 
 # General information about the project.
 project = "Dependency Injector"
-copyright = "2022, Roman Mogylatov"
+copyright = "2024, Roman Mogylatov"
 author = "Roman Mogylatov"
 
 # The version info for the project you"re documenting, acts as replacement for
@@ -147,6 +147,9 @@
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ["_static"]
+html_css_files = [
+ "custom.css",
+]
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -306,4 +309,5 @@
  "description": "Dependency injection framework for Python by Roman Mogylatov",
  "code_font_size": "10pt",
  "analytics_id": "UA-67012059-1",
+ "donate_url": "https:/sponsors/rmk135",
 }
diff --git a/docs/examples/aiohttp.rst b/docs/examples/aiohttp.rst
@@ -78,4 +78,6 @@ Sources
 
 Explore the sources on the `Github <https:/ets-labs/python-dependency-injector/tree/master/examples/miniapps/aiohttp>`_.
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/examples/application-multiple-containers.rst b/docs/examples/application-multiple-containers.rst
@@ -84,4 +84,6 @@ Run the application
 
 You can find the source code and instructions for running on the `Github <https:/ets-labs/python-dependency-injector/tree/master/examples/miniapps/application-multiple-containers>`_.
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/examples/application-single-container.rst b/docs/examples/application-single-container.rst
@@ -90,4 +90,6 @@ Run the application
 
 You can find the source code and instructions for running on the `Github <https:/ets-labs/python-dependency-injector/tree/master/examples/miniapps/application-single-container>`_.
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/examples/boto3.rst b/docs/examples/boto3.rst
@@ -17,4 +17,6 @@ Listing of ``boto3_session_example.py``:
 .. literalinclude:: ../../examples/miniapps/boto3-session/boto3_session_example.py
  :language: python
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/examples/decoupled-packages.rst b/docs/examples/decoupled-packages.rst
@@ -129,4 +129,6 @@ Run the application
 
 You can find the source code and instructions for running on the `Github <https:/ets-labs/python-dependency-injector/tree/master/examples/miniapps/decoupled-packages>`_.
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/examples/django.rst b/docs/examples/django.rst
@@ -94,4 +94,6 @@ Sources
 
 Explore the sources on the `Github <https:/ets-labs/python-dependency-injector/tree/master/examples/miniapps/django>`_.
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/examples/fastapi-redis.rst b/docs/examples/fastapi-redis.rst
@@ -95,4 +95,6 @@ See also:
 - Resource provider :ref:`resource-async-initializers`
 - Wiring :ref:`async-injections-wiring`
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/examples/fastapi-sqlalchemy.rst b/docs/examples/fastapi-sqlalchemy.rst
@@ -116,4 +116,6 @@ Sources
 
 The source code is available on the `Github <https:/ets-labs/python-dependency-injector/tree/master/examples/miniapps/fastapi-sqlalchemy>`_.
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/examples/fastapi.rst b/docs/examples/fastapi.rst
@@ -76,4 +76,6 @@ Sources
 
 Explore the sources on the `Github <https:/ets-labs/python-dependency-injector/tree/master/examples/miniapps/fastapi>`_.
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/examples/flask-blueprints.rst b/docs/examples/flask-blueprints.rst
@@ -86,4 +86,6 @@ Sources
 
 Explore the sources on the `Github <https:/ets-labs/python-dependency-injector/tree/master/examples/miniapps/flask-blueprints>`_.
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/examples/flask.rst b/docs/examples/flask.rst
@@ -84,4 +84,6 @@ Sources
 
 Explore the sources on the `Github <https:/ets-labs/python-dependency-injector/tree/master/examples/miniapps/flask>`_.
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/examples/sanic.rst b/docs/examples/sanic.rst
@@ -77,4 +77,6 @@ Sources
 
 Explore the sources on the `Github <https:/ets-labs/python-dependency-injector/tree/master/examples/miniapps/sanic>`_.
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/index.rst b/docs/index.rst
@@ -9,11 +9,11 @@ Dependency Injector --- Dependency injection framework for Python
  :description: Dependency Injector is a dependency injection framework
  for Python. It helps to maintain you application structure.
  It was designed to be unified, developer-friendly
- tool that helps to implement dependency injection design 
- pattern in formal, pretty, Pythonic way. Dependency Injector 
- provides implementations of such popular design patterns 
- like IoC container, Factory and Singleton. Dependency 
- Injector providers are implemented as C extension types 
+ tool that helps to implement dependency injection design
+ pattern in formal, pretty, Pythonic way. Dependency Injector
+ provides implementations of such popular design patterns
+ like IoC container, Factory and Singleton. Dependency
+ Injector providers are implemented as C extension types
  using Cython.
 
 .. _index:

diff --git a/docs/introduction/di_in_python.rst b/docs/introduction/di_in_python.rst
@@ -310,4 +310,6 @@ A few useful links related to a dependency injection design pattern for further
 + https:/ets-labs/python-dependency-injector
 + https://pypi.org/project/dependency-injector/
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst
@@ -7,6 +7,11 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly
 follows `Semantic versioning`_
 
+4.42.0
+--------
+- Promote release ``4.42.0b1`` to a production release.
+- Fix the Disqus comment widget.
+
 4.42.0b1
 --------
 

diff --git a/docs/sponsor.rst b/docs/sponsor.rst
@@ -0,0 +1,7 @@
+.. list-table::
+ :class: no-border
+ :align: left
+
+ * - Sponsor the project on GitHub:
+ - .. raw:: html
+ :file: _static/sponsor.html
diff --git a/docs/tutorials/aiohttp.rst b/docs/tutorials/aiohttp.rst
@@ -859,4 +859,6 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/tutorials/asyncio-daemon.rst b/docs/tutorials/asyncio-daemon.rst
@@ -1028,4 +1028,6 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/tutorials/cli.rst b/docs/tutorials/cli.rst
@@ -1034,4 +1034,6 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
+.. include:: ../sponsor.rst
+
 .. disqus::
diff --git a/docs/tutorials/flask.rst b/docs/tutorials/flask.rst
@@ -998,5 +998,6 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
+.. include:: ../sponsor.rst
 
 .. disqus::
diff --git a/requirements-doc.txt b/requirements-doc.txt
@@ -4,6 +4,6 @@ sphinx
 # TODO: unpin jinja2 after sphinx update to 4+
 jinja2
 
--e git+https:/rmk135/sphinxcontrib-disqus.git#egg=sphinxcontrib-disqus
+sphinx-disqus==1.3.0
 
 -r requirements-ext.txt
diff --git a/src/dependency_injector/__init__.py b/src/dependency_injector/__init__.py
@@ -1,6 +1,6 @@
 """Top-level package."""
 
-__version__ = "4.42.0b1"
+__version__ = "4.42.0"
 """Version number.
 
 :type: str