Merge branch 'release/2.1.1'

Author: GrahamDumpleton

MANIFEST.in

@@ -1,6 +1,7 @@
 include README.md
 include RELEASE.rst
 include LICENSE
+include tox.ini
 
 recursive-include src *.c *.pyi py.typed
 recursive-include tests *.py *.out

docs/changes.rst

@@ -1,6 +1,16 @@
 Release Notes
 =============
 
+Version 2.1.1
+-------------
+
+**Bugs Fixed**
+
+* Search field for documentation hosted on Read the Docs wasn't working
+  correctly due to JavaScript error.
+
+* Missing ``tox.ini`` from source distribution package has been added.
+
 Version 2.1.0
 -------------
 

docs/conf.py

@@ -49,7 +49,7 @@
 # The short X.Y version.
 version = "2.1"
 # The full version, including alpha/beta/rc tags.
-release = "2.1.0"
+release = "2.1.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -172,6 +172,10 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = "wraptdoc"
 
+# Ensure jQuery is included for search functionality
+html_js_files = [
+    "https://code.jquery.com/jquery-3.7.1.min.js",
+]
 
 # -- Options for LaTeX output --------------------------------------------------
 

docs/decorators.rst

@@ -654,15 +654,21 @@ When calling the wrapped function in the decorator wrapper function, the
 instance is already bound to ``wrapped`` and will be passed automatically
 as the first argument to the original wrapped function.
 
-Note that due to a bug in ``classmethod.__get__()`` prior to Python 3.9,
-whereby it does not apply the descriptor protocol to the function wrapped
-by ``@classmethod``, the above only applies where the decorator wraps the
-``@classmethod`` decorator. If the decorator is placed inside of the
-``@classmethod`` decorator, then ``instance`` will be ``None`` and the
-decorator wrapper function will see the call as being the same as a normal
-function. As a result, always place any decorator outside of the
-``@classmethod`` decorator if needing the code to be portable to versions
-of Python older than Python 3.9.
+Note that you should always apply the decorator outside of the ``@classmethod``
+decorator. This is because the ``@classmethod`` decorator itself is not
+aware of the descriptor protocol for the function it is wrapping, and so
+it does not apply it. If the decorator is placed inside of the ``@classmethod``
+decorator, then ``instance`` will be ``None`` and the decorator wrapper function
+will see the call as being the same as a normal function.
+
+This behavour of ``@classmethod`` is a bug in it's ``classmethod.__get__()``
+implementation. The bug existed prior to Python 3.9 and was fixed in that
+version of Python, however in Python 3.13 this fix in Python was reverted back
+to the old behaviour because various third party code relied on the broken
+behaviour and even though technically not correct, it was deemed safer to revert
+the fix. Thus the general recommendation remains that decorators implemented
+using ``@wrapt.decorator`` always be placed outside of ``@classmethod`` and
+never inside.
 
 Decorating Static Methods
 -------------------------

src/wrapt/__init__.py

@@ -2,7 +2,7 @@
 Wrapt is a library for decorators, wrappers and monkey patching.
 """
 
-__version_info__ = ("2", "1", "0")
+__version_info__ = ("2", "1", "1")
 __version__ = ".".join(__version_info__)
 
 from .__wrapt__ import (