diff options
| -rw-r--r-- | .bumpversion.cfg | 2 | ||||
| -rw-r--r-- | CHANGES.rst | 34 | ||||
| -rw-r--r-- | changelog.d/3215.change.1.rst | 7 | ||||
| -rw-r--r-- | changelog.d/3215.change.2.rst | 1 | ||||
| -rw-r--r-- | changelog.d/3217.doc.rst | 1 | ||||
| -rw-r--r-- | changelog.d/3218.change.rst | 8 | ||||
| -rw-r--r-- | changelog.d/3223.misc.rst | 2 | ||||
| -rw-r--r-- | changelog.d/3224.change.rst | 1 | ||||
| -rw-r--r-- | setup.cfg | 2 |
9 files changed, 36 insertions, 22 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 70ba4d79..e8b7372c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 61.1.1 +current_version = 61.2.0 commit = True tag = True diff --git a/CHANGES.rst b/CHANGES.rst index 07a359d9..b4134436 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,37 @@ +v61.2.0 +------- + + +Changes +^^^^^^^ +* #3215: Ignored a subgroup of invalid ``pyproject.toml`` files that use the ``[project]`` + table to specify only ``requires-python`` (**transitional**). + + .. warning:: + Please note that future releases of setuptools will halt the build process + if a ``pyproject.toml`` file that does not match doc:`the PyPA Specification + <PyPUG:specifications/declaring-project-metadata>` is given. +* #3215: Updated ``pyproject.toml`` validation, as generated by ``validate-pyproject==0.6.1``. +* #3218: Prevented builds from erroring if the project specifies metadata via + ``pyproject.toml``, but uses other files (e.g. ``setup.py``) to complement it, + without setting ``dynamic`` properly. + + .. important:: + This is a **transitional** behaviour. + Future releases of ``setuptools`` may simply ignore externally set metadata + not backed by ``dynamic`` or even halt the build with an error. +* #3224: Merge changes from pypa/distutils@e1d5c9b1f6 + +Documentation changes +^^^^^^^^^^^^^^^^^^^^^ +* #3217: Fixed typo in ``pyproject.toml`` example in Quickstart -- by :user:`pablo-cardenas`. + +Misc +^^^^ +* #3223: Fixed missing requirements with environment markers when + ``optional-dependencies`` is set in ``pyproject.toml``. + + v61.1.1 ------- diff --git a/changelog.d/3215.change.1.rst b/changelog.d/3215.change.1.rst deleted file mode 100644 index a086799e..00000000 --- a/changelog.d/3215.change.1.rst +++ /dev/null @@ -1,7 +0,0 @@ -Ignored a subgroup of invalid ``pyproject.toml`` files that use the ``[project]`` -table to specify only ``requires-python`` (**transitional**). - -.. warning:: - Please note that future releases of setuptools will halt the build process - if a ``pyproject.toml`` file that does not match doc:`the PyPA Specification - <PyPUG:specifications/declaring-project-metadata>` is given. diff --git a/changelog.d/3215.change.2.rst b/changelog.d/3215.change.2.rst deleted file mode 100644 index b3a67f53..00000000 --- a/changelog.d/3215.change.2.rst +++ /dev/null @@ -1 +0,0 @@ -Updated ``pyproject.toml`` validation, as generated by ``validate-pyproject==0.6.1``. diff --git a/changelog.d/3217.doc.rst b/changelog.d/3217.doc.rst deleted file mode 100644 index 6cc3c969..00000000 --- a/changelog.d/3217.doc.rst +++ /dev/null @@ -1 +0,0 @@ -Fixed typo in ``pyproject.toml`` example in Quickstart -- by :user:`pablo-cardenas`.
\ No newline at end of file diff --git a/changelog.d/3218.change.rst b/changelog.d/3218.change.rst deleted file mode 100644 index c02893e9..00000000 --- a/changelog.d/3218.change.rst +++ /dev/null @@ -1,8 +0,0 @@ -Prevented builds from erroring if the project specifies metadata via -``pyproject.toml``, but uses other files (e.g. ``setup.py``) to complement it, -without setting ``dynamic`` properly. - -.. important:: - This is a **transitional** behaviour. - Future releases of ``setuptools`` may simply ignore externally set metadata - not backed by ``dynamic`` or even halt the build with an error. diff --git a/changelog.d/3223.misc.rst b/changelog.d/3223.misc.rst deleted file mode 100644 index 66f1489e..00000000 --- a/changelog.d/3223.misc.rst +++ /dev/null @@ -1,2 +0,0 @@ -Fixed missing requirements with environment markers when -``optional-dependencies`` is set in ``pyproject.toml``. diff --git a/changelog.d/3224.change.rst b/changelog.d/3224.change.rst deleted file mode 100644 index 5b0b1724..00000000 --- a/changelog.d/3224.change.rst +++ /dev/null @@ -1 +0,0 @@ -Merge changes from pypa/distutils@e1d5c9b1f6 @@ -1,6 +1,6 @@ [metadata] name = setuptools -version = 61.1.1 +version = 61.2.0 author = Python Packaging Authority author_email = distutils-sig@python.org description = Easily download, build, install, upgrade, and uninstall Python packages |