Merge branch 'master' into update-authors

Author: seisman

.github/workflows/ci_tests.yaml

@@ -89,7 +89,9 @@ jobs:
         run: |
           mkdir -p ~/.gmt
           mv .gmt/* ~/.gmt
-          ls -lh ~/.gmt
+          # Change modification times of the two files, so GMT won't refresh it
+          touch ~/.gmt/server/gmt_data_server.txt ~/.gmt/server/gmt_hash_server.txt
+          ls -lhR ~/.gmt
 
       # Install the package that we want to test
       - name: Install the package

.github/workflows/ci_tests_dev.yaml

@@ -108,7 +108,9 @@ jobs:
         run: |
           mkdir -p ~/.gmt
           mv .gmt/* ~/.gmt
-          ls -lh ~/.gmt
+          # Change modification times of the two files, so GMT won't refresh it
+          touch ~/.gmt/server/gmt_data_server.txt ~/.gmt/server/gmt_hash_server.txt
+          ls -lhR ~/.gmt
 
       # Install the package that we want to test
       - name: Install the package

doc/api/index.rst

@@ -44,6 +44,7 @@ Color palette table generation:
 .. autosummary::
     :toctree: generated
 
+    grd2cpt
     makecpt
 
 Saving and displaying the figure:

doc/install.rst

@@ -14,34 +14,64 @@ Installing
     <https://forum.generic-mapping-tools.org/c/questions/pygmt-q-a>`__.
 
 
+Quickstart
+----------
+
+The fastest way to install PyGMT is with the
+`conda <https://docs.conda.io/projects/conda/en/latest/user-guide/index.html>`__
+package manager which takes care of setting up a virtual environment, as well
+as the installation of GMT and all the dependencies PyGMT depends on::
+
+    conda create --name pygmt --channel conda-forge pygmt
+
+To activate the virtual environment, you can do::
+
+    conda activate pygmt
+
+After this, check that everything works by running the following in a Python
+interpreter (e.g. in a Jupyter notebook)::
+
+    import pygmt
+    pygmt.show_versions()
+
+You are now ready to make you first figure!
+Start by looking at the tutorials on our sidebar, good luck!
+
+.. note::
+
+    The sections below provide more detailed, step by step instructions to
+    installing and testing PyGMT for those who may have a slightly different
+    setup.
+
 Which Python?
 -------------
 
-You'll need **Python 3.7 or greater** to run PyGMT. Old Python versions may
-work, but there is no guarantee that PyGMT will work as expected with old versions.
+PyGMT is tested to run on **Python 3.7 or greater**. Older Python versions may
+work, but there is no guarantee that PyGMT will behave as expected.
 
-We recommend using the `Anaconda <https://www.anaconda.com/distribution>`__ Python
-distribution to ensure you have all dependencies installed and the ``conda``
-package manager available.
+We recommend using the `Anaconda <https://www.anaconda.com/distribution>`__
+Python distribution to ensure you have all dependencies installed and the
+``conda`` package manager available.
 Installing Anaconda does not require administrative rights to your computer and
 doesn't interfere with any other Python installations in your system.
 
 
 Which GMT?
 ----------
 
-PyGMT requires Generic Mapping Tools (GMT) version 6 as a minimum, which is the latest
-released version that can be found at
+PyGMT requires Generic Mapping Tools (GMT) version 6 as a minimum, which is the
+latest released version that can be found at
 the `GMT official site <https://www.generic-mapping-tools.org>`__.
-We need the latest GMT (>=6.1.1) since there are many changes being made to GMT itself in
-response to the development of PyGMT, mainly the new
+We need the latest GMT (>=6.1.1) since there are many changes being made to GMT
+itself in response to the development of PyGMT, mainly the new
 `modern execution mode <https://docs.generic-mapping-tools.org/latest/cookbook/introduction.html#modern-and-classic-mode>`__.
 
-Compiled conda packages of GMT for Linux, macOS and Windows are provided through
-`conda-forge <https://anaconda.org/conda-forge/gmt>`__.
+Compiled conda packages of GMT for Linux, macOS and Windows are provided
+through `conda-forge <https://anaconda.org/conda-forge/gmt>`__.
 Advanced users can also
 `build GMT from source <https://github.com/GenericMappingTools/gmt/blob/master/BUILDING.md>`__
-instead, which is not so recommended but we would love to get feedback from anyone who tries.
+instead, which is not so recommended but we would love to get feedback from
+anyone who tries.
 
 We recommend following the instructions further on to install GMT 6.
 
@@ -58,61 +88,97 @@ PyGMT requires the following libraries:
 
 The following are optional (but recommended) dependencies:
 
-* `IPython <https://ipython.org/>`__: For embedding the figures in Jupyter notebooks.
+* `IPython <https://ipython.org/>`__: For embedding the figures in Jupyter
+notebooks.
 
 
 Installing GMT and other dependencies
 -------------------------------------
 
-Before installing PyGMT, we must install GMT itself along with the other dependencies.
-The easiest way to do this is using the ``conda`` package manager.
+Before installing PyGMT, we must install GMT itself along with the other
+dependencies. The easiest way to do this is via the ``conda`` package manager.
 We recommend working in an isolated
 `conda environment <https://conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html>`__
-to avoid issues with competing versions of its dependencies.
+to avoid issues with conflicting versions of dependencies.
 
 First, we must configure conda to get packages from the
 `conda-forge channel <https://conda-forge.org/>`__::
 
     conda config --prepend channels conda-forge
 
-Now we can create a new conda environment with Python and all our dependencies installed
-(we'll call it ``pygmt`` but you can change it to whatever you want)::
+Now we can create a new conda environment with Python and all our dependencies
+installed (we'll call it ``pygmt`` but feel free to change it to whatever you
+want)::
 
      conda create --name pygmt python=3.9 pip numpy pandas xarray netcdf4 packaging gmt
 
-Activate the environment by running::
+Activate the environment by running the following (**do not forget this step!**)::
 
     conda activate pygmt
 
-From now on, all commands will take place inside the conda virtual environment and won't
-affect your default installation.
+From now on, all commands will take place inside the conda virtual environment
+called 'pygmt' and won't affect your default 'base' installation.
 
 
 Installing PyGMT
 ----------------
 
-Now that you have GMT installed and your conda environment activated, you can
-use ``conda`` to install the latest release of PyGMT from `conda-forge <https://anaconda.org/conda-forge/pygmt>`__::
+Now that you have GMT installed and your conda virtual environment activated,
+you can install PyGMT using any of the following methods:
+
+Using conda (recommended)
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This installs the latest stable release of PyGMT from
+`conda-forge <https://anaconda.org/conda-forge/pygmt>`__::
 
     conda install pygmt
 
-or use ``pip`` to install from `PyPI <https://pypi.org/project/pygmt>`__::
+Using pip
+~~~~~~~~~
+
+This installs the latest stable release from
+`PyPI <https://pypi.org/project/pygmt>`__::
 
     pip install pygmt
 
-Alternatively, you can install the development version from the GitHub repository::
+Alternatively, you can install the latest development version from
+`TestPyPI <https://test.pypi.org/project/pygmt>`__::
+
+    pip install --pre --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple pygmt
 
-    pip install https://github.com/GenericMappingTools/pygmt/archive/master.zip
+or from PyGMT's `GitHub repository <https://github.com/GenericMappingTools/pygmt>`__ 
+(slower as it downloads the whole archive)::
 
-This will allow you to use the ``pygmt`` library from Python.
+    pip install git+https://github.com/GenericMappingTools/pygmt.git#egg=pygmt
+
+Any of the above methods (conda/pip) should allow you to use the ``pygmt``
+library from Python.
 
 
 Testing your install
 --------------------
 
+Quick check
+~~~~~~~~~~~
+
+To ensure that PyGMT and its depedencies are installed correctly, run the
+following in your Python interpreter::
+
+    import pygmt
+    pygmt.show_versions()
+
+Or run this in the command line::
+
+    python -c "import pygmt; pygmt.show_versions()"
+
+
+Full test (optional)
+~~~~~~~~~~~~~~~~~~~~
+
 PyGMT ships with a full test suite.
-You can run our tests after you install it but you will need a few extra dependencies as
-well (be sure to have your conda env activated)::
+You can run our tests after you install it but you will need a few extra
+dependencies as well (be sure to have your conda environment activated)::
 
     conda install pytest pytest-mpl ipython
 
@@ -132,9 +198,9 @@ This can happen if you have multiple versions of GMT installed.
 
 You can tell PyGMT exactly where to look for ``libgmt`` by setting the
 ``GMT_LIBRARY_PATH`` environment variable.
-This should be set to the directory where ``libgmt.so``, ``libgmt.dylib`` or ``gmt.dll``
-can be found for Linux, macOS and Windows respectively.
-e.g. in a terminal run::
+This should be set to the directory where ``libgmt.so``, ``libgmt.dylib`` or
+``gmt.dll`` can be found for Linux, macOS and Windows respectively.
+e.g. on a command line, run::
 
     # Linux/macOS
     export GMT_LIBRARY_PATH=$HOME/anaconda3/envs/pygmt/lib

pygmt/__init__.py

@@ -19,6 +19,7 @@
 from pygmt.session_management import end as _end
 from pygmt.src import (
     blockmedian,
+    grd2cpt,
     grdcut,
     grdfilter,
     grdinfo,

pygmt/clib/loading.py

@@ -6,6 +6,7 @@
 """
 import ctypes
 import os
+import subprocess as sp
 import sys
 from ctypes.util import find_library
 
@@ -31,9 +32,10 @@ def load_libgmt():
         If there was any problem loading the library (couldn't find it or
         couldn't access the functions).
     """
-    lib_fullnames = clib_full_names()
+    lib_fullnames = []
     error = True
-    for libname in lib_fullnames:
+    for libname in clib_full_names():
+        lib_fullnames.append(libname)
         try:
             libgmt = ctypes.CDLL(libname)
             check_libgmt(libgmt)
@@ -72,7 +74,7 @@ def clib_names(os_name):
     elif os_name.startswith("freebsd"):  # FreeBSD
         libnames = ["libgmt.so"]
     else:
-        raise GMTOSError(f'Operating system "{sys.platform}" not supported.')
+        raise GMTOSError(f'Operating system "{os_name}" not supported.')
     return libnames
 
 
@@ -86,24 +88,45 @@ def clib_full_names(env=None):
         A dictionary containing the environment variables. If ``None``, will
         default to ``os.environ``.
 
-    Returns
-    -------
+    Yields
+    ------
     lib_fullnames: list of str
         List of possible full names of GMT's shared library.
     """
     if env is None:
         env = os.environ
+
     libnames = clib_names(os_name=sys.platform)  # e.g. libgmt.so, libgmt.dylib, gmt.dll
-    libpath = env.get("GMT_LIBRARY_PATH", "")  # e.g. $HOME/miniconda/envs/pygmt/lib
 
-    lib_fullnames = [os.path.join(libpath, libname) for libname in libnames]
-    # Search for DLLs in PATH if GMT_LIBRARY_PATH is not defined [Windows only]
-    if not libpath and sys.platform == "win32":
+    # list of libraries paths to search, sort by priority from high to low
+    # Search for libraries in GMT_LIBRARY_PATH if defined.
+    libpath = env.get("GMT_LIBRARY_PATH", "")  # e.g. $HOME/miniconda/envs/pygmt/lib
+    if libpath:
+        for libname in libnames:
+            libfullpath = os.path.join(libpath, libname)
+            if os.path.exists(libfullpath):
+                yield libfullpath
+
+    # Search for the library returned by command "gmt --show-library"
+    try:
+        libfullpath = sp.check_output(
+            ["gmt", "--show-library"], encoding="utf-8"
+        ).rstrip("\n")
+        assert os.path.exists(libfullpath)
+        yield libfullpath
+    except (FileNotFoundError, AssertionError):  # command not found
+        pass
+
+    # Search for DLLs in PATH (done by calling "find_library")
+    if sys.platform == "win32":
         for libname in libnames:
             libfullpath = find_library(libname)
             if libfullpath:
-                lib_fullnames.append(libfullpath)
-    return lib_fullnames
+                yield libfullpath
+
+    # Search for library names in the system default path [the lowest priority]
+    for libname in libnames:
+        yield libname
 
 
 def check_libgmt(libgmt):
@@ -128,10 +151,5 @@ def check_libgmt(libgmt):
     functions = ["Create_Session", "Get_Enum", "Call_Module", "Destroy_Session"]
     for func in functions:
         if not hasattr(libgmt, "GMT_" + func):
-            msg = " ".join(
-                [
-                    "Error loading libgmt.",
-                    "Couldn't access function GMT_{}.".format(func),
-                ]
-            )
+            msg = f"Error loading libgmt. Couldn't access function GMT_{func}."
             raise GMTCLibError(msg)