From dcae4be6386bc20947313326008fa5304d98e3c0 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 20 Mar 2024 13:49:33 -0700 Subject: [PATCH 1/4] Update black to 24.x --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 97401e5..93a8e49 100755 --- a/setup.py +++ b/setup.py @@ -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', From 85586f24da28ebdb3c59a6bfdeaee7a28cea0258 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 20 Mar 2024 14:50:11 -0700 Subject: [PATCH 2/4] Update requirements.txt --- requirements-dev.txt | 44 ++++++++++++++++++++++---------------------- requirements.txt | 12 ++++++------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 591ffcd..96a7695 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,40 +1,40 @@ # 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-mock==1.11.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 diff --git a/requirements.txt b/requirements.txt index 8654b20..72abaef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ # 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 -octodns==1.3.0 -python-dateutil==2.8.2 +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 From 7101c4fb19b808b36f4fa01a92dfd6219a6ff28d Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 20 Mar 2024 14:51:33 -0700 Subject: [PATCH 3/4] black 24.x formatting changes --- octodns_gandi/__init__.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/octodns_gandi/__init__.py b/octodns_gandi/__init__.py index cf41d99..0a1f828 100644 --- a/octodns_gandi/__init__.py +++ b/octodns_gandi/__init__.py @@ -152,11 +152,11 @@ def _data_for_multiple(self, _type, records): return { 'ttl': records[0]['rrset_ttl'], 'type': _type, - 'values': [ - v.replace(';', '\\;') for v in records[0]['rrset_values'] - ] - if _type == 'TXT' - else records[0]['rrset_values'], + 'values': ( + [v.replace(';', '\\;') for v in records[0]['rrset_values']] + if _type == 'TXT' + else records[0]['rrset_values'] + ), } _data_for_A = _data_for_multiple @@ -304,9 +304,11 @@ def _params_for_multiple(self, record): 'rrset_name': self._record_name(record.name), 'rrset_ttl': record.ttl, 'rrset_type': record._type, - 'rrset_values': [v.replace('\\;', ';') for v in record.values] - if record._type == 'TXT' - else record.values, + 'rrset_values': ( + [v.replace('\\;', ';') for v in record.values] + if record._type == 'TXT' + else record.values + ), } _params_for_A = _params_for_multiple From 5193507a6195d59eb72391628b17bbe871884f73 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 20 Mar 2024 14:51:33 -0700 Subject: [PATCH 4/4] add black 24.x to ignore revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index f08c988..491ce5f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -2,3 +2,5 @@ f12ca78371e707deac7cd19cf1909dce31d08927 # Commit for isort formatting changes 57326933fe092c44d0b85f2d466889fe72f7ad7a +# black 24.x +7101c4fb19b808b36f4fa01a92dfd6219a6ff28d