From 8afa76de0aeddd7d24ece4b091095bad9abd45cd Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 17:12:04 -0500 Subject: [PATCH 01/28] release fixes --- release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.py b/release.py index 958d876de..1244d434b 100644 --- a/release.py +++ b/release.py @@ -66,7 +66,7 @@ def fadeToBlack() -> None: """ Run black to reformat the source code. """ - spawn(["tox", "-e", "black-reformat"]) + spawn(["pre-commit", "run", "black"]) def incrementVersion(candidate: bool) -> None: From 737c32aaed217131d0773830c917e1269a297ebf Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 17:12:45 -0500 Subject: [PATCH 02/28] start 23.12 release --- src/klein/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/klein/_version.py b/src/klein/_version.py index ffaf0d69b..09bd59b50 100644 --- a/src/klein/_version.py +++ b/src/klein/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("klein", 23, 5, 0) +__version__ = Version("klein", 23, 12, 0, release_candidate=1) __all__ = ["__version__"] From bde4a649a2c78d3a2e03a623ccdd6e56cc441013 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 17:24:48 -0500 Subject: [PATCH 03/28] default to release candidate please --- docs/release.rst | 2 +- release.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/release.rst b/docs/release.rst index 2cc895f75..b4267465f 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -16,7 +16,7 @@ Releasing Klein #. Commit and push the branch #. Open a PR from the branch (follow the usual process for opening a PR). #. As appropriate, pull the latest code from :code:`trunk`: :code:`git checkout trunk && git pull --rebase` (or use the GitHub UI) -#. To publish a release candidate to PyPI: :code:`tox -e release -- publish` +#. To publish a release candidate to PyPI: :code:`tox -e release -- publish --candidate` #. Obtain an approving review for the PR using the usual process. #. To publish a production release: :code:`tox -e release -- publish --final` #. Merge the PR to the trunk branch. diff --git a/release.py b/release.py index 1244d434b..c4f065182 100644 --- a/release.py +++ b/release.py @@ -308,10 +308,14 @@ def bump() -> None: @main.command() @commandOption( - "--test/--production", help="Use test (or production) PyPI server" + "--test/--production", + help="Use test (or production) PyPI server", + default=False, ) @commandOption( - "--final/--candidate", help="Publish a final (or candidate) release" + "--final/--candidate", + help="Publish a final (or candidate) release", + default=False, ) def publish(final: bool, test: bool) -> None: publishRelease(final=final, test=test) From 0c36d9a3d0f8854fb18c3fac27b3b39a8e200038 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 17:27:01 -0500 Subject: [PATCH 04/28] have we _ever_ used this release process --- release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.py b/release.py index c4f065182..45530d5d8 100644 --- a/release.py +++ b/release.py @@ -263,7 +263,7 @@ def publishRelease(final: bool, test: bool = False) -> None: 1, ) - incrementVersion(candidate=False) + incrementVersion(candidate=not final) version = currentVersion() versonFile = Path(__file__).parent / "src" / "klein" / "_version.py" From d262289410bd992083c3bb8f17a8a5f09ef95958 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 17:27:27 -0500 Subject: [PATCH 05/28] Update version to [klein, version 23.12.0.rc2] --- src/klein/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/klein/_version.py b/src/klein/_version.py index 09bd59b50..de6d371a8 100644 --- a/src/klein/_version.py +++ b/src/klein/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("klein", 23, 12, 0, release_candidate=1) +__version__ = Version("klein", 23, 12, 0, release_candidate=2) __all__ = ["__version__"] From bc81cd6be13e95dd8d25b0e05a7dc7b7ec7e6357 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 17:30:28 -0500 Subject: [PATCH 06/28] update NEXT release --- NEWS.rst | 4 ++-- docs/release.rst | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index bf34a803d..6cda0456b 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -1,8 +1,8 @@ NEWS ==== -NEXT ----- +23.12.0 +------- * Fixed a compatibility issue with Werkzeug versions greater than 2.2. [`#575 `] * Added explicit support for Python 3.10 and 3.11, although in practice they did work previously in 21.8. [`#578 `] diff --git a/docs/release.rst b/docs/release.rst index b4267465f..a8741fc7f 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -13,9 +13,12 @@ Releasing Klein #. Start with a clean (no changes) source tree on the trunk branch. #. Create a new release candidate: :code:`tox -e release -- start` +#. manually update the ``NEXT`` placeholder at the top of NEWS.rst to reference + the new version #. Commit and push the branch #. Open a PR from the branch (follow the usual process for opening a PR). -#. As appropriate, pull the latest code from :code:`trunk`: :code:`git checkout trunk && git pull --rebase` (or use the GitHub UI) +#. As appropriate, pull the latest code from :code:`trunk`: :code:`git checkout + trunk && git pull --rebase` (or use the GitHub UI) #. To publish a release candidate to PyPI: :code:`tox -e release -- publish --candidate` #. Obtain an approving review for the PR using the usual process. #. To publish a production release: :code:`tox -e release -- publish --final` From 04cf05db64688302dee1ceead30e0fbf3538ad3d Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 17:43:08 -0500 Subject: [PATCH 07/28] case sensitivity? --- release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.py b/release.py index 45530d5d8..ff5db6f2b 100644 --- a/release.py +++ b/release.py @@ -77,7 +77,7 @@ def incrementVersion(candidate: bool) -> None: """ # Incremental doesn't have an API to do this, so we have to run a # subprocess. Boo. - args = ["python", "-m", "incremental.update", "klein"] + args = ["python", "-m", "incremental.update", "Klein"] if candidate: args.append("--rc") spawn(args) From 8abb69cbe119ca2a59989e9f8ee7b0df51ec6a3e Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 17:43:28 -0500 Subject: [PATCH 08/28] put it back --- NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index 6cda0456b..cc0134766 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -1,7 +1,7 @@ NEWS ==== -23.12.0 +NEXT ------- * Fixed a compatibility issue with Werkzeug versions greater than 2.2. [`#575 `] From 700b2c059ced4fd897020df52ca93b571b34094d Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 17:43:49 -0500 Subject: [PATCH 09/28] Update version to [Klein, version 23.12.0.rc3] --- src/klein/_version.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/klein/_version.py b/src/klein/_version.py index de6d371a8..7a80cf917 100644 --- a/src/klein/_version.py +++ b/src/klein/_version.py @@ -1,11 +1,11 @@ """ -Provides klein version information. +Provides Klein version information. """ # This file is auto-generated! Do not edit! -# Use `python -m incremental.update klein` to change this file. +# Use `python -m incremental.update Klein` to change this file. from incremental import Version -__version__ = Version("klein", 23, 12, 0, release_candidate=2) +__version__ = Version("Klein", 23, 12, 0, release_candidate=3) __all__ = ["__version__"] From 40e0089637026505cca2aefc32f9132db1c9f1e6 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 18:20:00 -0500 Subject: [PATCH 10/28] NEXT updates --- NEWS.rst | 4 ++-- src/klein/_dihttp.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index cc0134766..ae24c47d7 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -1,8 +1,8 @@ NEWS ==== -NEXT -------- +Klein NEXT +---------- * Fixed a compatibility issue with Werkzeug versions greater than 2.2. [`#575 `] * Added explicit support for Python 3.10 and 3.11, although in practice they did work previously in 21.8. [`#578 `] diff --git a/src/klein/_dihttp.py b/src/klein/_dihttp.py index 10008f43c..385fe6dce 100644 --- a/src/klein/_dihttp.py +++ b/src/klein/_dihttp.py @@ -47,7 +47,7 @@ class RequestURL: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein NEXT + @since: Klein 23.12.0.rc3 """ @classmethod @@ -80,7 +80,7 @@ class RequestComponent: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein NEXT + @since: Klein 23.12.0.rc3 """ interface: Type[Interface] @@ -120,7 +120,7 @@ class Response: - a body object, which can be anything else Klein understands; for example, an IResource, an IRenderable, str, bytes, etc. - @since: Klein NEXT + @since: Klein 23.12.0.rc3 """ code: int = 200 From e6e4c31cf789b71fc7086ee675e6da345cc9de02 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:20:11 -0500 Subject: [PATCH 11/28] explain structure of NEWS file --- docs/release.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/release.rst b/docs/release.rst index a8741fc7f..b016aed90 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -13,8 +13,6 @@ Releasing Klein #. Start with a clean (no changes) source tree on the trunk branch. #. Create a new release candidate: :code:`tox -e release -- start` -#. manually update the ``NEXT`` placeholder at the top of NEWS.rst to reference - the new version #. Commit and push the branch #. Open a PR from the branch (follow the usual process for opening a PR). #. As appropriate, pull the latest code from :code:`trunk`: :code:`git checkout @@ -22,4 +20,7 @@ Releasing Klein #. To publish a release candidate to PyPI: :code:`tox -e release -- publish --candidate` #. Obtain an approving review for the PR using the usual process. #. To publish a production release: :code:`tox -e release -- publish --final` +#. In ``NEWS.rst``, add a new "Klein NEXT" section at the top, which will be + updated by the next release. You do not need a separate review for this + addition; it should be done after the release, but before merging to trunk. #. Merge the PR to the trunk branch. From 38f04ec121d8668851d4030992162a240ebd43be Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:20:47 -0500 Subject: [PATCH 12/28] Update version to [Klein, version 23.12.0.rc4] --- src/klein/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/klein/_version.py b/src/klein/_version.py index 7a80cf917..8597293a1 100644 --- a/src/klein/_version.py +++ b/src/klein/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("Klein", 23, 12, 0, release_candidate=3) +__version__ = Version("Klein", 23, 12, 0, release_candidate=4) __all__ = ["__version__"] From 1ca5d3b3c1bfb8f74799ccd8d75f2ff1663274b1 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:27:51 -0500 Subject: [PATCH 13/28] roll everything back to re-test release script --- src/klein/_dihttp.py | 6 +++--- src/klein/_version.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/klein/_dihttp.py b/src/klein/_dihttp.py index 385fe6dce..10008f43c 100644 --- a/src/klein/_dihttp.py +++ b/src/klein/_dihttp.py @@ -47,7 +47,7 @@ class RequestURL: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc3 + @since: Klein NEXT """ @classmethod @@ -80,7 +80,7 @@ class RequestComponent: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc3 + @since: Klein NEXT """ interface: Type[Interface] @@ -120,7 +120,7 @@ class Response: - a body object, which can be anything else Klein understands; for example, an IResource, an IRenderable, str, bytes, etc. - @since: Klein 23.12.0.rc3 + @since: Klein NEXT """ code: int = 200 diff --git a/src/klein/_version.py b/src/klein/_version.py index 8597293a1..10e39748e 100644 --- a/src/klein/_version.py +++ b/src/klein/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("Klein", 23, 12, 0, release_candidate=4) +__version__ = Version("Klein", 23, 11, 0) __all__ = ["__version__"] From 782a1d7c7ef04b3c97cd5aeff6e7519205ddc8eb Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:40:19 -0500 Subject: [PATCH 14/28] do NEXT version updates again --- docs/release.rst | 9 ++++++--- src/klein/_dihttp.py | 6 +++--- src/klein/_version.py | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/release.rst b/docs/release.rst index b016aed90..cd266a7fb 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -13,6 +13,9 @@ Releasing Klein #. Start with a clean (no changes) source tree on the trunk branch. #. Create a new release candidate: :code:`tox -e release -- start` +#. Manually update the ``NEXT`` heading in ``NEWS.rst`` to reference the + version that was just updated, *without* the "rc" release-candidate tag; + i.e. write the ``NEWS.rst`` file as if it were for teh final release. #. Commit and push the branch #. Open a PR from the branch (follow the usual process for opening a PR). #. As appropriate, pull the latest code from :code:`trunk`: :code:`git checkout @@ -20,7 +23,7 @@ Releasing Klein #. To publish a release candidate to PyPI: :code:`tox -e release -- publish --candidate` #. Obtain an approving review for the PR using the usual process. #. To publish a production release: :code:`tox -e release -- publish --final` -#. In ``NEWS.rst``, add a new "Klein NEXT" section at the top, which will be - updated by the next release. You do not need a separate review for this - addition; it should be done after the release, but before merging to trunk. +#. In ``NEWS.rst``, add a new "NEXT" section at the top. You do not need a + separate review for this addition; it should be done after the release, but + before merging to trunk. #. Merge the PR to the trunk branch. diff --git a/src/klein/_dihttp.py b/src/klein/_dihttp.py index 10008f43c..385fe6dce 100644 --- a/src/klein/_dihttp.py +++ b/src/klein/_dihttp.py @@ -47,7 +47,7 @@ class RequestURL: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein NEXT + @since: Klein 23.12.0.rc3 """ @classmethod @@ -80,7 +80,7 @@ class RequestComponent: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein NEXT + @since: Klein 23.12.0.rc3 """ interface: Type[Interface] @@ -120,7 +120,7 @@ class Response: - a body object, which can be anything else Klein understands; for example, an IResource, an IRenderable, str, bytes, etc. - @since: Klein NEXT + @since: Klein 23.12.0.rc3 """ code: int = 200 diff --git a/src/klein/_version.py b/src/klein/_version.py index 10e39748e..7a80cf917 100644 --- a/src/klein/_version.py +++ b/src/klein/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("Klein", 23, 11, 0) +__version__ = Version("Klein", 23, 12, 0, release_candidate=3) __all__ = ["__version__"] From 35e9d906ac2d3891a414f967c5cfbb6ce8df2cd9 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:41:22 -0500 Subject: [PATCH 15/28] update NEWS per release --- NEWS.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index ae24c47d7..1949b9208 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -1,8 +1,8 @@ NEWS ==== -Klein NEXT ----------- +23.12.0 - 2023-12-21 +-------------------- * Fixed a compatibility issue with Werkzeug versions greater than 2.2. [`#575 `] * Added explicit support for Python 3.10 and 3.11, although in practice they did work previously in 21.8. [`#578 `] From 20c514891943c7e6e9d384114444d0a55915bc3a Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:46:11 -0500 Subject: [PATCH 16/28] get the dates right --- docs/release.rst | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/release.rst b/docs/release.rst index cd266a7fb..50db4648b 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -14,15 +14,20 @@ Releasing Klein #. Start with a clean (no changes) source tree on the trunk branch. #. Create a new release candidate: :code:`tox -e release -- start` #. Manually update the ``NEXT`` heading in ``NEWS.rst`` to reference the - version that was just updated, *without* the "rc" release-candidate tag; - i.e. write the ``NEWS.rst`` file as if it were for teh final release. + version that was just updated, *without* the "rc" release-candidate tag, and + the current RFC3339-formatted date; i.e. write the ``NEWS.rst`` file as if + it were for the final release. #. Commit and push the branch #. Open a PR from the branch (follow the usual process for opening a PR). #. As appropriate, pull the latest code from :code:`trunk`: :code:`git checkout trunk && git pull --rebase` (or use the GitHub UI) #. To publish a release candidate to PyPI: :code:`tox -e release -- publish --candidate` #. Obtain an approving review for the PR using the usual process. -#. To publish a production release: :code:`tox -e release -- publish --final` +#. If the date has changed since the release candidate, update the RFC3339 date + in the ``NEWS.rst`` header for the release to the current date; commit and + push this change to the branch. +#. Publish a production release with the command: :code:`tox -e release -- + publish --final` #. In ``NEWS.rst``, add a new "NEXT" section at the top. You do not need a separate review for this addition; it should be done after the release, but before merging to trunk. From 1bdb80d2f2e460590ae6d95395a81fb8c6e64a40 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:46:39 -0500 Subject: [PATCH 17/28] Update version to [Klein, version 23.12.0.rc4] --- src/klein/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/klein/_version.py b/src/klein/_version.py index 7a80cf917..8597293a1 100644 --- a/src/klein/_version.py +++ b/src/klein/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("Klein", 23, 12, 0, release_candidate=3) +__version__ = Version("Klein", 23, 12, 0, release_candidate=4) __all__ = ["__version__"] From 7459003159eb056f3fa2322b9325914b2daa3a11 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:46:59 -0500 Subject: [PATCH 18/28] bump to sync back up with PyPI --- src/klein/_dihttp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/klein/_dihttp.py b/src/klein/_dihttp.py index 385fe6dce..6dafd7c15 100644 --- a/src/klein/_dihttp.py +++ b/src/klein/_dihttp.py @@ -47,7 +47,7 @@ class RequestURL: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc3 + @since: Klein 23.12.0.rc4 """ @classmethod @@ -80,7 +80,7 @@ class RequestComponent: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc3 + @since: Klein 23.12.0.rc4 """ interface: Type[Interface] @@ -120,7 +120,7 @@ class Response: - a body object, which can be anything else Klein understands; for example, an IResource, an IRenderable, str, bytes, etc. - @since: Klein 23.12.0.rc3 + @since: Klein 23.12.0.rc4 """ code: int = 200 From d2570a2e762b930536392b6a16dba212a3a25b19 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:47:21 -0500 Subject: [PATCH 19/28] Update version to [Klein, version 23.12.0.rc5] --- src/klein/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/klein/_version.py b/src/klein/_version.py index 8597293a1..5ce959fb5 100644 --- a/src/klein/_version.py +++ b/src/klein/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("Klein", 23, 12, 0, release_candidate=4) +__version__ = Version("Klein", 23, 12, 0, release_candidate=5) __all__ = ["__version__"] From 962f56dedc9785c7a7148ec0532ce1e21888eab8 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:48:08 -0500 Subject: [PATCH 20/28] rc5 --- src/klein/_dihttp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/klein/_dihttp.py b/src/klein/_dihttp.py index 6dafd7c15..ed6e266b9 100644 --- a/src/klein/_dihttp.py +++ b/src/klein/_dihttp.py @@ -47,7 +47,7 @@ class RequestURL: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc4 + @since: Klein 23.12.0.rc5 """ @classmethod @@ -80,7 +80,7 @@ class RequestComponent: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc4 + @since: Klein 23.12.0.rc5 """ interface: Type[Interface] @@ -120,7 +120,7 @@ class Response: - a body object, which can be anything else Klein understands; for example, an IResource, an IRenderable, str, bytes, etc. - @since: Klein 23.12.0.rc4 + @since: Klein 23.12.0.rc5 """ code: int = 200 From c7e59a828a8d2b507f76a0b5d47b32fdde872de3 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:52:54 -0500 Subject: [PATCH 21/28] Update version to [Klein, version 23.12.0.rc6] --- src/klein/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/klein/_version.py b/src/klein/_version.py index 5ce959fb5..c0dee4cc5 100644 --- a/src/klein/_version.py +++ b/src/klein/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("Klein", 23, 12, 0, release_candidate=5) +__version__ = Version("Klein", 23, 12, 0, release_candidate=6) __all__ = ["__version__"] From f8a8315763857f51d95415586036e647b9f29521 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:53:25 -0500 Subject: [PATCH 22/28] why do these files keep getting lost --- src/klein/_dihttp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/klein/_dihttp.py b/src/klein/_dihttp.py index ed6e266b9..2164dbd39 100644 --- a/src/klein/_dihttp.py +++ b/src/klein/_dihttp.py @@ -47,7 +47,7 @@ class RequestURL: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc5 + @since: Klein 23.12.0.rc6 """ @classmethod @@ -80,7 +80,7 @@ class RequestComponent: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc5 + @since: Klein 23.12.0.rc6 """ interface: Type[Interface] @@ -120,7 +120,7 @@ class Response: - a body object, which can be anything else Klein understands; for example, an IResource, an IRenderable, str, bytes, etc. - @since: Klein 23.12.0.rc5 + @since: Klein 23.12.0.rc6 """ code: int = 200 From 95dccdcc197a5579465242600552567802fa0d77 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:56:47 -0500 Subject: [PATCH 23/28] so many release candidates --- release.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.py b/release.py index ff5db6f2b..6e91507cd 100644 --- a/release.py +++ b/release.py @@ -266,8 +266,8 @@ def publishRelease(final: bool, test: bool = False) -> None: incrementVersion(candidate=not final) version = currentVersion() - versonFile = Path(__file__).parent / "src" / "klein" / "_version.py" - repository.index.add(str(versonFile)) + # versonFile = Path(__file__).parent / "src" / "klein" / "_version.py" + repository.index.add("*") repository.index.commit(f"Update version to {version}") tagName = releaseTagName(version) From c2d5ca46901e83084fe023121018c3a4c6005fe8 Mon Sep 17 00:00:00 2001 From: Glyph Date: Thu, 21 Dec 2023 23:59:59 -0500 Subject: [PATCH 24/28] all source files --- release.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/release.py b/release.py index 6e91507cd..9b5012df8 100644 --- a/release.py +++ b/release.py @@ -266,8 +266,7 @@ def publishRelease(final: bool, test: bool = False) -> None: incrementVersion(candidate=not final) version = currentVersion() - # versonFile = Path(__file__).parent / "src" / "klein" / "_version.py" - repository.index.add("*") + repository.index.add("src") repository.index.commit(f"Update version to {version}") tagName = releaseTagName(version) From 432246a410652ed3e8094946b0e5340ee66b1020 Mon Sep 17 00:00:00 2001 From: Glyph Date: Fri, 22 Dec 2023 00:00:44 -0500 Subject: [PATCH 25/28] Update version to [Klein, version 23.12.0.rc7] --- src/klein/_dihttp.py | 6 +++--- src/klein/_version.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/klein/_dihttp.py b/src/klein/_dihttp.py index 2164dbd39..b24d66bbf 100644 --- a/src/klein/_dihttp.py +++ b/src/klein/_dihttp.py @@ -47,7 +47,7 @@ class RequestURL: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc6 + @since: Klein 23.12.0.rc7 """ @classmethod @@ -80,7 +80,7 @@ class RequestComponent: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc6 + @since: Klein 23.12.0.rc7 """ interface: Type[Interface] @@ -120,7 +120,7 @@ class Response: - a body object, which can be anything else Klein understands; for example, an IResource, an IRenderable, str, bytes, etc. - @since: Klein 23.12.0.rc6 + @since: Klein 23.12.0.rc7 """ code: int = 200 diff --git a/src/klein/_version.py b/src/klein/_version.py index c0dee4cc5..734ad1d8f 100644 --- a/src/klein/_version.py +++ b/src/klein/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("Klein", 23, 12, 0, release_candidate=6) +__version__ = Version("Klein", 23, 12, 0, release_candidate=7) __all__ = ["__version__"] From 49b1873064991a35d9655dafdfcd4074d3cb725f Mon Sep 17 00:00:00 2001 From: Glyph Date: Fri, 22 Dec 2023 11:26:17 -0500 Subject: [PATCH 26/28] update date --- NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index 1949b9208..1fe5165f0 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -1,7 +1,7 @@ NEWS ==== -23.12.0 - 2023-12-21 +23.12.0 - 2023-12-22 -------------------- * Fixed a compatibility issue with Werkzeug versions greater than 2.2. [`#575 `] From cb3dea2d78cccbd3d2143a769434dd100d39b743 Mon Sep 17 00:00:00 2001 From: Glyph Date: Fri, 22 Dec 2023 11:28:39 -0500 Subject: [PATCH 27/28] cheating juuust a little bit on the review due to a release failure --- release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.py b/release.py index 9b5012df8..0116c3882 100644 --- a/release.py +++ b/release.py @@ -266,7 +266,7 @@ def publishRelease(final: bool, test: bool = False) -> None: incrementVersion(candidate=not final) version = currentVersion() - repository.index.add("src") + repository.index.add("src/klein") repository.index.commit(f"Update version to {version}") tagName = releaseTagName(version) From d15661561a86124c9251cc8b58f48662d465b83f Mon Sep 17 00:00:00 2001 From: Glyph Date: Fri, 22 Dec 2023 11:29:19 -0500 Subject: [PATCH 28/28] Update version to [Klein, version 23.12.0] --- src/klein/_dihttp.py | 6 +++--- src/klein/_version.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/klein/_dihttp.py b/src/klein/_dihttp.py index b24d66bbf..0e7a78071 100644 --- a/src/klein/_dihttp.py +++ b/src/klein/_dihttp.py @@ -47,7 +47,7 @@ class RequestURL: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc7 + @since: Klein 23.12.0 """ @classmethod @@ -80,7 +80,7 @@ class RequestComponent: """ Require a hyperlink L{DecodedURL} object from a L{Requirer}. - @since: Klein 23.12.0.rc7 + @since: Klein 23.12.0 """ interface: Type[Interface] @@ -120,7 +120,7 @@ class Response: - a body object, which can be anything else Klein understands; for example, an IResource, an IRenderable, str, bytes, etc. - @since: Klein 23.12.0.rc7 + @since: Klein 23.12.0 """ code: int = 200 diff --git a/src/klein/_version.py b/src/klein/_version.py index 734ad1d8f..0cf808cff 100644 --- a/src/klein/_version.py +++ b/src/klein/_version.py @@ -7,5 +7,5 @@ from incremental import Version -__version__ = Version("Klein", 23, 12, 0, release_candidate=7) +__version__ = Version("Klein", 23, 12, 0) __all__ = ["__version__"]