diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7fb9cd18c2..8232140dff 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 62.2.0 +current_version = 62.3.0 commit = True tag = True diff --git a/CHANGES.rst b/CHANGES.rst index 4d0a73dffc..be005ad74c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,49 @@ +v62.3.0 +------- + + +Deprecations +^^^^^^^^^^^^ +* #3262: Formally added deprecation messages for ``namespace_packages``. + The methodology that uses ``pkg_resources`` and ``namespace_packages`` for + creating namespaces was already discouraged by the :doc:`setuptools docs + ` and the + :doc:`Python Packaging User Guide `, + therefore this change just make the deprecation more official. + Users can consider migrating to native/implicit namespaces (as introduced in + :pep:`420`). +* #3308: Relying on ``include_package_data`` to ensure sub-packages are automatically + added to the build wheel distribution (as "data") is now considered a + deprecated practice. + + This behaviour was controversial and caused inconsistencies (#3260). + + Instead, projects are encouraged to properly configure ``packages`` or use + discovery tools. General information can be found in :doc:`userguide/package_discovery`. + +Changes +^^^^^^^ +* #1806: Allowed recursive globs (`**`) in `package_data`. -- by :user:`nullableVoidPtr` +* #3206: Fixed behaviour when both ``install_requires`` (in ``setup.py``) and + ``dependencies`` (in ``pyproject.toml``) are specified. + The configuration in ``pyproject.toml`` will take precedence over ``setup.py`` + (in accordance with PEP 621). A warning was added to inform users. + +Documentation changes +^^^^^^^^^^^^^^^^^^^^^ +* #3307: Added introduction to references/keywords + Added deprecation tags to test kwargs + Moved userguide/keywords to deprecated section + Clarified in deprecated doc what keywords came from distutils and which were added or changed by setuptools + +Misc +^^^^ +* #3274: Updated version of vendored ``pyparsing`` to 3.0.8 to avoid problems with + upcoming deprecation in Python 3.11. +* #3292: Added warning about incompatibility with old versions of + ``importlib-metadata``. + + v62.2.0 ------- diff --git a/changelog.d/1806.change.rst b/changelog.d/1806.change.rst deleted file mode 100644 index 100b689967..0000000000 --- a/changelog.d/1806.change.rst +++ /dev/null @@ -1 +0,0 @@ -Allowed recursive globs (`**`) in `package_data`. -- by :user:`nullableVoidPtr` diff --git a/changelog.d/3206.change.rst b/changelog.d/3206.change.rst deleted file mode 100644 index f4d8683942..0000000000 --- a/changelog.d/3206.change.rst +++ /dev/null @@ -1,4 +0,0 @@ -Fixed behaviour when both ``install_requires`` (in ``setup.py``) and -``dependencies`` (in ``pyproject.toml``) are specified. -The configuration in ``pyproject.toml`` will take precedence over ``setup.py`` -(in accordance with PEP 621). A warning was added to inform users. diff --git a/changelog.d/3262.deprecation.rst b/changelog.d/3262.deprecation.rst deleted file mode 100644 index e668b226e6..0000000000 --- a/changelog.d/3262.deprecation.rst +++ /dev/null @@ -1,8 +0,0 @@ -Formally added deprecation messages for ``namespace_packages``. -The methodology that uses ``pkg_resources`` and ``namespace_packages`` for -creating namespaces was already discouraged by the :doc:`setuptools docs -` and the -:doc:`Python Packaging User Guide `, -therefore this change just make the deprecation more official. -Users can consider migrating to native/implicit namespaces (as introduced in -:pep:`420`). diff --git a/changelog.d/3274.misc.rst b/changelog.d/3274.misc.rst deleted file mode 100644 index 3d3722dc4c..0000000000 --- a/changelog.d/3274.misc.rst +++ /dev/null @@ -1,2 +0,0 @@ -Updated version of vendored ``pyparsing`` to 3.0.8 to avoid problems with -upcoming deprecation in Python 3.11. diff --git a/changelog.d/3292.misc.rst b/changelog.d/3292.misc.rst deleted file mode 100644 index 2070e679f6..0000000000 --- a/changelog.d/3292.misc.rst +++ /dev/null @@ -1,2 +0,0 @@ -Added warning about incompatibility with old versions of -``importlib-metadata``. diff --git a/changelog.d/3307.doc.rst b/changelog.d/3307.doc.rst deleted file mode 100644 index cdab873785..0000000000 --- a/changelog.d/3307.doc.rst +++ /dev/null @@ -1,4 +0,0 @@ -Added introduction to references/keywords -Added deprecation tags to test kwargs -Moved userguide/keywords to deprecated section -Clarified in deprecated doc what keywords came from distutils and which were added or changed by setuptools diff --git a/changelog.d/3308.deprecation.rst b/changelog.d/3308.deprecation.rst deleted file mode 100644 index 550da6b55f..0000000000 --- a/changelog.d/3308.deprecation.rst +++ /dev/null @@ -1,8 +0,0 @@ -Relying on ``include_package_data`` to ensure sub-packages are automatically -added to the build wheel distribution (as "data") is now considered a -deprecated practice. - -This behaviour was controversial and caused inconsistencies (#3260). - -Instead, projects are encouraged to properly configure ``packages`` or use -discovery tools. General information can be found in :doc:`userguide/package_discovery`. diff --git a/setup.cfg b/setup.cfg index 96d8010218..a4b0333d7e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = setuptools -version = 62.2.0 +version = 62.3.0 author = Python Packaging Authority author_email = distutils-sig@python.org description = Easily download, build, install, upgrade, and uninstall Python packages