CHANGELOG

+0.3.5
+ - maintenance release
+0.3.4
+ - maintenance release
+0.3.3
+ - setup: Windows installers are available again
+   (https://github.com/astropy/astropy/issues/7052)
 0.3.2
  - fix: refactor code for opening .dat files; moved from a Cython
    module to a pure Python module due to errors on big-endian

README.rst

@@ -12,12 +12,15 @@ fluctuating fluorescence signal from such measurements and applies a multiple-ta
 algorithm. The obtained correlation curves can be evaluated using
 `PyCorrFit <https://github.com/FCS-analysis/PyCorrFit>`__.
 
+
 Getting started
 ===============
 
 Installation
 ------------
 Installers for PyScanFCS are available at the `release page <https://github.com/FCS-analysis/PyScanFCS/releases>`__.
+Alternatively, install with ``pip install pyscanfcs``.
+
 
 Documentation
 -------------
@@ -27,7 +30,7 @@ functions is available as a `PDF file <https://github.com/FCS-analysis/PyScanFCS
 
 
 .. |PyScanFCS| image:: https://raw.github.com/FCS-analysis/PyScanFCS/master/doc/Images/PyScanFCS_logo_dark.png
-.. |PyPI Version| image:: http://img.shields.io/pypi/v/PyScanFCS.svg
+.. |PyPI Version| image:: https://img.shields.io/pypi/v/PyScanFCS.svg
    :target: https://pypi.python.org/pypi/pyscanfcs
 .. |Build Status Win| image:: https://img.shields.io/appveyor/ci/paulmueller/PyScanFCS/master.svg?label=win
    :target: https://ci.appveyor.com/project/paulmueller/pyscanfcs

debian/changelog

+pyscanfcs (0.3.5+ds-1) unstable; urgency=medium
+
+  * New upstream version 0.3.5+ds
+  * Update maintainers email address in d/copyright
+  * Update d/control, use debhelper-compat, drop d/compat, bump Policy to 4.4.0
+  * Run latex, bibtex, latex, latex mantra sequentially
+  * Run latex twice before bibtex to solve problem with unresolved references
+  * Respect 'nocheck' in DEB_BUILD_OPTIONS
+
+ -- Alexandre Mestiashvili <mestia@debian.org>  Mon, 09 Sep 2019 11:50:32 +0200
+
 pyscanfcs (0.3.2+ds-2) unstable; urgency=medium
 
   * Team upload.

debian/compat

-11

debian/control

@@ -4,7 +4,7 @@ Uploaders: Alexandre Mestiashvili <mestia@debian.org>
 Section: python
 Priority: optional
 Build-Depends: cython3,
-               debhelper (>= 11),
+               debhelper-compat (= 12),
                dh-python,
                faketime,
                imagemagick,
@@ -24,14 +24,16 @@ Build-Depends: cython3,
                texlive-latex-extra,
                texlive-latex-recommended,
                texlive-science
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/med-team/pyscanfcs
 Vcs-Git: https://salsa.debian.org/med-team/pyscanfcs.git
 Homepage: https://fcs-analysis.github.io/PyScanFCS/
 
 Package: pyscanfcs
 Architecture: any
-Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
 Description: scientific tool for perpendicular line scanning FCS
  When a membrane is scanned perpendicularly to its surface,
  the fluorescence signal originating from the membrane itself

debian/copyright

@@ -13,7 +13,7 @@ Copyright: 2013 Paul Mueller <paul.mueller@biotec.tu-dresden.de>
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2013 Alexandre Mestiashvili <alex@biotec.tu-dresden.de>
+Copyright: 2013 Alex Mestiashvili <mestia@debian.orrg>
 License: GPL-2+
 
 License: GPL-2+

debian/rules

@@ -16,7 +16,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export PYBUILD_NAME=$(pkg)
 export PYBUILD_INSTALL_ARGS_python3=--install-lib=/usr/lib/${PYBUILD_NAME}
 export PYBUILD_TEST_PYTEST=1
-
+ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+        export PYBUILD_TEST_PYTEST=0
+endif
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
@@ -27,11 +29,11 @@ override_dh_auto_clean:
 
 override_dh_auto_build:
 	cd $(DOCDIR) && \
-	(   $(FAKETIME) $(PDFLATEX) \
-		bibtex $(BIBDOC) \
-		$(FAKETIME) $(PDFLATEX) \
 	$(FAKETIME) $(PDFLATEX) \
-	)
+	$(FAKETIME) $(PDFLATEX) && \
+	bibtex $(BIBDOC) && \
+	$(FAKETIME) $(PDFLATEX) && \
+	$(FAKETIME) $(PDFLATEX)
 	rm -f $(PDF); ln -s $(DOCDIR)/$(PDF)
 	convert -background "rgba(255,255,255,0)" -geometry 32x32 \
 		$(DOCDIR)/Images/PyScanFCS_icon.svg debian/pyscanfcs.xpm

docs/sec_getting_started.rst

@@ -5,7 +5,6 @@ Getting started
 Installation
 ------------
 - Windows installers for PyScanFCS are available at the `release page <https://github.com/FCS-analysis/PyScanFCS/releases>`_.
-  Note: The installer is currently broken because astropy cannot be frozen, see https://github.com/astropy/astropy/issues/7052.
 - On Debian-based systems, install via ``apt-get install pyscanfcs``.
 - If you have Python 3.6 installed, you may install PyScanFCS via ``pip install pyscanfcs``.
   After the installation, type ``pyscanfcs`` in a command shell to start PyScanFCS.

pyscanfcs/_version.py

@@ -138,4 +138,4 @@ if True:  # pragma: no cover
             save_version(longversion, versionfile)
 
     # PEP 440-conform development version:
-    version = ".dev".join(longversion.split("-")[:2])
+    version = ".post".join(longversion.split("-")[:2])

pyscanfcs/gui_wx/main.py

@@ -962,7 +962,7 @@ class MyFrame(wx.Frame):
         self.Bind(wx.EVT_MENU, self.OnMenuDocumentation, menuDocu)
         self.Bind(wx.EVT_MENU, self.OnMenuWiki, menuWiki)
 
-    def OnBinning_Prebin(self, event=None):
+    def OnBinning_Prebin(self, e=None):
         """ Do prebinngin using *Bin_Photon_Events()* """
         n_events = self.BoxPrebin[2].GetValue()
         if self.BoxPrebin[6].GetValue() == False:
@@ -987,7 +987,7 @@ class MyFrame(wx.Frame):
         self.Update()
         self.PlotImage()
 
-    def OnBinning_Total(self, event=None):
+    def OnBinning_Total(self, e=None):
         if self.BoxPrebin[6].GetValue() == False:
             # from µs to system clock ticks
             t_bin = self.BoxPrebin[4].GetValue() * self.system_clock
@@ -1010,7 +1010,7 @@ class MyFrame(wx.Frame):
         # Then Plot the data somehow
         self.PlotImage()
 
-    def OnFindLineScanTime(self, event):
+    def OnFindLineScanTime(self, e=None):
         """
         Find the time that the confocal microscope uses to capture a line
         of data. This is done via FFT.
@@ -1091,7 +1091,7 @@ class MyFrame(wx.Frame):
         self.BoxPrebin[6].Enable()
         # self.Update()
 
-    def OnMenuAbout(self, event):
+    def OnMenuAbout(self, e=None):
         # Show About Information
         description = doc.description()
         licence = doc.licence()
@@ -1125,16 +1125,16 @@ class MyFrame(wx.Frame):
                 # defaults to linux style:
                 os.system("xdg-open " + filename + " &")
 
-    def OnMenuExit(self, e):
+    def OnMenuExit(self, e=None):
         # Exit the Program
         self.Close(True)  # Close the frame.
 
-    def OnMenuSoftware(self, event):
+    def OnMenuSoftware(self, e=None):
         # Show About Information
         text = doc.SoftwareUsed()
         wx.MessageBox(text, 'Software', wx.OK | wx.ICON_INFORMATION)
 
-    def OnMenuSupport(self, event):
+    def OnMenuSupport(self, e=None):
         # Show About Information
         text = doc.support
         wx.MessageBox(text, 'Support', wx.OK | wx.ICON_INFORMATION)
@@ -1482,7 +1482,7 @@ class MyFrame(wx.Frame):
 
         wx.EndBusyCursor()
 
-    def OnOpenBinned(self, e):
+    def OnOpenBinned(self, e=None):
         # Open a data file
         """Import experimental data from a file."""
         dlg = wx.FileDialog(self, "Choose a binned data file", self.dirname, "",
@@ -1523,7 +1523,7 @@ class MyFrame(wx.Frame):
             self.PlotImage()
 
     # Current
-    def OnOpenStream(self, e):
+    def OnOpenStream(self, e=None):
         # Open a data file
         """
         We open a .dat file as produced by the "Flex02-12D" correlator in photon
@@ -1579,7 +1579,7 @@ class MyFrame(wx.Frame):
             self.plotarea.UseRectangleSelector()
         self.Update()
 
-    def OnSaveFits(self, e):
+    def OnSaveFits(self, e=None):
         # Save the Data
         """ Save binned data as a 2d array (image) """
         if self.filename[-4:] == ".dat":
@@ -1639,7 +1639,7 @@ class MyFrame(wx.Frame):
             hdulist.writeto(os.path.join(
                 self.dirname, newfilename), clobber=True)
 
-    def OnSaveDat(self, e):
+    def OnSaveDat(self, e=None):
         # Save the Data
         """
         Save experimental data as 32bit format.

setup.py

@@ -70,7 +70,7 @@ setup(
         "numpy>=1.5.1",
         "scikit-image>=0.13.1",
         "scipy>=0.8.0",
-        "wxpython>=4.0.1",
+        "wxpython>=4.0.3",
         ],
     setup_requires=['cython', 'numpy', 'pytest-runner'],
     tests_require=["pytest"],