added conda_requirements.txt for easier installation on conda and added this to the readme.

also automated the detection of the pyqt version, as to avoid the need for a QT_API environment variable if using PyQt5.

Author: mgotz

README.md

@@ -8,17 +8,28 @@ In addition, there is GUI, which is run from the gui.main.run, with the run.py o
 
 ## Installation
 
-The GUI is built on PyQt4, which can not be specified as a real dependency because it is not on PyPi.
-It requires a working Qt4 installation and needs to be installed via system repositories.
-Most python instalations should come with it as spyder also uses it, but maybe very recent installations forgo it for the newer PyQt5, which offers more flexible licensing.
-Maybe a future version will also support PyQt5 or PySide, but at the moment this only works with PyQt4.
-
-Download and switch to the extracted directory. Then run 
+The GUI is built on PyQt, PyQt4 and PyQt5 both should work. 
+However, at least PyQt4 can not be specified as a real dependency because it is not on PyPi.
+Therefore, you should take care of installing those beforehand.
+Most Python installations should come with one of them installed, as the Spyder IDE also uses it.
+
+If you use conda (probably the best way to go on Windows) it's best if you install the dependencies through conda, before installing EBT_evaluation.
+This is because the EBT_evalauation whill use pip to resolve its dependencies and you will end up with a mix of conda and pip packages.
+Use 
+> conda install --yes --file conda_requirements.txt
+to install all the conda available packages.
+
+Subesquently, download EBT_avaluation and switch to the extracted directory. Then run 
 > pip install . --process-dependency-links --allow-all-external
 
 This will trigger a depreciation warning, but there is no other way for external dependencies and it has been depreciated but not removed for several years.
 It should install the EBT_evaluation and all its dependencies, including my own modules from github.
-In addition it will create a script/executable called *EBT-evaluation*.
+If your installation uses pip to manage all of pyhton, i.e. you are on Linux, then this command alone should do it all, no need for the conda_requirements.txt.
+
+If you installed the conda_requirements beforehand this should only pull mg_* modules and the formlayout modules. 
+If it installs additional stuff through pip than that you may want to uninstall those modules with pip and reinstall them using conda.
+
+In addition the installation will create a script/executable called *EBT-evaluation*.
 You can use this script/executable to directly run the GUI, on Linux just call EBT-evaluation from the terminal, on Winows the .exe should be in python-directory/Scripts.
 
 If pip is somehow unavailable
@@ -31,7 +42,8 @@ However, pip is most likely to get all the dependencies correctly figured out.
 
 If none of these work, you can also download the dependencies manually and install them.
 Get the PyGUITools and PyDataProcessing repositories from my github and install them using their respective setup.py.
-Then install the EBTtools and resolve all other dependencies, primarily those should be PyQt4, matplotlib, scipy and pillow.
-The GUI can be run using the creaed *EBT-evaluation* script/executable or using the run.py.
+Then install the EBTtools and resolve all other dependencies, primarily those should be PyQt4/5, matplotlib, scipy and pillow. 
+On Python2.7 also future and configparser.
+The GUI can be run using the created *EBT-evaluation* script/executable or using the run.py.
 
 If all fails, copy the mg directories in those repositories into the same directory as the run.py and then it should find what it needs.

conda_requirements.txt

@@ -0,0 +1,7 @@
+matplotlib>=2.0.0
+scipy>=0.18.1
+numpy>=1.12.1
+pillow>=5.0.0
+pyqt>=5.0
+sip>=4.0.0
+future>=0.16.0

ebttools/gui/__init__.py

@@ -1,28 +1,39 @@
-#enusre usage of PyQt4 and avoid something using PyQt5 instead
-#a perfect, future version would be able to use either PyQt4 or PyQt5
 import os
-#enable compatibility to both pyqt4 and pyqt5 and load the proper modules
-_modname = os.environ.setdefault('QT_API', 'pyqt')
-assert _modname in ('pyqt', 'pyqt5')
 
+defaultAPI = 'pyqt'
+
+#ensure API v2 for pyqt (native python data types) pyqt5 only offers this API
+#hopefully setting it for PyQt5 does not cause errors
+import sip
+API_NAMES = ("QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", 
+			 "QVariant")
+API_VERSION = 2
+for name in API_NAMES:
+	sip.setapi(name, API_VERSION)
+
+#check whether an environment variable is set to choose pyqt version.
+#If not try what is installed and set the default
+if not "QT_API" in os.environ:
+	try:
+		import PyQt4
+		defaultAPI = 'pyqt'
+	except ImportError:
+		try:
+			import PyQt5
+			defaultAPI = 'pyqt5'
+		except ImportError:
+			raise ImportError("The EBT GUI needs either PyQt4 or PyQt5 and neither was found")
+
+#set the environment variable and ensure that it was either pyqt or pyqt5
+_modname = os.environ.setdefault('QT_API', defaultAPI)
+assert _modname in ('pyqt', 'pyqt4', 'pyqt5')
 
 from matplotlib import use
-    
 
 if os.environ['QT_API'] == 'pyqt5':
     use("Qt5Agg", warn=False) #set the matplotlib backend and don't warn if already set
 
 else:
-    #ensure API v2 for pyqt (native python data types) pyqt5 only offers this
-    #API, therefore its not needed there
-    import sip
-    API_NAMES = ("QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", 
-                 "QVariant")
-    API_VERSION = 2
-    for name in API_NAMES:
-        sip.setapi(name, API_VERSION)
-    
-
     use("Qt4Agg", warn=False) #set the matplotlib backend and don't warn if already set
 
 

setup.py

@@ -29,10 +29,11 @@ def read(fname):
                       'scipy',
                       'numpy',
                       'pillow',
+                      'configparser;python_version<"3.2"',
                       'mg_dataprocessing>=1.0.0',
-                      'mg_pyguitools>=1.0.0'],
+                      'mg_pyguitools>=1.1.1'],
 
-    dependency_links=["https://github.com/mgotz/PyGUITools/tarball/master#egg=mg_pyguitools-1.0.0",
+    dependency_links=["https://github.com/mgotz/PyGUITools/tarball/master#egg=mg_pyguitools-1.1.1",
                       "https://github.com/mgotz/PyDataProcessing/tarball/master#egg=mg_dataprocessing-1.0.0"],
 
     entry_points = {"gui_scripts":["EBT-evaluation = ebttools.gui.main:run"]}