Changeset 3858


Ignore:
Timestamp:
Mar 19, 2019 9:18:53 AM (3 years ago)
Author:
toby
Message:

stupid Py3 syntax error; docs updates

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r3674 r3858  
    1010########### SVN repository information ###################
    1111'''
    12 *GSAS-II GUI Script*
     12*GSAS-II GUI*
    1313=====================
    1414
    15 Script to start the GSAS-II graphical user interface. This script imports GSASIIpath,
    16 sets a few misc. values and then launches :func:`GSASIIdataGUI.GSASIImain`, which
    17 creates a wx.Application which in turns creates the GUI.
     15This is the script to start the GSAS-II graphical user interface (GUI).
     16This script imports GSASIIpath, does some minor initialization
     17and then launches :func:`GSASIIdataGUI.GSASIImain`,
     18which creates a wx.Application that in turns creates the GUI.
     19If the GSAS-II binaries are not installed or are incompatible with
     20the OS/Python packages, the user is asked if they should be updated
     21from the subversion site.
    1822'''
    1923
  • trunk/GSASIIimage.py

    r3857 r3858  
    2828try:
    2929    import GSASIIplot as G2plt
    30 except ImportError, ModuleNotFoundError: # expected in scriptable w/o matplotlib and/or wx
     30except (ImportError, ModuleNotFoundError): # expected in scriptable w/o matplotlib and/or wx
    3131    pass
    3232import GSASIIlattice as G2lat
  • trunk/docs/source/index.rst

    r3857 r3858  
    77The following documentation is intended for those wishing to code
    88withing the GSAS-II framework, those planning to understand how
    9 GSAS-II works or for people wishing to develop scripting applications
     9GSAS-II works, or for people wishing to develop scripting applications
    1010using the API (:mod:`GSASIIscriptable`).
    1111
  • trunk/docs/source/packages.rst

    r3857 r3858  
    1 *Required packages*
     1Required packages
    22====================
    33
     
    55well as several separately-developed packages. GSAS-II is being
    66developed using Python 2.7, 3.6 and 3.7. At this point we think that
    7 most sections of the code have not been exercised in Python 2 and 3,
     7most sections of the code have been exercised in Python 2 and 3,
    88but  bugs are still expected (please report them). Our
    99goal is to keep the code compliant with both Python 2.7 and 3.x for
     
    1919encourage updating from that.
    2020
    21 GUI Use
    22 --------
     21GUI Requirements
     22----------------
    2323
    2424When using the GSAS-II graphical user interface (GUI), the following
    2525Python extension packages are required:
    2626
    27 * wxPython (http://wxpython.org/docs/api/). Note that GSAS-II has been tested with wxPython >=2.8, 3.0.x and 4.0.x
     27* wxPython (http://wxpython.org/docs/api/). Note that GSAS-II has been tested with wxPython 2.8.x, 3.0.x and 4.0.x. We encourage use of 3.0 with Python 2.7 and 4.x with Python 3.x.
    2828* NumPy (http://docs.scipy.org/doc/numpy/reference/),
    2929* SciPy (http://docs.scipy.org/doc/scipy/reference/),
     
    3131* PyOpenGL (http://pyopengl.sourceforge.net/documentation). Note: a copy of this is distributed with GSAS-II (at present) and will be installed if the Python setuptools package is present.
    3232
    33 Several packages are used by some parts of the code, but are not
     33Several packages are used in sections of the code, but are not
    3434required. If these packages are not present, warning messages may be
    35 generated when needed, but the vast bulk of GSAS-II will function normally.
     35generated if they would be needed, but the vast bulk of GSAS-II will function normally.
    3636
    3737* Pillow (https://pillow.readthedocs.org) or PIL (http://www.pythonware.com/products/pil/). This is used to save
     
    4949
    5050
    51 Scripting  Use
    52 ---------------
     51Scripting  Requirements
     52--------------------
    5353
    5454When using the GSAS-II scripting interface (:mod:`GSASIIscriptable`),
Note: See TracChangeset for help on using the changeset viewer.