Merge branch 'main' into main

octodns · Mar 21, 2024 · a0a9bf4 · a0a9bf4
2 parents 23107a7 + 89846df
commit a0a9bf4
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 53 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -2,3 +2,5 @@
 0674bfdfdb4a47d4b249c65686f99971dc160dd5
 # Commit for isort formatting changes
 7a0f6ba694902da5b54d7a737c924e2e6aab97c5
+# black 24.x
+9b1ca1ef2d9dd4375d2e6dbab263f8fc30a1ed6b
diff --git 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
@@ -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
diff --git 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',

diff --git a/tests/v2/test_provider_octodns_selectel_v2.py b/tests/v2/test_provider_octodns_selectel_v2.py
@@ -25,9 +25,9 @@ class TestSelectelProvider(TestCase):
     def _a_rrset(self, id, hostname):
         return dict(
             id=id,
-            name=f'{hostname}.{self._zone_name}'
-            if hostname
-            else self._zone_name,
+            name=(
+                f'{hostname}.{self._zone_name}' if hostname else self._zone_name
+            ),
             type='A',
             ttl=self._ttl,
             records=[dict(content='1.2.3.4'), dict(content='5.6.7.8')],
@@ -36,9 +36,9 @@ def _a_rrset(self, id, hostname):
     def _aaaa_rrset(self, id, hostname):
         return dict(
             id=id,
-            name=f'{hostname}.{self._zone_name}'
-            if hostname
-            else self._zone_name,
+            name=(
+                f'{hostname}.{self._zone_name}' if hostname else self._zone_name
+            ),
             type='AAAA',
             ttl=self._ttl,
             records=[
@@ -50,9 +50,9 @@ def _aaaa_rrset(self, id, hostname):
     def _cname_rrset(self, id, hostname):
         return dict(
             id=id,
-            name=f'{hostname}.{self._zone_name}'
-            if hostname
-            else self._zone_name,
+            name=(
+                f'{hostname}.{self._zone_name}' if hostname else self._zone_name
+            ),
             type='CNAME',
             ttl=self._ttl,
             records=[dict(content=self._zone_name)],
@@ -61,9 +61,9 @@ def _cname_rrset(self, id, hostname):
     def _mx_rrset(self, id, hostname):
         return dict(
             id=id,
-            name=f'{hostname}.{self._zone_name}'
-            if hostname
-            else self._zone_name,
+            name=(
+                f'{hostname}.{self._zone_name}' if hostname else self._zone_name
+            ),
             type='MX',
             ttl=self._ttl,
             records=[dict(content=f'10 mx.{self._zone_name}')],
@@ -72,9 +72,9 @@ def _mx_rrset(self, id, hostname):
     def _ns_rrset(self, id, hostname):
         return dict(
             id=id,
-            name=f'{hostname}.{self._zone_name}'
-            if hostname
-            else self._zone_name,
+            name=(
+                f'{hostname}.{self._zone_name}' if hostname else self._zone_name
+            ),
             type='NS',
             ttl=self._ttl,
             records=[
@@ -87,9 +87,9 @@ def _ns_rrset(self, id, hostname):
     def _srv_rrset(self, id, hostname):
         return dict(
             id=id,
-            name=f'{hostname}.{self._zone_name}'
-            if hostname
-            else self._zone_name,
+            name=(
+                f'{hostname}.{self._zone_name}' if hostname else self._zone_name
+            ),
             type='SRV',
             ttl=self._ttl,
             records=[
@@ -101,9 +101,9 @@ def _srv_rrset(self, id, hostname):
     def _txt_rrset(self, id, hostname):
         return dict(
             id=id,
-            name=f'{hostname}.{self._zone_name}'
-            if hostname
-            else self._zone_name,
+            name=(
+                f'{hostname}.{self._zone_name}' if hostname else self._zone_name
+            ),
             type='TXT',
             ttl=self._ttl,
             records=[dict(content='"Foo1"'), dict(content='"Foo2"')],
@@ -112,9 +112,9 @@ def _txt_rrset(self, id, hostname):
     def _sshfp_rrset(self, id, hostname):
         return dict(
             id=id,
-            name=f'{hostname}.{self._zone_name}'
-            if hostname
-            else self._zone_name,
+            name=(
+                f'{hostname}.{self._zone_name}' if hostname else self._zone_name
+            ),
             type='SSHFP',
             ttl=self._ttl,
             records=[dict(content='1 1 123456789abcdef')],