[med-svn] [Git][med-team/pycorrfit][upstream] New upstream version 1.1.5+dfsg

[Alexandre Mestiashvili]

Alexandre Mestiashvili pushed to branch upstream at Debian Med / pycorrfit


Commits:
77e740cc by Alexandre Mestiashvili at 2018-12-07T09:20:41Z
New upstream version 1.1.5+dfsg
- - - - -


3 changed files:

- CHANGELOG
- doc/PyCorrFit_doc.tex
- pycorrfit/_version.py


Changes:

=====================================
CHANGELOG
=====================================
@@ -1,3 +1,9 @@
+1.1.5
+ - docs: fix build with recent version of latex (#191)
+1.1.4
+ - maintenance release
+1.1.3
+ - maintenance release
 1.1.2
  - ci: Automated release to PyPI with appveyor and travis-ci
  - fix: support lmfit >= 0.9.11


=====================================
doc/PyCorrFit_doc.tex
=====================================
@@ -53,8 +53,8 @@
 \usepackage{textcomp} % Sonderzeichen
 \usepackage{wrapfig}
 
-\usepackage{fancyvrb}
 \usepackage[svgnames]{xcolor} %Farben wie DarkBlue
+\usepackage{fancyvrb}
 
 %%
 %%


=====================================
pycorrfit/_version.py
=====================================
@@ -1,23 +1,20 @@
 #!/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
 
 # Put the entire script into a `True` statement and add the hint
 # `pragma: no cover` to ignore code coverage here.
-
-
 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
@@ -26,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__))
 
@@ -69,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)
@@ -87,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"
@@ -99,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/pycorrfit/commit/77e740cc6531e857f2d95abe30c70a5c1fe2cc5e

-- 
View it on GitLab: https://salsa.debian.org/med-team/pycorrfit/commit/77e740cc6531e857f2d95abe30c70a5c1fe2cc5e
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/20181211/00188a3f/attachment-0001.html>