Merge pull request #229 from PiRK/debian_5.3.1

Debian 8 packaging 5.3.1. Thanks!
vasole · Apr 27, 2018 · 0972ac8 · 0972ac8
2 parents b2e5707 + 3ce3747
commit 0972ac8
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 9 deletions.
diff --git a/PyMca5/PyMcaGui/pymca/Median2DBrowser.py b/PyMca5/PyMcaGui/pymca/Median2DBrowser.py
@@ -28,15 +28,18 @@
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
 import numpy
+DEBUG = 0
 try:
     from PyMca5.PyMcaGui.pymca import StackBrowser
     from PyMca5.PyMcaMath.PyMcaSciPy.signal import median
 except ImportError:
-    print("Median2DBrowser problem!")
+    if DEBUG:
+        import traceback
+        print("Median2DBrowser problem!")
+        print(traceback.format_exc())
 
 medfilt2d = median.medfilt2d
 qt = StackBrowser.qt
-DEBUG = 0
 
 class MedianParameters(qt.QWidget):
     def __init__(self, parent=None, use_conditional=False):

diff --git a/PyMca5/PyMcaGui/pymca/QStackWidget.py b/PyMca5/PyMcaGui/pymca/QStackWidget.py
@@ -39,6 +39,12 @@
     QString = qt.QString
 else:
     QString = qt.safe_str
+try:
+    # try to import silx prior to importing matplotlib
+    # to prevent unnecessary warning
+    import silx.gui.plot
+except:
+    pass
 
 from PyMca5.PyMcaGui import PyMcaFileDialogs
 from PyMca5.PyMcaCore import DataObject

diff --git a/PyMca5/PyMcaIO/BAXSCSVFileParser.py b/PyMca5/PyMcaIO/BAXSCSVFileParser.py
@@ -194,6 +194,7 @@ def isBAXSCSVFile(filename):
     except:
         f.close()
         return False
+    f.close()
     try:
         if filename.lower().endswith(".csv"):
             if line.startswith("Bruker AXS") or \

diff --git a/PyMca5/PyMcaIO/OlympusCSVFileParser.py b/PyMca5/PyMcaIO/OlympusCSVFileParser.py
@@ -219,6 +219,7 @@ def isOlympusCSVFile(filename):
     except:
         f.close()
         return False
+    f.close()
     line = line.replace("\x00","")
     try:
         if filename.lower().endswith(".csv"):

diff --git a/PyMca5/PyMcaIO/ThermoEMSFileParser.py b/PyMca5/PyMcaIO/ThermoEMSFileParser.py
@@ -246,6 +246,7 @@ def isThermoEMSFile(filename):
     except:
         f.close()
         return False
+    f.close()
     try:
         if filename.lower().endswith(".ems"):
             if line.startswith("#FORMAT") or \

diff --git a/PyMca5/PyMcaPhysics/xrf/Elements.py b/PyMca5/PyMcaPhysics/xrf/Elements.py
@@ -2703,6 +2703,7 @@ def getelementmassattcoef(ele,energy=None):
                 Element[ele]['xcom']['pair'][i] += float(value)
                 i += 1
             line = f.readline()
+        f.close()
         if sys.version >= '3.0':
             # next line gave problems under under windows
             # just try numpy.argsort([1,1,1,1,1]) under linux and windows to see

diff --git a/package/debian8/changelog b/package/debian8/changelog
@@ -1,3 +1,9 @@
+pymca (5.3.1-1) unstable; urgency=low
+
+  * New release 5.3.1
+
+ -- Pierre Knobel <[email protected]>  Thu, 27 Apr 2018 10:01:17 +0200
+
 pymca (5.3.0-2) unstable; urgency=low
 
   * New release 5.3.0

diff --git a/package/debian8/rules b/package/debian8/rules
@@ -25,6 +25,10 @@ override_dh_clean:
 	# remove the build documentation
 	rm -rf doc/build
 
+override_dh_auto_build:
+	dh_auto_build
+	python setup.py build build_doc
+
 override_dh_installchangelogs:
 	dh_installchangelogs changelog.txt
 
@@ -58,10 +62,6 @@ override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="cd {build_dir} && PYMCA_DATA_DIR=$(PYMCA_DATA_DIR_TEST) {interpreter} PyMca5/tests/TestAll.py" dh_auto_test
 
-override_dh_sphinxdoc:
-ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	PYBUILD_SYSTEM=custom \
-	PYBUILD_BUILD_ARGS="cd doc && PYTHONPATH={build_dir} PYMCA_DATA_DIR=$(PYMCA_DATA_DIR_TEST) http_proxy='127.0.0.1:9' sphinx-build -N -bhtml source build/html" dh_auto_build  # HTML generator
-	dh_installdocs "doc/build/html" -p pymca-doc
-	dh_sphinxdoc -O--buildsystem=pybuild
-endif
+override_dh_installdocs:
+	dh_installdocs "build/sphinx/html" -p pymca-doc
+	dh_installdocs