8000 trailer.py: merge get_best_versions() into get_versions() · drinkingjava/python-versioneer@0fb7c53 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0fb7c53

Browse files
warnerwarner
committed
trailer.py: merge get_best_versions() into get_versions()
1 parent 4e56f56 commit 0fb7c53

File tree

2 files changed

+30
-42
lines changed

2 files changed

+30
-42
lines changed

‎src/trailer.py

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,22 @@ def write_to_version_file(filename, versions):
3737
print("set %s to '%s'" % (filename, versions["version"]))
3838

3939

40-
def get_best_versions(root, versionfile_abs,
41-
tag_prefix, parentdir_prefix,
42-
default=DEFAULT, verbose=False):
40+
def get_versions(default=DEFAULT, verbose=False):
4341
# returns dict with two keys: 'version' and 'full'
44-
#
42+
assert versionfile_source is not None, "please set versioneer.versionfile_source"
43+
assert tag_prefix is not None, "please set versioneer.tag_prefix"
44+
assert parentdir_prefix is not None, "please set versioneer.parentdir_prefix"
45+
# I am in versioneer.py, which must live at the top of the source tree,
46+
# which we use to compute the root directory. py2exe/bbfreeze/non-CPython
47+
# don't have __file__, in which case we fall back to sys.argv[0] (which
48+
# ought to be the setup.py script). We prefer __file__ since that's more
49+
# robust in cases where setup.py was invoked in some weird way (e.g. pip)
50+
try:
51+
root = os.path.dirname(os.path.abspath(__file__))
52+
except NameError:
53+
root = os.path.dirname(os.path.abspath(sys.argv[0]))
54+
versionfile_abs = os.path.join(root, versionfile_source)
55+
4556
# extract version from first of _version.py, 'git describe', parentdir.
4657
# This is meant to work for developers using a source checkout, for users
4758
# of a tarball created by 'setup.py sdist', and for users of a
@@ -73,23 +84,6 @@ def get_best_versions(root, versionfile_abs,
7384
if verbose: print("got version from default %s" % ver)
7485
return default
7586

76-
def get_versions(default=DEFAULT, verbose=False):
77-
assert versionfile_source is not None, "please set versioneer.versionfile_source"
78-
assert tag_prefix is not None, "please set versioneer.tag_prefix"
79-
assert parentdir_prefix is not None, "please set versioneer.parentdir_prefix"
80-
# I am in versioneer.py, which must live at the top of the source tree,
81-
# which we use to compute the root directory. py2exe/bbfreeze/non-CPython
82-
# don't have __file__, in which case we fall back to sys.argv[0] (which
83-
# ought to be the setup.py script). We prefer __file__ since that's more
84-
# robust in cases where setup.py was invoked in some weird way (e.g. pip)
85-
try:
86-
root = os.path.dirname(os.path.abspath(__file__))
87-
except NameError:
88< 8000 span class="diff-text-marker">-
root = os.path.dirname(os.path.abspath(sys.argv[0]))
89-
versionfile_abs = os.path.join(root, versionfile_source)
90-
return get_best_versions(root, versionfile_abs,
91-
tag_prefix, parentdir_prefix,
92-
default=default, verbose=verbose)
9387
def get_version(verbose=False):
9488
return get_versions(verbose=verbose)["version"]
9589

‎versioneer.py

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -492,11 +492,22 @@ def write_to_version_file(filename, versions):
492492
print("set %s to '%s'" % (filename, versions["version"]))
493493

494494

495-
def get_best_versions(root, versionfile_abs,
496-
tag_prefix, parentdir_prefix,
497-
default=DEFAULT, verbose=False):
495+
def get_versions(default=DEFAULT, verbose=False):
498496
# returns dict with two keys: 'version' and 'full'
499-
#
497+
assert versionfile_source is not None, "please set versioneer.versionfile_source"
498+
assert tag_prefix is not None, "please set versioneer.tag_prefix"
499+
assert parentdir_prefix is not None, "please set versioneer.parentdir_prefix"
500+
# I am in versioneer.py, which must live at the top of the source tree,
501+
# which we use to compute the root directory. py2exe/bbfreeze/non-CPython
502+
# don't have __file__, in which case we fall back to sys.argv[0] (which
503+
# ought to be the setup.py script). We prefer __file__ since that's more
504+
# robust in cases where setup.py was invoked in some weird way (e.g. pip)
505+
try:
506+
root = os.path.dirname(os.path.abspath(__file__))
507+
except NameError:
508+
root = os.path.dirname(os.path.abspath(sys.argv[0]))
509+
versionfile_abs = os.path.join(root, versionfile_source)
510+
500511
# extract version from first of _version.py, 'git describe', parentdir.
501512
# This is meant to work for developers using a source checkout, for users
502513
# of a tarball created by 'setup.py sdist', and for users of a
@@ -528,23 +539,6 @@ def get_best_versions(root, versionfile_abs,
528539
if verbose: print("got version from default %s" % ver)
529540
return default
530541

531-
def get_versions(default=DEFAULT, verbose=False):
532-
assert versionfile_source is not None, "please set versioneer.versionfile_source"
533-
assert tag_prefix is not None, "please set versioneer.tag_prefix"
534-
assert parentdir_prefix is not None, "please set versioneer.parentdir_prefix"
535-
# I am in versioneer.py, which must live at the top of the source tree,
536-
# which we use to compute the root directory. py2exe/bbfreeze/non-CPython
537-
# don't have __file__, in which case we fall back to sys.argv[0] (which
538-
# ought to be the setup.py script). We prefer __file__ since that's more
539-
# robust in cases where setup.py was invoked in some weird way (e.g. pip)
540-
try:
541-
root = os.path.dirname(os.path.abspath(__file__))
542-
except NameError:
543-
root = os.path.dirname(os.path.abspath(sys.argv[0]))
544-
versionfile_abs = os.path.join(root, versionfile_source)
545-
return get_best_versions(root, versionfile_abs,
546-
tag_prefix, parentdir_prefix,
547-
default=default, verbose=verbose)
548542
def get_version(verbose=False):
549543
return get_versions(verbose=verbose)["version"]
550544

0 commit comments

Comments
 (0)
0