Skip to content

Commit 771d60f

Browse files
authored
Eliminate future tense in the password nudge in twine-upload
Additionally, this turns the corresponding code branch into a hard error in case of the regular PyPI. Signed-off-by: William Woodruff <[email protected]> PR #234 Fixes #233
1 parent 04f4e64 commit 771d60f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

twine-upload.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ INPUT_VERIFY_METADATA="$(get-normalized-input 'verify-metadata')"
4040
INPUT_SKIP_EXISTING="$(get-normalized-input 'skip-existing')"
4141
INPUT_PRINT_HASH="$(get-normalized-input 'print-hash')"
4242

43-
PASSWORD_DEPRECATION_NUDGE="::error title=Password-based uploads deprecated::\
44-
Starting in 2024, PyPI will require all users to enable Two-Factor \
45-
Authentication. This will consequently require all users to switch \
43+
PASSWORD_DEPRECATION_NUDGE="::error title=Password-based uploads disabled::\
44+
As of 2024, PyPI requires all users to enable Two-Factor \
45+
Authentication. This consequently requires all users to switch \
4646
to either Trusted Publishers (preferred) or API tokens for package \
4747
uploads. Read more: \
4848
https://blog.pypi.org/posts/2023-05-25-securing-pypi-with-2fa/"
@@ -74,6 +74,7 @@ else
7474
if [[ "${INPUT_REPOSITORY_URL}" =~ pypi\.org ]]; then
7575
echo "${PASSWORD_DEPRECATION_NUDGE}"
7676
echo "${TRUSTED_PUBLISHING_NUDGE}"
77+
exit 1
7778
fi
7879
fi
7980

0 commit comments

Comments
 (0)