docs changes: mpl-base (#221) & pixi (#220)

Author: briantoby

MDtutorials/TutorialGuide.txt

@@ -115,7 +115,7 @@ Install an initial, bare-bones Python environment
   where ``~/miniforge3`` is the location where miniforge was installed.)
   Then use the conda command to install the following packages to run GSAS-II:
 
-    python, numpy, matplotlib, scipy, wxpython, pyopengl, imageio, h5py,
+    python, numpy, matplotlib-base, scipy, wxpython, pyopengl, imageio, h5py,
     hdf5, pillow, requests, pycifrw, pybaselines, git, gitpython, conda
 
   (see `the GUI requirement section of the Developers manual 
@@ -296,7 +296,7 @@ Install miniforge
  Use this command to install the following packages to run GSAS-II
  (note this is a very long line)::
 
-       conda install python numpy matplotlib wxpython pyopengl scipy git gitpython PyCifRW pillow conda requests hdf5 h5py imageio zarr xmltodict pybaselines seekpath pywin32 -c conda-forge -y
+       conda install python numpy matplotlib-base wxpython pyopengl scipy git gitpython PyCifRW pillow conda requests hdf5 h5py imageio zarr xmltodict pybaselines seekpath pywin32 -c conda-forge -y
  
  (see `the GUI requirement section of the Developers manual 
  <https://gsas-ii.readthedocs.io/en/latest/packages.html#gui-requirements>`_

webdocs/compile.rst

@@ -13,7 +13,15 @@
 Customized Python Installation 
 ==================================================
 
-Experienced system managers or code developers may wish to perform their own Python installations. Noting that the GSAS-II GUI requires at a minimum wxPython, matplotlib, PyOpenGL, NumPy and SciPy be installed, while for scripting use, only NumPy and SciPy are required.  For full functionality, several other optional packages are needed, as is `discussed in the GSAS-II Python package requirements <https://gsas-ii.readthedocs.io/en/latest/packages.html#gui-requirements>`_.
+Experienced system managers or code developers may wish to perform
+their own Python installations. Noting that the GSAS-II GUI requires
+at a minimum wxPython, matplotlib-base, PyOpenGL, NumPy and SciPy be
+installed, while for scripting use, only NumPy and SciPy are required.
+For full functionality, several other optional packages are needed, as
+is `discussed in the GSAS-II Python package requirements
+<https://gsas-ii.readthedocs.io/en/latest/packages.html#gui-requirements>`_.
+Note that matplotlib-base is preferred over matplotlib, unless matplotlib will
+be used outside GSAS-II. 
 If Python versions other than those recommended are selected (Python=3.11 and NumPy=1.26), you will likely need to either locate older binaries and install them manually or run the compilation yourself (`see compilation information <https://advancedphotonsource.github.io/GSAS-II-tutorials/compile.html>`_). 
 
 The choices for how to install Python and packages come down to distribution methods such as conda, pip, homebrew or Linux distro-supplied installation. It is also possible to obtain all as source code and compile them locally.
@@ -25,11 +33,11 @@ conda
 
 With conda, use commands such as this::
 
-         conda install python=3.11  numpy=1.26 wxpython scipy matplotlib pyopengl pillow h5py imageio requests git gitpython -c conda-forge
+         conda install python=3.13  numpy=2.2 wxpython scipy matplotlib-base pyopengl pillow h5py imageio requests git gitpython pycifrw pybaselines -c conda-forge
 
 or::
 
-       conda create -n <envname> python=3.11  numpy=1.26 wxpython scipy matplotlib pyopengl pillow h5py imageio requests git gitpython -c conda-forge 
+       conda create -n <envname> python=3.13  numpy=2.2 wxpython scipy matplotlib-base pyopengl pillow h5py imageio requests git gitpython pycifrw pybaselines -c conda-forge 
 
 .. index:: Customized Python installation; pip
 

webdocs/install-pip.rst

@@ -109,10 +109,18 @@ Installing GSAS-II with a Separate Python Installation
 
 A small number of users or sites prefer to use Python distributions supplied via other routes (such as Debian packages) or using `PyPi <https://pypi.org>`_, etc. or prefer to handle use of conda on their own. Some discussion on Python installation is
 `found here <install-pip.html>`_. Independent of how Python is installed, multiple packages are needed, please see the
-`discussion on Python package requirements <https://gsas-ii.readthedocs.io/en/latest/packages.html#gui-requirements>`_, noting that the GSAS-II GUI requires at a minimum wxPython, matplotlib,
-PyOpenGL, NumPy and SciPy, while for scripting use, only NumPy and SciPy are required.  For full functionality, several other optional packages are needed.
-If versions other than those recommended are selected (
-Python=3.13 with NumPy=2.2 or Python=3.11 with NumPy=1.26), you will likely need to either locate older binaries and install them manually or compile them yourself (`see compilation information <https://advancedphotonsource.github.io/GSAS-II-tutorials/compile.html>`_). 
+`discussion on Python package requirements
+<https://gsas-ii.readthedocs.io/en/latest/packages.html#gui-requirements>`_,
+noting that the GSAS-II GUI requires at a minimum wxPython, matplotlib
+(matplotlib-base is preferred over matplotlib unless matplotlib will
+be used outside GSAS-II), PyOpenGL, NumPy and SciPy, while for
+scripting use, only NumPy and SciPy are required.  For full
+functionality, several other optional packages are needed. 
+If versions other than those recommended are selected (Python=3.13
+with NumPy=2.2 or Python=3.11 with NumPy=1.26), you will likely need
+to either locate older binaries and install them manually or compile
+them yourself (`see compilation information
+<https://advancedphotonsource.github.io/GSAS-II-tutorials/compile.html>`_).  
 
 A simple way to install GSAS-II with a supplied Python environment uses the ``gitstrap.py`` script provided for this purpose. Use these commands (on any platform) to install GSAS-II::
 
@@ -156,17 +164,23 @@ Installing & Compiling GSAS-II
 If using GSAS-II on some Linux dists, or with versions of Python/numpy other than
 what we support, it may be necessary (or a site policy) to compile the
 GSAS-II binaries locally rather than download them. A script is
-supplied that works similarly to the above, but compiles the GSAS-II
-source files. This requires that in addition to the GSAS-II run-time
-Python packages are needed (see the
-`discussion on Python package requirements
-<https://gsas-ii.readthedocs.io/en/latest/packages.html#gui-requirements>`_,
-for compilation the Python cython and meson packages are required, as
-well as gfortran and gcc, which can be installed via conda, but are
-frequently intalled in other ways. 
+supplied (``gitcompile.py``) that works similarly to the above, but
+compiles the GSAS-II source files. Alternately, it is possible to
+build and install GSAS-II with pixi (see :ref:`pixi installation`). 
 
 A simple way to install and compile GSAS-II uses the supplied
-``gitcompile.py`` script. Use these commands (on any platform) to
+``gitcompile.py`` script.  To use this script requires that in addition
+to the Python packages GSAS-II needs at run-time (see the
+`discussion on Python package requirements
+<https://gsas-ii.readthedocs.io/en/latest/packages.html#gui-requirements>`_,
+tools needed for compilation must also be available. These are the
+Python cython and meson packages and the gfortran and gcc
+compilers. Note that the compilers can be installed via conda, but
+while use of ``git`` is required for this script, use of conda is
+not. All tools and packages needed by ``gitcompile.py`` can be
+installed in other ways (apt-get, homebrew, pip...), but the choices available will depend on the target OS.
+
+Use these commands (on any platform) to
 install with local compilation::
 
   cd ~/G2

webdocs/install.rst

@@ -132,6 +132,8 @@ You are strongly encouraged to create a separate branch for each development pro
 
 When your changes are complete and you are ready to communicate them back, you will commit them locally and use ``git push`` to upload them to GitHub. From the web interface to GitHub you can then submit that branch as a pull request to the main GSAS-II repository. Once you have submiited your pull request, you likely will want to switch to a different branch to do any further development work, as if changes are uploaded for the branch used for the pull request, those changes will be added to the code in the pull request.
 
+.. index:: Installing with pixi
+
 .. _pixi installation:
 
 ==============================================