Skip to content

Commit

Permalink
Merge pull request #79 from octodns/black-update
Browse files Browse the repository at this point in the history
Update black to 24.x series
  • Loading branch information
ross committed Mar 20, 2024
2 parents 696c462 + 8b5653b commit 1603de0
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 41 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
98ce05a9ebb46033cbbc993ad6b2134c9d9e476f
# Commit that added in isort formatting support
79494e75dc20226d130e27d638108f8d96fd7873
# black 24.x
4d97a421903aca95ba5b6d3791071b4ba5625f64
19 changes: 8 additions & 11 deletions octodns_ns1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -868,14 +868,9 @@ def _data_for_MX(self, _type, record):
def _data_for_NAPTR(self, _type, record):
values = []
for answer in record['short_answers']:
(
order,
preference,
flags,
service,
regexp,
replacement,
) = answer.split(' ', 5)
(order, preference, flags, service, regexp, replacement) = (
answer.split(' ', 5)
)
values.append(
{
'flags': flags,
Expand Down Expand Up @@ -1444,9 +1439,11 @@ def _generate_regions(self, record):
if n == 8:
# US state, e.g. NA-US-KY
# CA province, e.g. NA-CA-NL
us_state.add(
geo[-2:]
) if "NA-US" in geo else ca_province.add(geo[-2:])
(
us_state.add(geo[-2:])
if "NA-US" in geo
else ca_province.add(geo[-2:])
)
# For filtering. State filtering is done by the country
# filter
has_country = True
Expand Down
44 changes: 22 additions & 22 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
# DO NOT EDIT THIS FILE DIRECTLY - use ./script/update-requirements to update
Pygments==2.17.2
black==23.11.0
build==1.0.3
black==24.3.0
build==1.1.1
cffi==1.16.0
click==8.1.7
cmarkgfm==2022.10.27
coverage==7.3.2
cmarkgfm==2024.1.14
coverage==7.4.4
docutils==0.20.1
exceptiongroup==1.2.0
importlib-metadata==6.8.0
importlib_metadata==7.1.0
iniconfig==2.0.0
isort==5.12.0
jaraco.classes==3.3.0
keyring==24.3.0
isort==5.13.2
jaraco.classes==3.3.1
keyring==24.3.1
markdown-it-py==3.0.0
mdurl==0.1.2
more-itertools==10.1.0
more-itertools==10.2.0
mypy-extensions==1.0.0
nh3==0.2.14
packaging==23.2
pathspec==0.11.2
pkginfo==1.9.6
platformdirs==4.0.0
pluggy==1.3.0
nh3==0.2.15
packaging==24.0
pathspec==0.12.1
pkginfo==1.10.0
platformdirs==4.2.0
pluggy==1.4.0
pycparser==2.21
pyflakes==3.1.0
pyflakes==3.2.0
pyproject_hooks==1.0.0
pytest-cov==4.1.0
pytest-network==0.0.1
pytest==7.4.3
readme-renderer==42.0
pytest==8.1.1
readme_renderer==43.0
requests-toolbelt==1.0.0
rfc3986==2.0.0
rich==13.7.0
rich==13.7.1
tomli==2.0.1
twine==4.0.2
typing_extensions==4.8.0
zipp==3.17.0
twine==5.0.0
typing_extensions==4.10.0
zipp==3.18.1
14 changes: 7 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# DO NOT EDIT THIS FILE DIRECTLY - use ./script/update-requirements to update
PyYAML==6.0.1
certifi==2023.11.17
certifi==2024.2.2
charset-normalizer==3.3.2
dnspython==2.4.2
dnspython==2.6.1
fqdn==1.5.1
idna==3.4
idna==3.6
natsort==8.4.0
ns1-python==0.18.0
octodns==1.3.0
python-dateutil==2.8.2
ns1-python==0.19.0
octodns==1.6.1
python-dateutil==2.9.0.post0
requests==2.31.0
six==1.16.0
urllib3==2.1.0
urllib3==2.2.1
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def version():
# likely to result in formatting changes that should happen in their
# own PR. This will basically happen yearly
# https://black.readthedocs.io/en/stable/the_black_code_style/index.html#stability-policy
'black>=23.1.0,<24.0.0',
'black>=24.3.0,<25.0.0',
'build>=0.7.0',
'isort>=5.11.5',
'pyflakes>=2.2.0',
Expand Down

0 comments on commit 1603de0

Please sign in to comment.