diff options
Diffstat (limited to 'alot')
| -rw-r--r-- | alot/version.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/alot/version.py b/alot/version.py index cced6864..40e64bb4 100644 --- a/alot/version.py +++ b/alot/version.py @@ -10,7 +10,7 @@ # scheme that setuptools uses. If “git describe” returns an error # (most likely because we're in an unpacked copy of a release tarball, # rather than in a git working copy), then we fall back on reading the -# contents of the RELEASE-VERSION file. +# contents of the VERSION file. # # To use this script, simply import it your setup.py file, and use the # results of get_git_version() as your package version: @@ -24,15 +24,15 @@ # . # ) # -# This will automatically update the RELEASE-VERSION file, if -# necessary. Note that the RELEASE-VERSION file should *not* be +# This will automatically update the VERSION file, if +# necessary. Note that the VERSION file should *not* be # checked into git; please add it to your top-level .gitignore file. # -# You'll probably want to distribute the RELEASE-VERSION file in your +# You'll probably want to distribute the VERSION file in your # sdist tarballs; to do this, just create a MANIFEST.in file that # contains the following line: # -# include RELEASE-VERSION +# include VERSION __all__ = ("get_git_version") @@ -84,12 +84,10 @@ def write_release_version(version): def get_git_version(abbrev=4): - # Read in the version that's currently in RELEASE-VERSION. - + # Read in the version that's currently in VERSION. release_version = read_release_version() # First try to get the current version using “git describe”. - version = call_git_describe(abbrev) # If that doesn't work, fall back on the value that's in @@ -110,7 +108,6 @@ def get_git_version(abbrev=4): write_release_version(version) # Finally, return the current version. - return version |