[med-svn] [Git][med-team/python-multipletau][upstream] New upstream version 0.3.2+ds

[Alexandre Mestiashvili]

Alexandre Mestiashvili pushed to branch upstream at Debian Med / python-multipletau


Commits:
5646c081 by Alexandre Mestiashvili at 2018-11-05T12:20:02Z
New upstream version 0.3.2+ds
- - - - -


3 changed files:

- CHANGELOG
- docs/conf.py
- multipletau/_version.py


Changes:

=====================================
CHANGELOG
=====================================
@@ -1,3 +1,7 @@
+0.3.2
+ - fix: multipletau package not available when building the docs
+0.3.1
+ - fix: detect correct version when building the docs from source tar ball
 0.3.0
  - feat: add option to choose the strategy for propagating values to
    the next register (#14)


=====================================
docs/conf.py
=====================================
@@ -22,7 +22,7 @@ import os.path as op
 import sys
 # include parent directory
 pdir = op.dirname(op.dirname(op.abspath(__file__)))
-sys.path.insert(0, pdir)
+sys.path.insert(0, pdir) 
 # include extenstions
 sys.path.append(op.abspath('extensions'))
 


=====================================
multipletau/_version.py
=====================================
@@ -1,12 +1,11 @@
 #!/usr/bin/env python
-"""
-Determine package version for git repositories.
+"""Determine package version for git repositories from tags
 
 Each time this file is imported it checks if the ".git" folder is
 present and if so, obtains the version from the git history using
 `git describe`. This information is then stored in the file
 `_version_save.py` which is not versioned by git, but distributed
-along with e.g. pypi.
+along e.g. on PyPI.
 """
 from __future__ import print_function
 
@@ -15,7 +14,7 @@ from __future__ import print_function
 if True:  # pragma: no cover
     import imp
     import os
-    from os.path import join, abspath, dirname
+    from os.path import abspath, basename, dirname, join
     import subprocess
     import sys
     import time
@@ -24,12 +23,12 @@ if True:  # pragma: no cover
 
     def git_describe():
         """
-        Returns a string describing the version returned by the
+        Return a string describing the version returned by the
         command `git describe --tags HEAD`.
         If it is not possible to determine the correct version,
         then an empty string is returned.
         """
-        # make sure we are in a directory that belongs to the correct
+        # Make sure we are in a directory that belongs to the correct
         # repository.
         ourdir = dirname(abspath(__file__))
 
@@ -67,8 +66,7 @@ if True:  # pragma: no cover
         return git_revision
 
     def load_version(versionfile):
-        """ load version from version_save.py
-        """
+        """load version from version_save.py"""
         longversion = ""
         try:
             _version_save = imp.load_source("_version_save", versionfile)
@@ -85,8 +83,7 @@ if True:  # pragma: no cover
         return longversion
 
     def save_version(version, versionfile):
-        """ save version to version_save.py
-        """
+        """save version to version_save.py"""
         data = "#!/usr/bin/env python\n" \
             + "# This file was created automatically\n" \
             + "longversion = '{VERSION}'\n"
@@ -97,7 +94,15 @@ if True:  # pragma: no cover
             msg = "Could not write package version to {}.".format(versionfile)
             warnings.warn(msg)
 
-    versionfile = join(dirname(abspath(__file__)), "_version_save.py")
+    hdir = dirname(abspath(__file__))
+    if basename(__file__) == "conf.py" and "name" in locals():
+        # This script is executed in conf.py from the docs directory
+        versionfile = join(join(join(hdir, ".."),
+                                name),  # noqa: F821
+                           "_version_save.py")
+    else:
+        # This script is imported as a module
+        versionfile = join(hdir, "_version_save.py")
 
     # Determine the accurate version
     longversion = ""



View it on GitLab: https://salsa.debian.org/med-team/python-multipletau/commit/5646c081617f88e24a178d065811c98a88c8cd6f

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-multipletau/commit/5646c081617f88e24a178d065811c98a88c8cd6f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181105/95c68035/attachment-0001.html>