Changeset ed5beb3 in sasview for sasview

Timestamp:

Nov 25, 2015 4:47:02 AM (8 years ago)

Author:

ajj

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

abcbe09

Parents:

e8e3e38 (diff), 3596467 (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' of ​https://github.com/SasView/sasview

Location:

sasview

Files:

• README.txt (modified) (1 diff)
• sasview.py (modified) (1 diff)
• wxcruft.py (added)
• setup_mac.py (modified) (1 diff)

sasview/README.txt

@@ -255 +255 @@
 
    2.2- Installing from source
-        - Get the code from GitHub at https://github.com/SasView/sasview.git
-          for this release version use: https://github.com/SasView/sasview/releases
-          - run 'python setup.py install' under the 'sasview-x.x.x' folder
+        - Get the source code
+          - to follow the current development version from source control use
+              git clone https://github.com/SasView/sasview.git
+              git clone https://github.com/bumps/bumps.git
+          - to install a specific version
+
+        - Build, install and run a specific release
+          - make sure the requirements below are already installed
+          - retrieve the source from https://github.com/SasView/sasview/releases
+          - open a command line window in the 'sasview-x.x.x' directory
+          - run 'python setup.py install'
           - run 'python sasview.py' under the 'sasview' folder.
-          
+
+        - Build, install and run the current development version
+          - clone the source from git; also clone bumps, which is developed in parallel
+              git clone https://github.com/SasView/sasview.git
+              git clone https://github.com/bumps/bumps.git
+          - open a command line window in the 'sasview' directory
+          - run 'python setup.py build'
+          - run 'python run.py'; this runs from the source directories, so you
+            don't have to rebuild every time you make a change, unless you are
+            changing the C++ model files
+
         - The following modules are required (version numbers are what are used
           in the windows release build):

sasview/sasview.py

@@ -69 +69 @@
 
 import wx
+
 try:
     logging.info("Wx version: %s" % wx.__version__)
 except:
     logging.error("Wx version: error reading version")
+
+import wxcruft
+wxcruft.call_later_fix()
+#wxcruft.trace_new_id()
 
 # The below will make sure that sasview application uses the matplotlib font

sasview/setup_mac.py

@@ -121 +121 @@
 VERSION = sasviewver.__version__
 APPNAME = "SasView "+VERSION
-DMGNAME = "SasView-"+VERSION
+DMGNAME = "SasView-"+VERSION+"-MacOSX"
 
 APP = ['sasview.py']