Skip to content

Commit

Permalink
Merge pull request #73 from octodns/lower-dunder-version
Browse files Browse the repository at this point in the history
Add __version__, deprecated __VERSION__
  • Loading branch information
ross authored Nov 11, 2023
2 parents f0ec25e + e00bcbd commit 76aaea3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 18 deletions.
3 changes: 2 additions & 1 deletion octodns_ns1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
from octodns.record.geo import GeoCodes
from octodns.record.geo_data import geo_data

__VERSION__ = '0.0.6'
# TODO: remove __VERSION__ with the next major version release
__version__ = __VERSION__ = '0.0.6'


def _ensure_endswith_dot(string):
Expand Down
21 changes: 4 additions & 17 deletions setup.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from os import environ
from subprocess import CalledProcessError, check_output
#!/usr/bin/env python

from setuptools import find_packages, setup

Expand All @@ -12,23 +11,11 @@ def descriptions():


def version():
version = 'unknown'
with open('octodns_ns1/__init__.py') as fh:
for line in fh:
if line.startswith('__VERSION__'):
version = line.split("'")[1]
break

# pep440 style public & local version numbers
if environ.get('OCTODNS_RELEASE', False):
# public
return version
try:
sha = check_output(['git', 'rev-parse', 'HEAD']).decode('utf-8')[:8]
except (CalledProcessError, FileNotFoundError):
sha = 'unknown'
# local
return f'{version}+{sha}'
if line.startswith('__version__'):
return line.split("'")[1]
return 'unknown'


description, long_description = descriptions()
Expand Down

0 comments on commit 76aaea3

Please sign in to comment.