Skip to content

Commit 2fa448a

Browse files
committed
Merge PRs #190, #184, #185, #189 and #194 into unstable/v1
6 parents 79739dc + 2319287 + 9a3f9ad + 102f507 + 70a33ca + 41f3f53 commit 2fa448a

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

.pre-commit-config.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ci:
55

66
repos:
77
- repo: https://github.com/asottile/add-trailing-comma.git
8-
rev: v3.0.0
8+
rev: v3.1.0
99
hooks:
1010
- id: add-trailing-comma
1111

@@ -17,12 +17,12 @@ repos:
1717
- --honor-noqa
1818

1919
- repo: https://github.com/Lucas-C/pre-commit-hooks.git
20-
rev: v1.5.1
20+
rev: v1.5.4
2121
hooks:
2222
- id: remove-tabs
2323

2424
- repo: https://github.com/python-jsonschema/check-jsonschema.git
25-
rev: 0.23.2
25+
rev: 0.27.0
2626
hooks:
2727
- id: check-github-actions
2828
- id: check-github-workflows
@@ -62,7 +62,7 @@ repos:
6262
language_version: python3
6363

6464
- repo: https://github.com/codespell-project/codespell
65-
rev: v2.2.5
65+
rev: v2.2.6
6666
hooks:
6767
- id: codespell
6868

@@ -78,7 +78,7 @@ repos:
7878
- --strict
7979

8080
- repo: https://github.com/PyCQA/flake8.git
81-
rev: 6.0.0
81+
rev: 6.1.0
8282
hooks:
8383
- id: flake8
8484
alias: flake8-no-wps
@@ -98,7 +98,7 @@ repos:
9898

9999
- repo: https://github.com/PyCQA/flake8.git
100100
# NOTE: This is kept at v4 for until WPS starts supporting flake v5.
101-
rev: 4.0.1 # enforce-version: 4.0.1
101+
rev: 6.1.0 # enforce-version: 4.0.1
102102
hooks:
103103
- id: flake8
104104
alias: flake8-only-wps
@@ -130,7 +130,7 @@ repos:
130130
- wemake-python-styleguide ~= 0.17.0
131131

132132
- repo: https://github.com/PyCQA/pylint.git
133-
rev: v3.0.0a6
133+
rev: v3.0.0
134134
hooks:
135135
- id: pylint
136136
args:

requirements/runtime-prerequisites.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# pip-compile --allow-unsafe --output-file=requirements/runtime-prerequisites.txt --resolver=backtracking --strip-extras requirements/runtime-prerequisites.in
66
#
77
pip-with-requires-python==1.0.1
8-
# via -r requirements/runtime-prerequisites.in
8+
# via -r runtime-prerequisites.in
99

1010
# The following packages are considered to be unsafe in a requirements file:
11-
pip==22.3.1
11+
pip==23.3
1212
# via pip-with-requires-python

requirements/runtime.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cffi==1.15.1
1414
# via cryptography
1515
charset-normalizer==3.2.0
1616
# via requests
17-
cryptography==41.0.3
17+
cryptography==41.0.6
1818
# via secretstorage
1919
docutils==0.20.1
2020
# via readme-renderer
@@ -76,7 +76,7 @@ typing-extensions==4.7.1
7676
# via
7777
# pydantic
7878
# pydantic-core
79-
urllib3==2.0.6
79+
urllib3==2.0.7
8080
# via
8181
# requests
8282
# twine

twine-upload.sh

+8
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ 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 \
46+
to either Trusted Publishers (preferred) or API tokens for package \
47+
uploads. Read more: \
48+
https://blog.pypi.org/posts/2023-05-25-securing-pypi-with-2fa/"
49+
4350
TRUSTED_PUBLISHING_NUDGE="::warning title=Upgrade to Trusted Publishing::\
4451
Trusted Publishers allows publishing packages to PyPI from automated \
4552
environments like GitHub Actions without needing to use username/password \
@@ -69,6 +76,7 @@ else
6976
"against ${INPUT_REPOSITORY_URL}"
7077

7178
if [[ "${INPUT_REPOSITORY_URL}" =~ pypi\.org ]]; then
79+
echo "${PASSWORD_DEPRECATION_NUDGE}"
7280
echo "${TRUSTED_PUBLISHING_NUDGE}"
7381
fi
7482
fi

0 commit comments

Comments
 (0)