From cbb10109858bafa6e7c5b7abed1ea72c49856b5c Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 23 Oct 2024 14:50:47 -0700 Subject: [PATCH] Bump required octodns >= 1.5, address pending deprecations --- CHANGELOG.md | 4 ++++ pyproject.toml | 2 -- setup.py | 2 +- tests/config/unit.tests.yaml | 19 +------------------ tests/test_octodns_provider_easydns.py | 2 +- 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bf3aa1..d771b99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v1.0.0 - 2024-??-?? - ??? + +* Address pending octoDNS 2.x deprecations, require minimum of 1.5.x + ## v0.0.1 - 2022-01-07 - Moving #### Nothworthy Changes diff --git a/pyproject.toml b/pyproject.toml index 23a1316..d13e31c 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 4896e68..40236e7 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ def version(): ), 'test': tests_require, }, - install_requires=('octodns>=0.9.14', '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 aa28ee5..24638a0 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_easydns.py b/tests/test_octodns_provider_easydns.py index 8729005..e9b6d01 100644 --- a/tests/test_octodns_provider_easydns.py +++ b/tests/test_octodns_provider_easydns.py @@ -430,7 +430,7 @@ def test_apply(self): plan = provider.plan(self.expected) # No root NS, 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)