From 3d50f66b4c4aa035dbcca25b4a5f8ee1993db0d0 Mon Sep 17 00:00:00 2001
From: Brian Rutledge <brian@bhrutledge.com>
Date: Wed, 1 Jun 2022 06:49:13 -0400
Subject: [PATCH] Update changelog for 4.0.1 (#904)

* Fix twine import error from towncrier

* Update changelog for 4.0.1
---
 changelog/890.bugfix.rst |  1 -
 changelog/896.bugfix.rst |  1 -
 docs/changelog.rst       | 10 ++++++++++
 tox.ini                  |  1 -
 twine/auth.py            |  4 ++--
 5 files changed, 12 insertions(+), 5 deletions(-)
 delete mode 100644 changelog/890.bugfix.rst
 delete mode 100644 changelog/896.bugfix.rst

diff --git a/changelog/890.bugfix.rst b/changelog/890.bugfix.rst
deleted file mode 100644
index d4dfd1bf..00000000
--- a/changelog/890.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improve logging when keyring fails.
diff --git a/changelog/896.bugfix.rst b/changelog/896.bugfix.rst
deleted file mode 100644
index b03071dc..00000000
--- a/changelog/896.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Reconfgure root logger to show all log messages.
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9db8f7aa..8592d831 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,16 @@ schemes recommended by the Python Packaging Authority.
 
 .. towncrier release notes start
 
+Twine 4.0.1 (2022-06-01)
+------------------------
+
+Bugfixes
+^^^^^^^^
+
+- Improve logging when keyring fails. (`#890 <https://github.com/pypa/twine/issues/890>`_)
+- Reconfgure root logger to show all log messages. (`#896 <https://github.com/pypa/twine/issues/896>`_)
+
+
 Twine 4.0.0 (2022-03-31)
 ------------------------
 
diff --git a/tox.ini b/tox.ini
index cabad41a..406d68d4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -83,7 +83,6 @@ commands =
     python -c 'with open("mypy/index.txt") as f: print(f.read())'
 
 [testenv:changelog]
-skip_install = True
 basepython = python3
 deps =
     towncrier
diff --git a/twine/auth.py b/twine/auth.py
index 83fa6181..7273c554 100644
--- a/twine/auth.py
+++ b/twine/auth.py
@@ -28,7 +28,7 @@ def __init__(self, config: utils.RepositoryConfig, input: CredentialInput) -> No
     def choose(cls, interactive: bool) -> Type["Resolver"]:
         return cls if interactive else Private
 
-    @property  # type: ignore  # https://github.com/python/mypy/issues/1362
+    @property
     @functools.lru_cache()
     def username(self) -> Optional[str]:
         return utils.get_userpass_value(
@@ -38,7 +38,7 @@ def username(self) -> Optional[str]:
             prompt_strategy=self.username_from_keyring_or_prompt,
         )
 
-    @property  # type: ignore  # https://github.com/python/mypy/issues/1362
+    @property
     @functools.lru_cache()
     def password(self) -> Optional[str]:
         return utils.get_userpass_value(