Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump required octodns >= 1.5, address pending deprecations #43

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## v1.0.0 - 2024-??-?? - ???

### Notedworthy Changes:

* `SPF` record support removed, records should be migrated to `TXT` before
upgrading.

## v0.0.2 - 2022-11-20 - Less dots

* Remove extra . on the end of SRV record targets
Expand Down
3 changes: 0 additions & 3 deletions octodns_ovh/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ class OvhProvider(BaseProvider):
'NAPTR',
'NS',
'PTR',
'SPF',
'SRV',
'SSHFP',
'TXT',
Expand Down Expand Up @@ -241,7 +240,6 @@ def _data_for_DKIM(_type, records):
_data_for_AAAA = _data_for_multiple
_data_for_NS = _data_for_multiple
_data_for_TXT = _data_for_multiple
_data_for_SPF = _data_for_multiple
_data_for_PTR = _data_for_single
_data_for_CNAME = _data_for_single

Expand Down Expand Up @@ -336,7 +334,6 @@ def _params_for_TXT(self, record):
_params_for_A = _params_for_multiple
_params_for_AAAA = _params_for_multiple
_params_for_NS = _params_for_multiple
_params_for_SPF = _params_for_multiple

_params_for_CNAME = _params_for_single
_params_for_PTR = _params_for_single
Expand Down
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "."
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def version():
),
'test': tests_require,
},
install_requires=('octodns>=0.9.14', 'ovh>=0.5.0'),
install_requires=('octodns>=1.5.0', 'ovh>=0.5.0'),
license='MIT',
long_description=long_description,
long_description_content_type='text/markdown',
Expand Down
29 changes: 0 additions & 29 deletions tests/test_provider_octodns_ovh.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,28 +247,6 @@ class TestOvhProvider(TestCase):
)
)

# SPF
api_record.append(
{
'fieldType': 'SPF',
'ttl': 1000,
'target': 'v=spf1 include:unit.texts.redirect ~all',
'subDomain': '',
'id': 13,
}
)
expected.add(
Record.new(
zone,
'',
{
'ttl': 1000,
'type': 'SPF',
'value': 'v=spf1 include:unit.texts.redirect ~all',
},
)
)

# SSHFP
api_record.append(
{
Expand Down Expand Up @@ -537,13 +515,6 @@ def test_apply(self, client_mock):
target='10 mx1.unit.tests.',
ttl=400,
),
call(
'/domain/zone/unit.tests/record',
fieldType='SPF',
subDomain='',
target='v=spf1 include:unit.texts.redirect ~all',
ttl=1000,
),
call(
'/domain/zone/unit.tests/record',
fieldType='SSHFP',
Expand Down
Loading