Merge branch 'master' of https://git.lemmasoftware.org/akvo

akvo/gui/akvoGUI.py

@@ -1,6 +1,6 @@
 #/usr/bin/env python 
 import sys
-import readline
+#import readline
 try: 
     from akvo.gui.main_ui import Ui_MainWindow
     uicerr = False

akvo/tressel/filtfilt.py

@@ -35,11 +35,11 @@ def filtfilt(b,a,x):
     edge=ntaps*3
 
     if x.ndim != 1:
-        raise ValueError, "Filiflit is only accepting 1 dimension arrays."
+        raise ValueError("Filiflit is only accepting 1 dimension arrays.")
 
     #x must be bigger than edge
     if x.size < edge:
-        raise ValueError, "Input vector needs to be bigger than 3 * max(len(a),len(b)."
+        raise ValueError("Input vector needs to be bigger than 3 * max(len(a),len(b).")
 
     if len(a) < ntaps:
         a=r_[a,zeros(len(b)-len(a))]

setup.py

@@ -1,19 +1,6 @@
 #!/usr/bin/env python
-import sys
 
-# optionally use qt4
-# if sys.argv[1] == "build_ui":
-#     try:
-#         from pyqt_distutils.build_ui import build_ui
-#         cmdclass = {'build_ui': build_ui}
-#     except ImportError:
-#         build_ui = None  # user won't have pyqt_distutils when deploying
-#         cmdclass = {}
-# else:
-#     build_ui = None  # user won't have pyqt_distutils when deploying
-#     cmdclass = {}
-
-# Require PyQt5 and compiltion of GUI files via pyuic 
+# Requires PyQt5 and compiltion of GUI files via pyuic 
 from setuptools import setup, Extension
 from setuptools.command.build_py import build_py
 from pyqt_distutils.build_ui import build_ui
@@ -23,16 +10,6 @@ class custom_build_py(build_py):
         self.run_command('build_ui')
         build_py.run(self)
 
-try:
-    from Cython.Build import cythonize as cythonise
-except ImportError:
-    def cythonise(*args, **kwargs):
-        #from Cython.Build import cythonize
-        #return cythonize(*args, **kwargs)
-        return 
-
-#from distutils.core import setup
-
 setup(name='Akvo',
       version='1.0.5',
       description='Surface nuclear magnetic resonance workbench',
@@ -42,7 +19,8 @@ setup(name='Akvo',
       #setup_requires=['PyQt5'],
       setup_requires=[
         # Setuptools 18.0 properly handles Cython extensions.
-        'PyQt5','setuptools>=18.0',
+        #'PyQt', 
+        'pyqt_distutils','setuptools>=18.0',
       ],
 #      ext_modules = cythonise("akvo/tressel/*.pyx"), 
 #      build_requires=['cython'],
@@ -52,7 +30,7 @@ setup(name='Akvo',
           'matplotlib',
           'scipy',
           'numpy',
-          'PyQt5',
+#          'PyQt5',
           'pyyaml',
           'pyqt-distutils',
           'cmocean'
@@ -69,7 +47,6 @@ setup(name='Akvo',
           'build_ui': build_ui,
           'build_py': custom_build_py,
       },
-      #cmdclass=cmdclass,
       # Mechanism to include auxiliary files
       include_package_data=True,
       package_data={