Changes between Version 16 and Version 17 of InstallWindows

Timestamp:

May 6, 2013 1:14:03 PM (12 years ago)

Author:

toby

Comment:

--

InstallWindows

@@ -8 +8 @@
 For this, you will install the free Enthought (EPDfree) Python Distribution. Note that Enthought has replaced EPDfree with a new free product !CanopyExpress. This may also work, but we have not yet tested it. We use a more complete version of EPD for development, described in the [#Python Python section], below. Also, you will use the mini-svn/bootstrap kit, which contains a pared-down version of the subversion program and a batch file that installs GSAS-II from the APS subversion server. Detailed instructions on use of kit are found here: [ZipInstall Installation Instructions].
 
- 1.   To install EPD Free, download [https://s3.amazonaws.com/storage.enthought.com/installers/epd_free-7.3-2-win-x86.msi the EPDfree 32-bit Windows .msi file] from web page https://www.enthought.com/repo/free/. Click on it to invoke the windows installer. (See notes below about how to install without administrator privileges.) 
+ 1.   To install EPDfree, download [https://s3.amazonaws.com/storage.enthought.com/installers/epd_free-7.3-2-win-x86.msi the EPDfree 32-bit Windows .msi file] from web page https://www.enthought.com/repo/free/. Click on it to invoke the windows installer. (See notes below about how to install without administrator privileges.) 
 
  2.  Download file GSASIIsvn.zip file from URL https://subversion.xray.aps.anl.gov/pyGSAS/install/GSASIIsvn.zip. 
@@ -22 +22 @@
 Python is a computer scripting language, which means that one must have the Python interpreter installed on your computer to run a Python program. However, there are several [PythonPackages Python packages required by GSAS-II] that are not distributed within the standard Python distribution, so not just any package of the Python interpreter will do for GSAS-II. For development, we use the full [http://www.enthought.com/products/epd.php EPD] distribution and will probably switch to the full Canopy product. There are a number of distributed packages will do likely fine, but have not been tested by us. Python and all the required packages are open source, so you could, in theory, download the source code for each one and compile them yourself. Most Windows users are likely to prefer to use binary distributions and will prefer using a single download that provides everything they need. For that, select and download one of the packages below and follow directions provided on that site for installation. Note that GSAS-II is being developed with version 2.x of Python (2.7.2 as of December 2011) and has not progressed to version 3.x of Python. This is in part because not all the packages required by GSAS-II are fully supported on Python 3.x on all platforms.
 
- * [http://www.enthought.com/products/epd.php Enthought Python Distribution (EPD)] is a commercially licensed Python package that features differing levels of support. Academic users may request a free license at http://www.enthought.com/products/edudownload.php. To install, download the .msi file and click on it to invoke the windows installer. While GSAS-II will run in both 64- and 32-bit python, we are using 32-bit for most development work and encourage use of that. Note that this package can be installed without administrator privileges if you install it for only for use by the current user; you may have to choose an install location that you own (a subdirectory of My Documents, for example.)
+ * [http://www.enthought.com/products/epd.php Enthought Python Distribution (EPD)] is a commercially licensed Python package that features differing levels of support it is being replaced by a newer product called Canopy. Academic users may request a free license at http://www.enthought.com/products/edudownload.php. To install, download the .msi file and click on it to invoke the windows installer. While GSAS-II will run in both 64- and 32-bit python, we are using 32-bit for most development work and encourage use of that. Note that this package can be installed without administrator privileges if you install it for only for use by the current user; you may have to choose an install location that you own (a subdirectory of My Documents, for example.)
 
- * [http://www.enthought.com/products/epd_free.php Free Enthought Python Distribution (EPDFree)] is a 32-bit, light-weight version of the EPD package, above, which does not have commercial support. It contains all the packages needed for GSAS-II except[http://pypi.python.org/pypi/PyOpenGL PyOpenGL] -- which gets installed automatically by GSAS-II. To install EPDFree, download the .msi file from URL http://www.enthought.com/products/epd_free.php and click on it to invoke the windows installer. (See note above with regard to administrator privileges.) After installing EPDFree, you can invoke GSAS-II and it will install PyOpenGL from the file PyOpenGL-3.0.2a5.zip that is included with GSAS-II. (Alternatively, you can obtain PyOpenGL from [http://pypi.python.org/packages/any/P/PyOpenGL/PyOpenGL-3.0.1.win32.exe#md5=513cc194af65af4c5a640cf9a1bd8462 here]. Run the !PyOpenGL3.0.1.win32.exe file. If you have more than one version of Python on your computer, make sure it installs OpenGL into the EPDFree version.) 
+ * The [http://www.enthought.com/products/epd_free.php free Enthought Python Distribution (EPDFree)] has been replaced by !CanopyExpress. Both are lightweight versions of the full Canopy/EPD packages, and do not come with support. We have not tested !CanopyExpress yet and recommend that you download [https://s3.amazonaws.com/storage.enthought.com/installers/epd_free-7.3-2-win-x86.msi the EPDfree 32-bit Windows .msi file] from web page https://www.enthought.com/repo/free/. It contains all the packages needed for GSAS-II except[http://pypi.python.org/pypi/PyOpenGL PyOpenGL] -- which gets installed automatically by GSAS-II. To install EPDFree, download the .msi file from URL http://www.enthought.com/products/epd_free.php and click on it to invoke the windows installer. (See note above with regard to administrator privileges.) After installing EPDFree, you can invoke GSAS-II and it will install PyOpenGL from the file PyOpenGL-3.0.2a5.zip that is included with GSAS-II. (Alternatively, you can obtain PyOpenGL from [http://pypi.python.org/packages/any/P/PyOpenGL/PyOpenGL-3.0.1.win32.exe#md5=513cc194af65af4c5a640cf9a1bd8462 here]. Run the !PyOpenGL3.0.1.win32.exe file. If you have more than one version of Python on your computer, make sure it installs OpenGL into the EPDFree version.) If you try !CanopyExpress, please let us know if it works for you. 
 
  * [http://www.pythonxy.com/ Python(x,y)] is a free Windows (and Linux) Python distribution. It focuses on supporting the Qt GUI package while GSAS-II requires Wx, but this distribution does offer Wx and all the other packages that GSAS-II requires, as far as we are aware. Note that when you install, you will either need to select to install all packages or else perform a customized installation to ensure that the [PythonPackages Python packages required by GSAS-II] are installed. To install, download the .exe file, run it and read the instructions.
@@ -32 +32 @@
 === Subversion ===
 
-Subversion is a software version tracking system that allows you to download and update the GSAS-II software from the APS subversion server (https://subversion.xray.aps.anl.gov/pyGSAS/trunk/). You can install a variety of different versions of this software, but the two we recommend for Windows are these: 
+Subversion is a software version tracking system that allows you to download and update the GSAS-II software directly from the APS subversion server (https://subversion.xray.aps.anl.gov/pyGSAS/trunk/). You can install a variety of different versions of this software, but the two we recommend for Windows are these: 
 
  * [http://tortoisesvn.net/ TortoiseSVN] incorporates Subversion capabilities into Windows. See the downloads directory and be sure to install the version (64-bit or 32-bit) appropriate for your version of Windows -- this must match the OS or it will not run. Once TortoiseSVN is installed, follow [TortoiseInstall these installation instructions]