From 75da719997be535a2917835f7621d32c9d7c52a7 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 27 Nov 2024 14:16:48 -0800 Subject: [PATCH] Bump required octodns >= 1.5, address pending deprecations --- CHANGELOG.md | 8 ++++++++ pyproject.toml | 2 -- setup.py | 2 +- tests/config/unit.tests.yaml | 19 +------------------ tests/test_octodns_provider_hetzner.py | 2 +- 5 files changed, 11 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bec016..1e75c2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## v0.0.? - 2024-??-?? - ??? + +* Address pending octoDNS 2.x deprecations, require minimum of 1.5.x + +## v0.0.3 - 2023-02-08 - AKA + +* Support for `ALIAS` record types + ## v0.0.2 - 2022-05-20 - Root NS Support * Enable management of root NS records diff --git a/pyproject.toml b/pyproject.toml index 09ec816..bfb4c17 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,5 @@ sections="FUTURE,STDLIB,THIRDPARTY,OCTODNS,FIRSTPARTY,LOCALFOLDER" [tool.pytest.ini_options] filterwarnings = [ 'error', - # TODO: remove once octodns 2.0 has been released - 'ignore:.*DEPRECATED.*2.0', ] pythonpath = "." diff --git a/setup.py b/setup.py index 2393cbe..0d17661 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ def version(): ), 'test': tests_require, }, - install_requires=('octodns>=0.9.16', 'requests>=2.27.0'), + install_requires=('octodns>=1.5.0', 'requests>=2.27.0'), license='MIT', long_description=long_description, long_description_content_type='text/markdown', diff --git a/tests/config/unit.tests.yaml b/tests/config/unit.tests.yaml index 12d5b6f..cb333cf 100644 --- a/tests/config/unit.tests.yaml +++ b/tests/config/unit.tests.yaml @@ -1,19 +1,6 @@ --- ? '' -: - geo: - AF: - - 2.2.3.4 - - 2.2.3.5 - AS-JP: - - 3.2.3.4 - - 3.2.3.5 - NA-US: - - 4.2.3.4 - - 4.2.3.5 - NA-US-CA: - - 5.2.3.4 - - 5.2.3.5 - ttl: 300 +: - ttl: 300 type: A values: - 1.2.3.4 @@ -153,10 +140,6 @@ ptr: ttl: 300 type: PTR values: [foo.bar.com.] -spf: - ttl: 600 - type: SPF - value: v=spf1 ip4:192.168.0.1/16-all sub: type: 'NS' values: diff --git a/tests/test_octodns_provider_hetzner.py b/tests/test_octodns_provider_hetzner.py index 7d8003c..b26984e 100644 --- a/tests/test_octodns_provider_hetzner.py +++ b/tests/test_octodns_provider_hetzner.py @@ -109,7 +109,7 @@ def test_apply(self): plan = provider.plan(self.expected) # No ignored, no excluded, no unsupported - n = len(self.expected.records) - 9 + n = len(self.expected.records) - 8 self.assertEqual(n, len(plan.changes)) self.assertEqual(n, provider.apply(plan)) self.assertFalse(plan.exists)