Browse Source

Remove a python 3.7 import work-around

pull/1030/head
Ross McFarland 2 years ago
parent
commit
9cb690d64c
No known key found for this signature in database GPG Key ID: 943B179E15D3B22A
2 changed files with 3 additions and 13 deletions
  1. +2
    -12
      octodns/manager.py
  2. +1
    -1
      setup.py

+ 2
- 12
octodns/manager.py View File

@ -5,6 +5,8 @@
from collections import deque
from concurrent.futures import ThreadPoolExecutor
from importlib import import_module
from importlib.metadata import PackageNotFoundError
from importlib.metadata import version as module_version
from logging import getLogger
from os import environ
from sys import stdout
@ -19,18 +21,6 @@ from .record import Record
from .yaml import safe_load
from .zone import Zone
# TODO: this can go away once we no longer support python 3.7
try: # pragma: no cover
from importlib.metadata import PackageNotFoundError
from importlib.metadata import version as module_version
except ModuleNotFoundError: # pragma: no cover
class PackageNotFoundError(Exception):
pass
def module_version(*args, **kargs):
raise PackageNotFoundError('placeholder')
class _AggregateTarget(object):
id = 'aggregate'


+ 1
- 1
setup.py View File

@ -99,7 +99,7 @@ setup(
long_description_content_type='text/markdown',
name='octodns',
packages=find_packages(),
python_requires='>=3.6',
python_requires='>=3.8',
tests_require=tests_require,
url='https://github.com/octodns/octodns',
version=version(),


Loading…
Cancel
Save