Skip to content
Commits on Source (4)
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
......
pycorrfit (1.1.5+dfsg-1) unstable; urgency=medium
* New upstream version 1.1.5+dfsg
* Drop patch applied by upstream
-- Alexandre Mestiashvili <mestia@debian.org> Tue, 11 Dec 2018 09:30:01 +0000
pycorrfit (1.1.4+dfsg-3) unstable; urgency=medium
* Add patch tex_pkg_order.patch, thanks to Hilmar Preuße. Closes: #914729
......
Description: Load \usepackage[svgnames]{xcolor} before \usepackage{fancyvrb}
to avoid failures with LaTeX, thanks to Hilmar Preuße, #914729.
From: Alex Mestiashvili <mestia@debian.org>
Forwarded: https://github.com/FCS-analysis/PyCorrFit/issues/191
--- pycorrfit.orig/doc/PyCorrFit_doc.tex
+++ pycorrfit/doc/PyCorrFit_doc.tex
@@ -53,8 +53,8 @@
\usepackage{textcomp} % Sonderzeichen
\usepackage{wrapfig}
-\usepackage{fancyvrb}
\usepackage[svgnames]{xcolor} %Farben wie DarkBlue
+\usepackage{fancyvrb}
%%
%%
......@@ -53,8 +53,8 @@
\usepackage{textcomp} % Sonderzeichen
\usepackage{wrapfig}
\usepackage{fancyvrb}
\usepackage[svgnames]{xcolor} %Farben wie DarkBlue
\usepackage{fancyvrb}
%%
%%
......
#!/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 = ""
......