Browse Source

Simplify versioning, just use __version__

pull/1099/head
Ross McFarland 2 years ago
parent
commit
c9a2c8f72b
No known key found for this signature in database GPG Key ID: 943B179E15D3B22A
2 changed files with 4 additions and 13 deletions
  1. +2
    -0
      CHANGELOG.md
  2. +2
    -13
      setup.py

+ 2
- 0
CHANGELOG.md View File

@ -6,6 +6,8 @@
of a standard, per pep-8. __VERSION__ is deprecated and will go away in 2.x
* Fixed issues with handling of chunking large TXT values for providers that use
the in-built `rrs` method
* Removed code that included sha in module version number when installing from
repo a it caused problems with non-binary installs.
#### Stuff


+ 2
- 13
setup.py View File

@ -1,9 +1,7 @@
#!/usr/bin/env python
from io import StringIO
from os import environ
from os.path import dirname, join
from subprocess import CalledProcessError, check_output
import octodns
@ -50,16 +48,7 @@ def long_description():
def version():
# pep440 style public & local version numbers
if environ.get('OCTODNS_RELEASE', False):
# public
return octodns.__VERSION__
try:
sha = check_output(['git', 'rev-parse', 'HEAD']).decode('utf-8')[:8]
except (CalledProcessError, FileNotFoundError):
sha = 'unknown'
# local
return f'{octodns.__VERSION__}+{sha}'
return octodns.__VERSION__
tests_require = ('pytest>=6.2.5', 'pytest-cov>=3.0.0', 'pytest-network>=0.0.1')
@ -102,5 +91,5 @@ setup(
python_requires='>=3.8',
tests_require=tests_require,
url='https://github.com/octodns/octodns',
version=version(),
version=octodns.__version__,
)

Loading…
Cancel
Save