Changeset 80c2c85 in sasview for setup.py

Timestamp:

Jun 28, 2016 5:10:33 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3aa2f3c

Parents:

899e084 (diff), 5552396 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into sasview-cleanup

File:

• setup.py (modified) (4 diffs)

setup.py

@@ -11 +11 @@
 
 # Manage version number ######################################
-import sasview
-VERSION = sasview.__version__
+with open(os.path.join("src", "sas", "sasview", "__init__.py")) as fid:
+    for line in fid:
+        if line.startswith('__version__'):
+            VERSION = line.split('"')[1]
+            break
+    else:
+        raise ValueError("Could not find version in src/sas/sasview/__init__.py")
 ##############################################################
 
@@ -51 +56 @@
     #             file_path =  os.path.join(f_path, f)
     #             os.remove(file_path)
-    if os.path.exists(SASVIEW_BUILD):
-        print "Removing existing build directory", SASVIEW_BUILD, "for a clean build"
-        shutil.rmtree(SASVIEW_BUILD)
+
+if os.path.exists(SASVIEW_BUILD):
+    print "Removing existing build directory", SASVIEW_BUILD, "for a clean build"
+    shutil.rmtree(SASVIEW_BUILD)
                     
 # 'sys.maxsize' and 64bit: Not supported for python2.5
-is_64bits = False
-if sys.version_info >= (2, 6):
-    is_64bits = sys.maxsize > 2**32
-    
+is_64bits = sys.maxsize > 2**32
 enable_openmp = False
 
@@ -287 +290 @@
 
 # SasView
-package_dir["sas.sasview"] = "sasview"
 package_data['sas.sasview'] = ['images/*',
                                'media/*',
@@ -334 +336 @@
     zip_safe = False,
     entry_points = {
-                    'console_scripts':[
-                                       "sasview = sas.sasview.sasview:run",
-                                       ]
-                    },
-    cmdclass = {'build_ext': build_ext_subclass,
-                'docs': BuildSphinxCommand,
-                'disable_openmp': DisableOpenMPCommand}
+        'console_scripts': ["sasview = sas.sasview.sasview:run_cli"]
+        },
+    cmdclass = {
+        'build_ext': build_ext_subclass,
+        'docs': BuildSphinxCommand,
+        'disable_openmp': DisableOpenMPCommand,
+        }
     )