Changes between Version 25 and Version 26 of DevNotes/Obsolete/AnacondaSetup

Timestamp:

Mar 24, 2016 4:16:45 PM (9 years ago)

Author:

krzywon

Comment:

—

DevNotes/Obsolete/AnacondaSetup

@@ -15 +15 @@
 * At the Advanced Options screen, you need to consider whether or not you want to make Anaconda your default version of Python.  Developers who do not work on multiple Python projects can just accept the defaults here.
 
-== Step 2 - Install Dependancies ==
+== Step 2 - Install Dependencies ==
 
 Add the channel containing extra dependencies needed by SasView:
@@ -32 +32 @@
 }}}
 
-Install all the SasView dependencies we need:
+Install all required !SasView dependencies:
 
 {{{
-conda install --yes pylint matplotlib scipy pyparsing html5lib wxpython reportlab lxml PIL setuptools numpy comtypes pywin32 py2exe pisa numpy sphinx unittest-xml-reporting mingw periodictable bumps
+conda install --yes pylint matplotlib scipy pyparsing html5lib wxpython reportlab lxml PIL setuptools numpy comtypes pywin32 py2exe pisa numpy sphinx unittest-xml-reporting mingw pip
 }}}
 
-Note 1: mingw can be removed from the command line above if you have a separate MinGW 32-bit installation.
-
-Note 2: if periodictable & bumps do not install, see Steps 5 & 7.
+The bumps and periodictable Anaconda packages are not up to date. To install the latest versions, use pip as below, or checkout the repositories as outlined in Step 5.
+{{{
+pip install bumps periodictable
+}}}
 
 == Step 3 - Install Git (or optionally stay with SVN) ==
@@ -59 +60 @@
 Download: http://sourceforge.net/projects/win32svn/files/latest/download
 
-== Step 4 - Download the SasView Source Code ==
+== Step 4 - Download the !SasView and !SasModels Source Code ==
+
+The !SasView source code requires the sasmodels source directory to be in the same base directory for proper referencing. The dependencies also require the directories be named sasview and sasmodels.
 
 {{{
 # With Git:
-git clone https://github.com/SasView/sasview.git sasview-code
+git clone https://github.com/SasView/sasview.git sasview
+git clone https://github.com/SasView/sasmodels.it sasmodels
 # With SVN:
-svn checkout https://github.com/SasView/sasview sasview-code
-cd sasview-code
+svn checkout https://github.com/SasView/sasview sasview
+svn checkout https://github.com/SasView/sasmodels sasmodels
+cd sasview
 }}}
 
@@ -72 +77 @@
 Added by smk78
 
-Only follow this step if the bumps & periodictable packages were not installed by conda in Step 2.
+Follow this step to use the source code rather than installed packages for bumps and periodictable.
 
 {{{
 # With Git:
-git clone https://github.com/bumps/bumps.git bumps-code
-git clone https://github.com/pkienzle/periodictable.git periodictable-code
+git clone https://github.com/bumps/bumps.git bumps
+git clone https://github.com/pkienzle/periodictable.git periodictable
 # With SVN:
-svn checkout https://github.com/bumps/bumps.git bumps-code
-svn checkout https://github.com/pkienzle/periodictable.git periodictable-code
+svn checkout https://github.com/bumps/bumps.git bumps
+svn checkout https://github.com/pkienzle/periodictable.git periodictable
 }}}
 
@@ -109 +114 @@
 Added by smk78
 
-Only follow this step if the bumps & periodictable packages were not installed by conda in Step 2.
+Only follow this step if you chose to close the bumps & periodictable repositories in Step 5 rather than pip install them in Step 2.
 
-Navigate to the bumps-code folder:
+Navigate to the bumps folder:
 {{{
 python setup.py install
 }}}
 
-Navigate to the periodictable-code folder:
+Navigate to the periodictable folder:
 {{{
 python setup.py install