Commit a26dafc8 authored by Alexandre Mestiashvili's avatar Alexandre Mestiashvili
Browse files

New upstream version 1.1.4+dfsg

parent 2dfb3b2e

CHANGELOG

+3 −0
Original line number Diff line number Diff line 
1.1.2

 - ci: Automated release to PyPI with appveyor and travis-ci

 - fix: support lmfit >= 0.9.11

1.1.1

 - Fix plotting error with LaTeX (thanks @toubol) (#179)

 - Update documentation

README.rst

+3 −1
Original line number Diff line number Diff line 
|PyCorrFit|

===========



|PyPI Version| |Build Status Win| |Build Status Travis| |Coverage Status|

|PyPI Version| |Build Status Win| |Build Status Travis| |Coverage Status| |Docs Status|





Documentation
@@ -25,3 +25,5 @@ at the `issues page <https://github.com/FCS-analysis/PyCorrFit/wiki/Creating-a-n 
   :target: https://travis-ci.org/FCS-analysis/PyCorrFit

.. |Coverage Status| image:: https://img.shields.io/codecov/c/github/FCS-analysis/PyCorrFit/master.svg

   :target: https://codecov.io/gh/FCS-analysis/PyCorrFit

.. |Docs Status| image:: https://readthedocs.org/projects/pycorrfit/badge/?version=latest

   :target: https://readthedocs.org/projects/pycorrfit/builds/

docs/conf.py

+2 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ master_doc = 'index' 


# General information about the project.

project = 'PyCorrFit'

github_project = 'FCS-analysis/' + project

copyright = '2014, Paul Müller'

author = 'Paul Müller'
@@ -184,7 +185,7 @@ man_pages = [ 
#  dir menu entry, description, category)

texinfo_documents = [

    (master_doc, project, project + ' Documentation',

     author, project, 'Phase imaging analysis software.',

     author, project, 'Curve fitting in FCS.',

     'Scientific'),

]

docs/extensions/github_changelog.py

+3 −2
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ class IncludeDirective(Directive): 


    def run(self):

        full_path = self.arguments[0]

        project = self.state.document.settings.env.config.project

        project = self.state.document.settings.env.config.github_project



        def insert_github_link(reobj):

            line = reobj.string

            instr = line[reobj.start():reobj.end()]

            issue = instr.strip("#()")

            link = "https://github.com/RI-imaging/{}/issues/".format(project)

            link = "https://github.com/{}/issues/".format(project)

            rstlink = "(`#{issue} <{link}{issue}>`_)".format(issue=issue,

                                                             link=link)

            return rstlink
@@ -70,5 +70,6 @@ class IncludeDirective(Directive): 




def setup(app):

    app.add_config_value('github_project', "user/project", 'html')

    app.add_directive('include_changelog', IncludeDirective)

    return {'version': '0.1'}   # identifies the version of our extension

docs/sec_about.rst

+1 −1
Original line number Diff line number Diff line
@@ -52,5 +52,5 @@ How to cite 
Müller, P., Schwille, P., and Weidemann, T.

*PyCorrFit - generic data evaluation for fluorescence correlation spectroscopy.*

Bioinformatics 30(17):2532-2533 (2014).

DOI:`10.1093/bioinformatics/btu328 <http://dx.doi.org/10.1093/bioinformatics/btu328>`_

doi:`10.1093/bioinformatics/btu328 <http://dx.doi.org/10.1093/bioinformatics/btu328>`_