0.7.19 tweaks

Author: bgoli

setup.py

@@ -26,22 +26,11 @@
 import os
 local_path = os.path.dirname(os.path.abspath(os.sys.argv[0]))
 
-USE_SETUPTOOLS = False
-
-if USE_SETUPTOOLS:
-    # setuptools
+try:
     from setuptools import setup
-else:
-    # distutils
+except:
     from distutils.core import setup
 
-# new more elegant hack implemented to get rid of evil hack and allow pip install
-"""
-# I suspect this is a distutils specific evil hack to get the data into the install directory
-from distutils.command.install import INSTALL_SCHEMES
-for scheme in INSTALL_SCHEMES.values():
-    scheme['data'] = scheme['purelib']
-"""
 mydata_files = []
 # new hack should get rid of the need for this
 #mydata_files.append((os.path.join('cbmpy', 'models'),\
@@ -92,6 +81,16 @@
     'Topic :: Scientific/Engineering :: Chemistry'
      ],
  description =\
+ """
+ CBMPy (http://cbmpy.sourceforge.net) is a platform for constraint based modelling and analysis. CBMPy implements popular analyses such as FBA, FVA, element/charge balancing, network analysis and model editing as well as advanced methods developed specifically for the ecosystem modelling
+ """
+)
+try:
+    import cbmpy
+except ImportError:
+    pass
+
+readme =\
  """ PySCeS-CBMPy
  ============
 
@@ -226,8 +225,4 @@
   python setup.py build sdist
   sudo python setup.py install
 
-""")
-try:
-    import cbmpy
-except ImportError:
-    pass
+"""

src/__init__.py

@@ -19,7 +19,7 @@
 
 Author: Brett G. Olivier
 Contact email: bgoli@users.sourceforge.net
-Last edit: $Author: bgoli $ ($Id: __init__.py 631 2017-11-03 16:09:23Z bgoli $)
+Last edit: $Author: bgoli $ ($Id: __init__.py 633 2017-11-06 09:57:54Z bgoli $)
 
 """
 #
@@ -64,10 +64,10 @@
     print('\nWARNING: No SBML support, top-level SBML read/write functions disabled.\n')
 
 # CBMPy GUI development has ended with WxGUI, download Metatoolkit instead
-try:
-    from .CBWx import runModelEditor as loadCBGUI
-except ImportError as ex:
-    print('GUI module not available')
+## try:
+    ## from .CBWx import runModelEditor as loadCBGUI
+## except ImportError as ex:
+    ## print('GUI module not available')
 
 ##import CBMultiEnv to be deprecated
 #try: