Skip to content

Commit c99c7bf

Browse files
authored
Merge pull request #3129 from HypothesisWorks/create-pull-request/patch
2 parents 4d7aa82 + 04a4fd1 commit c99c7bf

6 files changed

Lines changed: 36 additions & 23 deletions

File tree

‎hypothesis-python/RELEASE.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
RELEASE_TYPE: patch
2+
3+
This patch updates our vendored `list of top-level domains <https://www.iana.org/domains/root/db>`__,
4+
which is used by the provisional :func:`~hypothesis.provisional.domains` strategy.

‎hypothesis-python/src/hypothesis/vendor/tlds-alpha-by-domain.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version 2021102200, Last Updated Fri Oct 22 07:07:01 2021 UTC
1+
# Version 2021103100, Last Updated Sun Oct 31 07:07:01 2021 UTC
22
AAA
33
AARP
44
ABARTH
@@ -821,6 +821,7 @@ MTN
821821
MTR
822822
MU
823823
MUSEUM
824+
MUSIC
824825
MUTUAL
825826
MV
826827
MW
@@ -1326,7 +1327,6 @@ XN--3BST00M
13261327
XN--3DS443G
13271328
XN--3E0B707E
13281329
XN--3HCRJ9C
1329-
XN--3OQ18VL8PN36A
13301330
XN--3PXU8K
13311331
XN--42C2D9A
13321332
XN--45BR5CYL

‎requirements/coverage.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ attrs==21.2.0
88
# via hypothesis (hypothesis-python/setup.py)
99
backports.zoneinfo==0.2.1
1010
# via -r requirements/coverage.in
11-
black==21.9b0
11+
black==21.10b0
1212
# via -r requirements/coverage.in
1313
click==8.0.3
1414
# via
1515
# -r requirements/coverage.in
1616
# black
17-
coverage==6.0.2
17+
coverage==6.1.1
1818
# via -r requirements/coverage.in
1919
dpcontracts==0.6.0
2020
# via -r requirements/coverage.in
@@ -32,15 +32,15 @@ numpy==1.21.3
3232
# via
3333
# -r requirements/coverage.in
3434
# pandas
35-
packaging==21.0
35+
packaging==21.2
3636
# via fakeredis
3737
pandas==1.3.4
3838
# via -r requirements/coverage.in
3939
pathspec==0.9.0
4040
# via black
4141
platformdirs==2.4.0
4242
# via black
43-
pyparsing==3.0.1
43+
pyparsing==2.4.7
4444
# via packaging
4545
python-dateutil==2.8.2
4646
# via
@@ -64,7 +64,7 @@ sortedcontainers==2.4.0
6464
# via
6565
# fakeredis
6666
# hypothesis (hypothesis-python/setup.py)
67-
tomli==1.2.1
67+
tomli==1.2.2
6868
# via black
6969
typing-extensions==3.10.0.2
7070
# via

‎requirements/test.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ execnet==1.9.0
1212
# via pytest-xdist
1313
iniconfig==1.1.1
1414
# via pytest
15-
packaging==21.0
15+
packaging==21.2
1616
# via pytest
1717
pexpect==4.8.0
1818
# via -r requirements/test.in
@@ -24,7 +24,7 @@ py==1.10.0
2424
# via
2525
# pytest
2626
# pytest-forked
27-
pyparsing==3.0.1
27+
pyparsing==2.4.7
2828
# via packaging
2929
pytest==6.2.5
3030
# via

‎requirements/tools.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bandit==1.7.0
2727
# via flake8-bandit
2828
beautifulsoup4==4.10.0
2929
# via sphinx-codeautolink
30-
black==21.9b0
30+
black==21.10b0
3131
# via
3232
# blacken-docs
3333
# shed
@@ -51,7 +51,7 @@ colorama==0.4.4
5151
# via twine
5252
com2ann==0.3.0
5353
# via shed
54-
coverage==6.0.2
54+
coverage==6.1.1
5555
# via -r requirements/tools.in
5656
cryptography==35.0.0
5757
# via secretstorage
@@ -69,7 +69,7 @@ docutils==0.17.1
6969
# sphinx-rtd-theme
7070
dpcontracts==0.6.0
7171
# via -r requirements/tools.in
72-
filelock==3.3.1
72+
filelock==3.3.2
7373
# via
7474
# tox
7575
# virtualenv
@@ -126,7 +126,7 @@ importlib-metadata==4.8.1
126126
# twine
127127
iniconfig==1.1.1
128128
# via pytest
129-
ipython==7.28.0
129+
ipython==7.29.0
130130
# via -r requirements/tools.in
131131
isort==5.9.3
132132
# via shed
@@ -159,7 +159,7 @@ mypy-extensions==0.4.3
159159
# black
160160
# mypy
161161
# typing-inspect
162-
packaging==21.0
162+
packaging==21.2
163163
# via
164164
# bleach
165165
# pytest
@@ -214,7 +214,7 @@ pygments==2.10.0
214214
# ipython
215215
# readme-renderer
216216
# sphinx
217-
pyparsing==3.0.1
217+
pyparsing==2.4.7
218218
# via packaging
219219
pytest==6.2.5
220220
# via -r requirements/tools.in
@@ -304,15 +304,15 @@ toml==0.10.2
304304
# mypy
305305
# pytest
306306
# tox
307-
tomli==1.2.1
307+
tomli==1.2.2
308308
# via
309309
# black
310310
# pep517
311311
tox==3.24.4
312312
# via -r requirements/tools.in
313313
tqdm==4.62.3
314314
# via twine
315-
traitlets==5.1.0
315+
traitlets==5.1.1
316316
# via
317317
# ipython
318318
# matplotlib-inline

‎tooling/src/hypothesistooling/__main__.py‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,18 +319,27 @@ def update_vendored_files():
319319
fname.write_bytes(new)
320320

321321

322+
def has_diff(file_or_directory):
323+
diff = ["git", "diff", "--no-patch", "--exit-code", "--", file_or_directory]
324+
return subprocess.call(diff) != 0
325+
326+
322327
@task()
323328
def upgrade_requirements():
324329
update_vendored_files()
325330
compile_requirements(upgrade=True)
326331
subprocess.call(["./build.sh", "format"], cwd=tools.ROOT) # exits 1 if changed
327-
diff = ["git", "diff", "--no-patch", "--exit-code", "--", hp.PYTHON_SRC]
328-
if subprocess.call(diff) != 0 and not os.path.isfile(hp.RELEASE_FILE):
329-
with open(hp.RELEASE_FILE, mode="w") as f:
330-
f.write(
331-
"RELEASE_TYPE: patch\n\nThis patch updates our autoformatting "
332-
"tools, improving our code style without any API changes.\n"
332+
if has_diff(hp.PYTHON_SRC) and not os.path.isfile(hp.RELEASE_FILE):
333+
if has_diff(f"{hp.PYTHON_SRC}/hypothesis/vendor/tlds-alpha-by-domain.txt"):
334+
msg = (
335+
"our vendored `list of top-level domains "
336+
"<https://www.iana.org/domains/root/db>`__,\nwhich is used by the "
337+
"provisional :func:`~hypothesis.provisional.domains` strategy."
333338
)
339+
else:
340+
msg = "our autoformatting tools, improving our code style without any API changes."
341+
with open(hp.RELEASE_FILE, mode="w") as f:
342+
f.write(f"RELEASE_TYPE: patch\n\nThis patch updates {msg}\n")
334343
update_python_versions()
335344
subprocess.call(["git", "add", "."], cwd=tools.ROOT)
336345

0 commit comments

Comments
 (0)