[med-svn] [Git][med-team/pycorrfit][master] 11 commits: not yet released
Michael R. Crusoe (@crusoe)
gitlab at salsa.debian.org
Sat Jul 6 10:30:34 BST 2024
Michael R. Crusoe pushed to branch master at Debian Med / pycorrfit
Commits:
936cbdf3 by Michael R. Crusoe at 2024-07-06T09:38:54+02:00
not yet released
- - - - -
7bf65bbe by Michael R. Crusoe at 2024-07-06T09:40:41+02:00
Added d/clean, simplified d/rules.
- - - - -
25ed1563 by Michael R. Crusoe at 2024-07-06T09:54:23+02:00
d/patches/distutils: replace the deprecated "distutils" package
- - - - -
a067611d by Michael R. Crusoe at 2024-07-06T10:07:31+02:00
d/patches/python3: fix a few python[^3] references
- - - - -
1d8e53c3 by Michael R. Crusoe at 2024-07-06T10:36:03+02:00
Deleted r/README.Debian, it is out of date. The docs are in the regular location: /usr/share/doc/pycorrfit/
- - - - -
2fcf5522 by Michael R. Crusoe at 2024-07-06T10:54:30+02:00
d/watch: switch to PyPI to get the correct _version_save
- - - - -
2593bc27 by Michael R. Crusoe at 2024-07-06T10:56:02+02:00
New upstream version 1.1.7+nopack
- - - - -
6a75029e by Michael R. Crusoe at 2024-07-06T10:56:06+02:00
Update upstream source from tag 'upstream/1.1.7+nopack'
Update to upstream version '1.1.7+nopack'
with Debian dir 350640fe734cee4b7a871e3a93695b24351794be
- - - - -
65c1eb2d by Michael R. Crusoe at 2024-07-06T11:07:09+02:00
d/{rules,pycorrfit.install}: alas this means that the sample_sessions are no longer included.
- - - - -
eed158d3 by Michael R. Crusoe at 2024-07-06T11:12:55+02:00
d/clean: Don't delete pycorrfit/_version_save.py now that we get that in the sdist from PyPI.
- - - - -
3962e2a9 by Michael R. Crusoe at 2024-07-06T11:24:34+02:00
routine-update: Ready to upload to unstable
- - - - -
26 changed files:
- − .github/FUNDING.yml
- − ChangeLog.txt
- + PKG-INFO
- − debian/README.Debian
- debian/changelog
- + debian/clean
- debian/control
- debian/copyright
- + debian/patches/distutils
- + debian/patches/python3
- debian/patches/series
- debian/pycorrfit.install
- debian/rules
- debian/watch
- + doc/PyCorrFit_doc.pdf
- − examples/sample_sessions/CSFCS_DiO-in-DOPC.pcfs
- − examples/sample_sessions/ConfocalFCS_Alexa488_xcorr.pcfs
- + pycorrfit.egg-info/PKG-INFO
- + pycorrfit.egg-info/SOURCES.txt
- + pycorrfit.egg-info/dependency_links.txt
- + pycorrfit.egg-info/entry_points.txt
- + pycorrfit.egg-info/requires.txt
- + pycorrfit.egg-info/top_level.txt
- + pycorrfit/_version_save.py
- − pycorrfit/readfiles/read_pt3_scripts/LICENSE
- setup.cfg
Changes:
=====================================
.github/FUNDING.yml deleted
=====================================
@@ -1,2 +0,0 @@
-github: paulmueller
-liberapay: paulmueller
=====================================
ChangeLog.txt deleted
=====================================
@@ -1,4 +0,0 @@
-1.1.0
-- The changelog has moved. This file will be removed eventually,
- but is kept to allow older versions of PyCorrFit to be notified
- that a new version has been released.
=====================================
PKG-INFO
=====================================
@@ -0,0 +1,46 @@
+Metadata-Version: 2.1
+Name: pycorrfit
+Version: 1.1.7
+Summary: Scientific tool for fitting correlation curves on a logarithmic plot.
+Home-page: https://github.com/FCS-analysis/PyCorrFit
+Author: Paul Müller
+Author-email: dev at craban.de
+License: GPL v2
+Description: |PyCorrFit|
+ ===========
+
+ |PyPI Version| |Build Status Win| |Build Status Travis| |Coverage Status| |Docs Status|
+
+
+ Documentation
+ -------------
+ The documentation of PyCorrFit is available at https://pycorrfit.readthedocs.org.
+
+
+ Problems
+ --------
+ If you find a bug or need help with a specific topic, do not hesitate to ask a question
+ at the `issues page <https://github.com/FCS-analysis/PyCorrFit/wiki/Creating-a-new-issue>`__.
+
+
+
+ .. |PyCorrFit| image:: https://raw.github.com/FCS-analysis/PyCorrFit/master/doc/Images/PyCorrFit_logo_dark.png
+ .. |PyPI Version| image:: https://img.shields.io/pypi/v/PyCorrFit.svg
+ :target: https://pypi.python.org/pypi/pycorrfit
+ .. |Build Status Win| image:: https://img.shields.io/appveyor/ci/paulmueller/PyCorrFit/master.svg?label=win
+ :target: https://ci.appveyor.com/project/paulmueller/pycorrfit
+ .. |Build Status Travis| image:: https://img.shields.io/travis/FCS-analysis/PyCorrFit/master.svg?label=linux_osx
+ :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/
+
+Keywords: fluorescence correlation spectroscopy
+Platform: ALL
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Scientific/Engineering :: Visualization
+Classifier: Intended Audience :: Science/Research
+Requires-Python: >=3.6, <4
+Provides-Extra: GUI
=====================================
debian/README.Debian deleted
=====================================
@@ -1,8 +0,0 @@
-PyCorrFit for Debian
---------------------
-
-The documentation and changelog for PyCorrFit is located here:
-
- /usr/share/pyshared/pycorrfit_doc/
-
- -- Alex Mestiashvili <alex at biotec.tu-dresden.de>
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-pycorrfit (1.1.7+dfsg-3) unstable; urgency=medium
+pycorrfit (1.1.7+nopack-1) unstable; urgency=medium
* Team upload.
@@ -12,7 +12,21 @@ pycorrfit (1.1.7+dfsg-3) unstable; urgency=medium
* Standards-Version: 4.7.0 (routine-update)
* Build-Depends: s/dh-python/dh-sequence-python3/ (routine-update)
- -- Bo YU <tsu.yubo at gmail.com> Wed, 03 Jul 2024 00:20:14 +0800
+ [ Michael R. Crusoe ]
+ * Added d/clean, simplified d/rules.
+ * d/patches/distutils: replace the deprecated "distutils" package
+ * d/patches/python3: fix a few python[^3] references
+ * Deleted r/README.Debian, it is out of date. The docs are in the
+ regular location: /usr/share/doc/pycorrfit/
+ * d/watch: switch to PyPI to get the correct _version_save
+ * d/copyright: no longer need to exclude any files
+ * d/{rules,pycorrfit.install}: alas this means that the
+ sample_sessions are no longer included.
+ * d/control: fix homepage
+ * d/clean: Don't delete pycorrfit/_version_save.py now that we get
+ that in the sdist from PyPI.
+
+ -- Michael R. Crusoe <crusoe at debian.org> Sat, 06 Jul 2024 11:21:37 +0200
pycorrfit (1.1.7+dfsg-2) unstable; urgency=medium
=====================================
debian/clean
=====================================
@@ -0,0 +1,13 @@
+PyCorrFit_doc.pdf
+doc/PyCorrFit_doc.aux
+doc/PyCorrFit_doc.bbl
+doc/PyCorrFit_doc.blg
+doc/PyCorrFit_doc.log
+doc/PyCorrFit_doc.out
+doc/PyCorrFit_doc.pdf
+doc/PyCorrFit_doc.synctex.gz
+doc/PyCorrFit_doc.toc
+doc/PyCorrFit_doc_content.aux
+pycorrfit.egg-info/
+pycorrfit/readfiles/read_pt3_scripts/fib4.c
+.pytest_cache/
=====================================
debian/control
=====================================
@@ -31,7 +31,7 @@ Build-Depends: cython3,
Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/med-team/pycorrfit
Vcs-Git: https://salsa.debian.org/med-team/pycorrfit.git
-Homepage: https://fcs-analysis.github.io/PyCorrFit/
+Homepage: https://pycorrfit.readthedocs.io/
Rules-Requires-Root: no
Package: pycorrfit
=====================================
debian/copyright
=====================================
@@ -1,12 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: PyCorrFit
Source: https://github.com/paulmueller/PyCorrFit/
-Files-Excluded:
- .travis*
- .appveyor/*
- appveyor.yml
- .gitignore
- .readthedocs.yml
Files: *
Copyright: 2015 Paul Mueller <paul.mueller at biotec.tu-dresden.de>
=====================================
debian/patches/distutils
=====================================
@@ -0,0 +1,103 @@
+From: Michael R. Crusoe <crusoe at debian.org>
+Subject: Replace "distutils" with "packaging"
+
+As distutils is deprecated and not even part of Python3.12
+
+--- pycorrfit.orig/pycorrfit/gui/frontend.py
++++ pycorrfit/pycorrfit/gui/frontend.py
+@@ -3,7 +3,7 @@
+ The frontend displays the GUI (Graphic User Interface). All necessary
+ functions and modules are called from here.
+ """
+-from distutils.version import LooseVersion # For version checking
++from packaging.version import Version
+ import os
+ import pathlib
+ import platform
+@@ -1313,8 +1313,8 @@
+
+ # Check for correct version
+ try:
+- arcv = LooseVersion(Infodict["Version"])
+- thisv = LooseVersion(self.version.strip())
++ arcv = Version(Infodict["Version"])
++ thisv = Version(self.version.strip())
+ if arcv > thisv:
+ errstring = "Your version of Pycorrfit ("+str(thisv) +\
+ ") is too old to open this session (" +\
+--- pycorrfit.orig/pycorrfit/gui/main.py
++++ pycorrfit/pycorrfit/gui/main.py
+@@ -1,8 +1,9 @@
+ """Main execution script"""
+-from distutils.version import LooseVersion
++
+ import sys
+ import warnings
+
++from packaging.version import Version
+ import yaml
+ import numpy as np
+ import scipy
+@@ -56,8 +57,8 @@
+ the module str *name* the required verion is met or not.
+ """
+ try:
+- req = LooseVersion(required)
+- giv = LooseVersion(given)
++ req = Version(required)
++ giv = Version(given)
+ except:
+ print(" WARNING: Could not verify version of "+name+".")
+ return
+--- pycorrfit.orig/pycorrfit/gui/update.py
++++ pycorrfit/pycorrfit/gui/update.py
+@@ -1,11 +1,11 @@
+ """PyCorrFit - update checking"""
+-from distutils.version import LooseVersion # For version checking
+ import os
+ import tempfile
+ import traceback
+ import urllib.request
+ import webbrowser
+
++from packaging.version import Version
+ import simplejson
+ import wx.html
+ import wx.lib.delayedresult as delayedresult
+@@ -80,7 +80,7 @@
+ pass
+ else:
+ j = simplejson.loads(data)
+- newversion = LooseVersion(j["tag_name"])
++ newversion = Version(j["tag_name"])
+
+ return newversion
+
+@@ -112,9 +112,9 @@
+
+ ghrepo = "FCS-analysis/PyCorrFit"
+ if hasattr(pcf_version, "repo_tag"):
+- old = LooseVersion(pcf_version.repo_tag)
++ old = Version(pcf_version.repo_tag)
+ else:
+- old = LooseVersion(pcf_version.version)
++ old = Version(pcf_version.version)
+
+ new = get_gh_version(ghrepo)
+
+--- pycorrfit.orig/setup.py
++++ pycorrfit/setup.py
+@@ -2,13 +2,6 @@
+ from setuptools import setup, Extension, find_packages
+ import sys
+
+-# The next three lines are necessary for setup.py install to include
+-# ChangeLog and Documentation of PyCorrFit
+-from distutils.command.install import INSTALL_SCHEMES
+-for scheme in INSTALL_SCHEMES.values():
+- scheme['data'] = scheme['purelib']
+-
+-
+ # We don't need to cythonize if a .whl package is available.
+ try:
+ import numpy as np
=====================================
debian/patches/python3
=====================================
@@ -0,0 +1,74 @@
+From: Michael R. Crusoe <crusoe at debian.org>
+Subject: ensure that Python3 is being used
+--- pycorrfit.orig/docs/README.md
++++ pycorrfit/docs/README.md
+@@ -17,4 +17,4 @@
+ =====
+ To view the sphinx inventory of PyCorrFit, run
+
+- python -m sphinx.ext.intersphinx 'http://pycorrfit.readthedocs.io/en/latest/objects.inv'
++ python3 -m sphinx.ext.intersphinx 'http://pycorrfit.readthedocs.io/en/latest/objects.inv'
+--- pycorrfit.orig/docs/sec_contribute.rst
++++ pycorrfit/docs/sec_contribute.rst
+@@ -91,7 +91,7 @@
+
+ ::
+
+- python setup.py test
++ python3 setup.py test
+
+
+ Pull request guidelines
+--- pycorrfit.orig/pycorrfit/_version.py
++++ pycorrfit/pycorrfit/_version.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ """Determine package version for git repositories from tags
+
+ Each time this file is imported it checks if the ".git" folder is
+@@ -84,7 +84,7 @@
+
+ def save_version(version, versionfile):
+ """save version to version_save.py"""
+- data = "#!/usr/bin/env python\n" \
++ data = "#!/usr/bin/env python3\n" \
+ + "# This file was created automatically\n" \
+ + "longversion = '{VERSION}'\n"
+ try:
+@@ -131,7 +131,7 @@
+
+ if not hasattr(sys, 'frozen'):
+ # Save the version to `_version_save.py` to allow distribution using
+- # `python setup.py sdist`.
++ # `python3 setup.py sdist`.
+ # This is only done if the program is not frozen (with e.g.
+ # pyinstaller),
+ if longversion != load_version(versionfile):
+--- pycorrfit.orig/tests/README.md
++++ pycorrfit/tests/README.md
+@@ -3,7 +3,7 @@
+
+ Execute all tests using `setup.py` in the parent directory:
+
+- python setup.py test
++ python3 setup.py test
+
+
+ ### Running single tests
+@@ -11,7 +11,7 @@
+ Directly execute the scripts, e.g.
+
+
+- python test_simple.py
++ python3 test_simple.py
+
+
+
+--- pycorrfit.orig/pycorrfit/_version_save.py
++++ pycorrfit/pycorrfit/_version_save.py
+@@ -1,3 +1,3 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # This file was created automatically
+ longversion = '1.1.7'
=====================================
debian/patches/series
=====================================
@@ -1 +1,3 @@
+python3
+distutils
fix_doc.patch
=====================================
debian/pycorrfit.install
=====================================
@@ -1,3 +1,2 @@
debian/pycorrfit.desktop usr/share/applications/
examples/external_model_functions/ usr/share/doc/pycorrfit/examples
-examples/sample_sessions/ usr/share/doc/pycorrfit/examples
=====================================
debian/rules
=====================================
@@ -31,18 +31,10 @@ FAKETIME = faketime -f "$(DEB_DATE_RFC_3339)"
%:
dh $@ --buildsystem=pybuild
-override_dh_auto_clean:
+execute_before_dh_auto_clean:
touch doc/PyCorrFit_doc.pdf
- dh_auto_clean
- rm -f PyCorrFit_doc.pdf
- rm -f doc/PyCorrFit_doc.aux doc/PyCorrFit_doc.bbl doc/PyCorrFit_doc.blg doc/PyCorrFit_doc.log doc/PyCorrFit_doc.out doc/PyCorrFit_doc.pdf doc/PyCorrFit_doc.synctex.gz doc/PyCorrFit_doc.toc doc/PyCorrFit_doc_content.aux
- rm -rf pycorrfit.egg-info/
- rm -f pycorrfit/_version_save.py
- rm -f pycorrfit/readfiles/read_pt3_scripts/fib4.c
- rm -rf .pytest_cache
-
-override_dh_auto_build:
+execute_before_dh_auto_build:
cd $(DOCDIR) && \
$(FAKETIME) $(PDFLATEX) && \
bibtex $(BIBDOC) && \
@@ -51,7 +43,6 @@ override_dh_auto_build:
rm -f $(PDF); ln -s $(DOCDIR)/$(PDF)
convert -background "rgba(255,255,255,0)" -geometry 32x32 \
$(DOCDIR)/Images/PyCorrFit_icon.svg debian/pycorrfit.xpm
- dh_auto_build
override_dh_install:
dh_install -X__pycache__ -X.*pyc
@@ -68,17 +59,15 @@ execute_after_dh_install:
$(CURDIR)/debian/$(DEB_SOURCE)/usr/share/doc/pycorrfit
rm -rf $(CURDIR)/debian/$(DEB_SOURCE)/usr/pycorrfit_doc
-override_dh_fixperms:
- dh_fixperms
+execute_after_dh_fixperms:
find debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/examples -type f -name "*.txt" -exec chmod 644 \{\} \;
override_dh_compress:
- dh_compress -Xsample_sessions -Xexternal_model_functions
+ dh_compress -Xexternal_model_functions
-override_dh_installexamples:
+execute_before_dh_installexamples:
tar --sort=name \
--mtime="@${SOURCE_DATE_EPOCH}" \
--owner=root --group=root --numeric-owner \
--mode=go=rX,u+rw,a-s \
-cJf $(CURDIR)/debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/examples/tests.tar.xz tests/
- dh_installexamples
=====================================
debian/watch
=====================================
@@ -1,4 +1,3 @@
version=4
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
-filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/pycorrfit-$1\.tar\.gz/,dversionmangle=s/\+dfsg.*$//,repacksuffix=+dfsg,repack \
- https://github.com/paulmueller/PyCorrFit/tags .*/v?(\d\S*)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/,dversionmangle=s/[\+~](nopack)(\.)?(\d+)?$// \
+https://pypi.debian.net/pycorrfit/pycorrfit-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
=====================================
doc/PyCorrFit_doc.pdf
=====================================
Binary files /dev/null and b/doc/PyCorrFit_doc.pdf differ
=====================================
examples/sample_sessions/CSFCS_DiO-in-DOPC.pcfs deleted
=====================================
Binary files a/examples/sample_sessions/CSFCS_DiO-in-DOPC.pcfs and /dev/null differ
=====================================
examples/sample_sessions/ConfocalFCS_Alexa488_xcorr.pcfs deleted
=====================================
Binary files a/examples/sample_sessions/ConfocalFCS_Alexa488_xcorr.pcfs and /dev/null differ
=====================================
pycorrfit.egg-info/PKG-INFO
=====================================
@@ -0,0 +1,46 @@
+Metadata-Version: 2.1
+Name: pycorrfit
+Version: 1.1.7
+Summary: Scientific tool for fitting correlation curves on a logarithmic plot.
+Home-page: https://github.com/FCS-analysis/PyCorrFit
+Author: Paul Müller
+Author-email: dev at craban.de
+License: GPL v2
+Description: |PyCorrFit|
+ ===========
+
+ |PyPI Version| |Build Status Win| |Build Status Travis| |Coverage Status| |Docs Status|
+
+
+ Documentation
+ -------------
+ The documentation of PyCorrFit is available at https://pycorrfit.readthedocs.org.
+
+
+ Problems
+ --------
+ If you find a bug or need help with a specific topic, do not hesitate to ask a question
+ at the `issues page <https://github.com/FCS-analysis/PyCorrFit/wiki/Creating-a-new-issue>`__.
+
+
+
+ .. |PyCorrFit| image:: https://raw.github.com/FCS-analysis/PyCorrFit/master/doc/Images/PyCorrFit_logo_dark.png
+ .. |PyPI Version| image:: https://img.shields.io/pypi/v/PyCorrFit.svg
+ :target: https://pypi.python.org/pypi/pycorrfit
+ .. |Build Status Win| image:: https://img.shields.io/appveyor/ci/paulmueller/PyCorrFit/master.svg?label=win
+ :target: https://ci.appveyor.com/project/paulmueller/pycorrfit
+ .. |Build Status Travis| image:: https://img.shields.io/travis/FCS-analysis/PyCorrFit/master.svg?label=linux_osx
+ :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/
+
+Keywords: fluorescence correlation spectroscopy
+Platform: ALL
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Scientific/Engineering :: Visualization
+Classifier: Intended Audience :: Science/Research
+Requires-Python: >=3.6, <4
+Provides-Extra: GUI
=====================================
pycorrfit.egg-info/SOURCES.txt
=====================================
@@ -0,0 +1,153 @@
+CHANGELOG
+LICENSE
+MANIFEST.in
+README.rst
+setup.cfg
+setup.py
+doc/Bibliography.bib
+doc/PyCorrFit_doc.pdf
+doc/PyCorrFit_doc.tex
+doc/PyCorrFit_doc_content.tex
+doc/PyCorrFit_doc_models.tex
+doc/README.md
+doc/Images/PyCorrFit_Screenshot_CSFCS.png
+doc/Images/PyCorrFit_Screenshot_Main.png
+doc/Images/PyCorrFit_icon.png
+doc/Images/PyCorrFit_icon.svg
+doc/Images/PyCorrFit_icon_dark.svg
+doc/Images/PyCorrFit_logo.svg
+doc/Images/PyCorrFit_logo_dark.pdf
+doc/Images/PyCorrFit_logo_dark.png
+doc/Images/PyCorrFit_logo_dark.svg
+docs/README.md
+docs/conf.py
+docs/index.rst
+docs/requirements.txt
+docs/sec_about.rst
+docs/sec_changelog.rst
+docs/sec_contribute.rst
+docs/sec_gallery.rst
+docs/sec_getting_started.rst
+docs/_static/PyCorrFit_logo_dark.png
+docs/extensions/github_changelog.py
+docs/extensions/simple_gallery.py
+docs/gallery/Screenshot_Desktop.png
+docs/gallery/Screenshot_Desktop_Mac.png
+docs/gallery/Screenshot_Desktop_Raspbian_Jessie.png
+docs/gallery/Screenshot_Desktop_Win.png
+docs/gallery/Screenshot_Graphics_output.png
+docs/gallery/Screenshot_Main.png
+docs/gallery/Screenshot_Select_curves.png
+docs/gallery/Screenshot_Trace_view.png
+examples/external_model_functions/ExampleFunc_CS_2D+2D+S+T.txt
+examples/external_model_functions/ExampleFunc_CS_3D+S+T.txt
+examples/external_model_functions/ExampleFunc_Exp_correlated_noise.txt
+examples/external_model_functions/ExampleFunc_SFCS_1C_2D_Autocorrelation.txt
+examples/external_model_functions/ExampleFunc_SFCS_1C_2D_Cross-correlation.txt
+examples/external_model_functions/ExampleFunc_TIRF_zOnly.txt
+examples/external_model_functions/Model_AC_3D+T_confocal.txt
+examples/external_model_functions/Model_Flow_AC_3D_confocal.txt
+examples/external_model_functions/Model_Flow_CC_Backward_3D_confocal.txt
+examples/external_model_functions/Model_Flow_CC_Forward_3D_confocal.txt
+pycorrfit/PyCorrFit.py
+pycorrfit/__init__.py
+pycorrfit/__main__.py
+pycorrfit/_version.py
+pycorrfit/_version_save.py
+pycorrfit/correlation.py
+pycorrfit/fit.py
+pycorrfit/meta.py
+pycorrfit/openfile.py
+pycorrfit/trace.py
+pycorrfit.egg-info/PKG-INFO
+pycorrfit.egg-info/SOURCES.txt
+pycorrfit.egg-info/dependency_links.txt
+pycorrfit.egg-info/entry_points.txt
+pycorrfit.egg-info/requires.txt
+pycorrfit.egg-info/top_level.txt
+pycorrfit/gui/__init__.py
+pycorrfit/gui/contribute.py
+pycorrfit/gui/doc.py
+pycorrfit/gui/edclasses.py
+pycorrfit/gui/frontend.py
+pycorrfit/gui/icon.py
+pycorrfit/gui/main.py
+pycorrfit/gui/misc.py
+pycorrfit/gui/page.py
+pycorrfit/gui/plotting.py
+pycorrfit/gui/threaded_progress.py
+pycorrfit/gui/update.py
+pycorrfit/gui/usermodel.py
+pycorrfit/gui/wxutils.py
+pycorrfit/gui/tools/__init__.py
+pycorrfit/gui/tools/average.py
+pycorrfit/gui/tools/background.py
+pycorrfit/gui/tools/batchcontrol.py
+pycorrfit/gui/tools/chooseimport.py
+pycorrfit/gui/tools/comment.py
+pycorrfit/gui/tools/datarange.py
+pycorrfit/gui/tools/example.py
+pycorrfit/gui/tools/globalfit.py
+pycorrfit/gui/tools/info.py
+pycorrfit/gui/tools/overlaycurves.py
+pycorrfit/gui/tools/parmrange.py
+pycorrfit/gui/tools/plotexport.py
+pycorrfit/gui/tools/simulation.py
+pycorrfit/gui/tools/statistics.py
+pycorrfit/gui/tools/trace.py
+pycorrfit/models/MODEL_TIRF_1C.py
+pycorrfit/models/MODEL_TIRF_2D2D.py
+pycorrfit/models/MODEL_TIRF_3D2D.py
+pycorrfit/models/MODEL_TIRF_3D2Dkin_Ries.py
+pycorrfit/models/MODEL_TIRF_3D3D.py
+pycorrfit/models/MODEL_TIRF_gaussian_1C.py
+pycorrfit/models/MODEL_TIRF_gaussian_3D2D.py
+pycorrfit/models/MODEL_TIRF_gaussian_3D3D.py
+pycorrfit/models/__init__.py
+pycorrfit/models/classes.py
+pycorrfit/models/control.py
+pycorrfit/models/cp_confocal.py
+pycorrfit/models/cp_mix.py
+pycorrfit/models/cp_triplet.py
+pycorrfit/models/model_confocal_2d.py
+pycorrfit/models/model_confocal_2d_2d.py
+pycorrfit/models/model_confocal_3d.py
+pycorrfit/models/model_confocal_3d_2d.py
+pycorrfit/models/model_confocal_3d_3d.py
+pycorrfit/models/model_confocal_t_2d.py
+pycorrfit/models/model_confocal_t_2d_2d.py
+pycorrfit/models/model_confocal_t_3d.py
+pycorrfit/models/model_confocal_t_3d_2d.py
+pycorrfit/models/model_confocal_t_3d_3d.py
+pycorrfit/models/model_confocal_t_3d_3d_2d.py
+pycorrfit/models/model_confocal_t_3d_3d_3d.py
+pycorrfit/models/model_confocal_tt_2d.py
+pycorrfit/models/model_confocal_tt_2d_2d.py
+pycorrfit/models/model_confocal_tt_3d.py
+pycorrfit/models/model_confocal_tt_3d_2d.py
+pycorrfit/models/model_confocal_tt_3d_3d.py
+pycorrfit/readfiles/__init__.py
+pycorrfit/readfiles/read_ASC_ALV.py
+pycorrfit/readfiles/read_CSV_PyCorrFit.py
+pycorrfit/readfiles/read_FCS_Confocor3.py
+pycorrfit/readfiles/read_SIN_correlator_com.py
+pycorrfit/readfiles/read_mat_ries.py
+pycorrfit/readfiles/read_pt3_PicoQuant.py
+pycorrfit/readfiles/util.py
+pycorrfit/readfiles/read_pt3_scripts/README
+pycorrfit/readfiles/read_pt3_scripts/__init__.py
+pycorrfit/readfiles/read_pt3_scripts/__version__.py
+pycorrfit/readfiles/read_pt3_scripts/correlation_methods.py
+pycorrfit/readfiles/read_pt3_scripts/correlation_objects.py
+pycorrfit/readfiles/read_pt3_scripts/fib4.pyx
+pycorrfit/readfiles/read_pt3_scripts/fitting_methods.py
+pycorrfit/readfiles/read_pt3_scripts/import_methods.py
+tests/README.md
+tests/data_file_dl.py
+tests/test_constraints.py
+tests/test_file_formats.py
+tests/test_fit_model_gaussian.py
+tests/test_fit_models.py
+tests/test_global_fit.py
+tests/test_session.py
+tests/test_simple.py
\ No newline at end of file
=====================================
pycorrfit.egg-info/dependency_links.txt
=====================================
@@ -0,0 +1 @@
+
=====================================
pycorrfit.egg-info/entry_points.txt
=====================================
@@ -0,0 +1,3 @@
+[gui_scripts]
+pycorrfit = pycorrfit.gui.main:Main
+
=====================================
pycorrfit.egg-info/requires.txt
=====================================
@@ -0,0 +1,10 @@
+lmfit>=0.9.2
+numpy>=1.14.2
+pyyaml>=3.12
+scipy>=1.0.1
+
+[GUI]
+matplotlib>=2.2.2
+sympy>=1.1.1
+simplejson
+wxPython>=4.0.1
=====================================
pycorrfit.egg-info/top_level.txt
=====================================
@@ -0,0 +1 @@
+pycorrfit
=====================================
pycorrfit/_version_save.py
=====================================
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+# This file was created automatically
+longversion = '1.1.7'
=====================================
pycorrfit/readfiles/read_pt3_scripts/LICENSE deleted
=====================================
@@ -1,340 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- {description}
- Copyright (C) {year} {fullname}
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- {signature of Ty Coon}, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
-
=====================================
setup.cfg
=====================================
@@ -1,6 +1,10 @@
[aliases]
-test=pytest
+test = pytest
[metadata]
license_file = LICENSE
+[egg_info]
+tag_build =
+tag_date = 0
+
View it on GitLab: https://salsa.debian.org/med-team/pycorrfit/-/compare/0542ecdeb0353077245972d8810a55ce91deb75e...3962e2a97c1af39218fd3a2edc75c32b82f4d4d4
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/pycorrfit/-/compare/0542ecdeb0353077245972d8810a55ce91deb75e...3962e2a97c1af39218fd3a2edc75c32b82f4d4d4
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/20240706/9480b179/attachment-0001.htm>
More information about the debian-med-commit
mailing list