Changeset f4a1433 in sasview for setup.py

Timestamp:

Oct 24, 2017 2:44:26 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

fca1f50, d6b234b

Parents:

16afe01 (diff), 5582b078 (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 ESS_GUI

File:

• setup.py (modified) (7 diffs)

setup.py

@@ -6 +6 @@
     TODO: Add checks to see that all the dependencies are on the system
 """
+from __future__ import print_function
 
 import os
@@ -18 +19 @@
 
 # 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")
 ##############################################################
 
@@ -42 +47 @@
 SASVIEW_BUILD = os.path.join(CURRENT_SCRIPT_DIR, "build")
 
+# TODO: build step should not be messing with existing installation!!
 sas_dir = os.path.join(os.path.expanduser("~"), '.sasview')
 if os.path.isdir(sas_dir):
@@ -59 +65 @@
     #             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)
+
+
+# Optionally clean before build.
+dont_clean = 'update' in sys.argv
+if dont_clean:
+    sys.argv.remove('update')
+elif 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
-
 if sys.platform == 'darwin':
     if not is_64bits:
@@ -225 +233 @@
 package_dir["sas.sascalc.dataloader"] = os.path.join(
     "src", "sas", "sascalc", "dataloader")
-package_data["sas.sascalc.dataloader.readers"] = [
-    'defaults.json', 'schema/*.xsd']
+package_data["sas.sascalc.dataloader.readers"] = ['schema/*.xsd']
 packages.extend(["sas.sascalc.dataloader", "sas.sascalc.dataloader.readers",
                  "sas.sascalc.dataloader.readers.schema"])
@@ -426 +433 @@
 
 # SasView
-package_dir["sas.sasview"] = "sasview"
+package_data['sas'] = ['logging.ini']
 package_data['sas.sasview'] = ['images/*',
                                'media/*',
-                               'logging.ini',
                                'test/*.txt',
                                'test/1d_data/*',
@@ -439 +445 @@
                                'test/other_files/*',
                                'test/save_states/*',
-                               'test/sesans_data/*'
+                               'test/sesans_data/*',
+                               'test/upcoming_formats/*',
                                ]
 packages.append("sas.sasview")
 
 required = [
-    'bumps>=0.7.5.9', 'periodictable>=1.3.1', 'pyparsing<2.0.0',
+    'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing<2.0.0',
 
     # 'lxml>=2.2.2',