Merge branch '2.4.x' into 2.x

.gitignore

@@ -23,6 +23,7 @@ distribute-*
 env/
 build/
 dist/
+docker/
 Sphinx.egg-info/
 doc/_build/
 doc/locale/

CHANGES

@@ -1,4 +1,4 @@
-Release 2.4.4 (in development)
+Release 2.4.5 (in development)
 ==============================
 
 Dependencies
@@ -16,12 +16,18 @@ Features added
 Bugs fixed
 ----------
 
-* #7197: LaTeX: platex cause error to build image directive with target url
-* #7223: Sphinx builds has been slower since 2.4.0
-
 Testing
 --------
 
+Release 2.4.4 (released Mar 05, 2020)
+=====================================
+
+Bugs fixed
+----------
+
+* #7197: LaTeX: platex cause error to build image directive with target url
+* #7223: Sphinx builds has been slower since 2.4.0
+
 Release 2.4.3 (released Feb 22, 2020)
 =====================================
 

setup.cfg

@@ -61,6 +61,7 @@ markers =
 
 [coverage:run]
 branch = True
+parallel = True
 source = sphinx
 
 [coverage:report]

sphinx/__init__.py

@@ -32,8 +32,8 @@ if 'PYTHONWARNINGS' not in os.environ:
 warnings.filterwarnings('ignore', "'U' mode is deprecated",
                         DeprecationWarning, module='docutils.io')
 
-__version__ = '2.4.4+'
-__released__ = '2.4.4'  # used when Sphinx builds its own docs
+__version__ = '2.4.5+'
+__released__ = '2.4.5'  # used when Sphinx builds its own docs
 
 #: Version info for better programmatic use.
 #:
@@ -43,7 +43,7 @@ __released__ = '2.4.4'  # used when Sphinx builds its own docs
 #:
 #: .. versionadded:: 1.2
 #:    Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (2, 4, 4, 'beta', 0)
+version_info = (2, 4, 5, 'beta', 0)
 
 package_dir = path.abspath(path.dirname(__file__))
 

sphinx/domains/python.py

@@ -397,7 +397,7 @@ class PyModulelevel(PyObject):
     """
 
     def run(self) -> List[Node]:
-        warnings.warn('PyClassmember is deprecated.',
+        warnings.warn('PyModulelevel is deprecated.',
                       RemovedInSphinx40Warning)
 
         return super().run()

tox.ini

@@ -10,7 +10,6 @@ description =
     py{35,36,37,38,39}: Run unit tests against {envname}.
     du{12,13,14}: Run unit tests with the given version of docutils.
 deps =
-    coverage < 5.0  # refs: https://github.com/sphinx-doc/sphinx/pull/6924
     git+https://github.com/html5lib/html5lib-python ; python_version >= "3.9"  # refs: https://github.com/html5lib/html5lib-python/issues/419
     du12: docutils==0.12
     du13: docutils==0.13.1

utils/bump_docker.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -ex
+
+if [ -z "$1" ]; then
+    echo "bump_docker.sh [VERSION]"
+    exit
+fi
+
+cd docker
+git checkout .
+sed -i "" -e "s/==[0-9.]\{1,\}/==$1/" base/Dockerfile
+sed -i "" -e "s/==[0-9.]\{1,\}/==$1/" latexpdf/Dockerfile
+git commit -am "Bump to $1"
+git tag $1
+git push origin master --tags

utils/release-checklist

@@ -14,6 +14,7 @@ for stable releases
 * ``twine check dist/Sphinx-*``
 * ``twine upload dist/Sphinx-* --sign --identity [your GPG key]``
 * open https://pypi.org/project/Sphinx/ and check there are no obvious errors
+* ``sh utils/bump_docker.sh X.Y.Z``
 * ``git tag vX.Y.Z``
 * ``python utils/bump_version.py --in-develop X.Y.Zb0`` (ex. 1.5.3b0)
 * Check diff by ``git diff``
@@ -97,6 +98,7 @@ for major releases
 * ``twine check dist/Sphinx-*``
 * ``twine upload dist/Sphinx-* --sign --identity [your GPG key]``
 * open https://pypi.org/project/Sphinx/ and check there are no obvious errors
+* ``sh utils/bump_docker.sh X.Y.Z``
 * ``git tag vX.Y.0``
 * ``python utils/bump_version.py --in-develop X.Y.1b0`` (ex. 1.6.1b0)
 * Check diff by ``git diff``