From be88b0899bae8f7cae251ebb154c8045ad857b69 Mon Sep 17 00:00:00 2001 From: Brian Rutledge Date: Sat, 13 Mar 2021 11:32:23 -0500 Subject: [PATCH 1/2] Update changelog for 3.4.0 --- changelog/728.feature.rst | 1 - changelog/732.feature.rst | 1 - changelog/736.feature.rst | 1 - docs/changelog.rst | 11 +++++++++++ 4 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 changelog/728.feature.rst delete mode 100644 changelog/732.feature.rst delete mode 100644 changelog/736.feature.rst diff --git a/changelog/728.feature.rst b/changelog/728.feature.rst deleted file mode 100644 index cd6dfb0e..00000000 --- a/changelog/728.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Prefer importlib.metadata for entry point handling. diff --git a/changelog/732.feature.rst b/changelog/732.feature.rst deleted file mode 100644 index 57eefc48..00000000 --- a/changelog/732.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Rely on importlib_metadata 3.6 for nicer entry point processing. diff --git a/changelog/736.feature.rst b/changelog/736.feature.rst deleted file mode 100644 index e6ce4e10..00000000 --- a/changelog/736.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Eliminated dependency on Setuptools/pkg_resources and replaced with packaging and importlib_metadata. diff --git a/docs/changelog.rst b/docs/changelog.rst index 5c57e0b0..44ac9597 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -12,6 +12,17 @@ schemes recommended by the Python Packaging Authority. .. towncrier release notes start +3.4.0 (2021-03-13) +------------------ + +Features +^^^^^^^^ + +- Prefer importlib.metadata for entry point handling. (`#728 `_) +- Rely on importlib_metadata 3.6 for nicer entry point processing. (`#732 `_) +- Eliminated dependency on Setuptools/pkg_resources and replaced with packaging and importlib_metadata. (`#736 `_) + + 3.3.0 (2020-12-23) ------------------ From 935a48a4305d2bf563cc51cb568baf2f9ec9ec38 Mon Sep 17 00:00:00 2001 From: Brian Rutledge Date: Sat, 13 Mar 2021 11:32:36 -0500 Subject: [PATCH 2/2] Update releasing process --- docs/contributing.rst | 9 +++++---- tox.ini | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/contributing.rst b/docs/contributing.rst index a3e8e064..47d749b9 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -232,13 +232,14 @@ Making a new release A checklist for creating, testing, and distributing a new version. -#. Choose a version number, e.g. ``3.3.0``. -#. Run ``tox -e changelog -- --version {version}`` to build +#. Choose a version number, e.g. ``VERSION=3.3.0``. +#. Create a new branch, e.g. ``git switch -c release-$VERSION``. +#. Run ``tox -e changelog -- --version $VERSION`` to build :file:`docs/changelog.rst`. #. Commit and open a pull request for review. #. Merge the pull request, and ensure the `GitHub Actions`_ build passes. -#. Create a new git tag with ``git tag -m "Release v{version}" {version}``. -#. Push the new tag with ``git push upstream {version}``. +#. Create a new git tag with ``git tag -m "Release v$VERSION" $VERSION``. +#. Push the new tag with ``git push upstream $VERSION``. #. Watch the release in `GitHub Actions`_. #. Send announcement email to `distutils-sig mailing list`_ and celebrate. diff --git a/tox.ini b/tox.ini index 9ff11841..cb6141d2 100644 --- a/tox.ini +++ b/tox.ini @@ -39,7 +39,6 @@ commands = twine check dist/* [testenv:watch-docs] -skip_install = True deps = -rdocs/requirements.txt sphinx-autobuild @@ -80,7 +79,6 @@ commands = [testenv:changelog] basepython = python3 -skip_install = true deps = towncrier commands =