Merge branch 'master' into separate-workflows

Author: seisman

.github/workflows/cache_data.yaml

@@ -12,6 +12,9 @@ jobs:
   gmt_cache:
     name: Cache GMT artifacts
     runs-on: macOS-latest
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
       # Setup Miniconda
@@ -23,21 +26,19 @@ jobs:
 
       # Install GMT
       - name: Install GMT
-        shell: bash -l {0}
         run: conda install -c conda-forge gmt=6.1.1
 
       # Download remote files
       - name: Download remote data
-        shell: bash -l {0}
         run: |
           gmt which -Ga @earth_relief_10m_p @earth_relief_10m_g \
                         @earth_relief_30m_p @earth_relief_30m_g \
                         @earth_relief_01d_p @earth_relief_01d_g \
                         @earth_relief_05m_p @earth_relief_05m_g
           # Download one tile of the 03s srtm data.
           # @N35E135.earth_relief_03s_g.nc is for internal use only.
-          # The naming scheme may change. 
-          # DO NOT USE IT IN SCRIPTS.         
+          # The naming scheme may change.
+          # DO NOT USE IT IN SCRIPTS.
           gmt which -Ga @N35E135.earth_relief_03s_g.nc
           gmt which -Ga @ridge.txt @Table_5_11.txt @test.dat.nc \
                         @tut_bathy.nc @tut_quakes.ngdc @tut_ship.xyz \

.github/workflows/ci_tests.yaml

@@ -44,6 +44,9 @@ jobs:
           - os: ubuntu-latest
             python-version: 3.8
             isDraft: true
+    defaults:
+      run:
+        shell: bash -l {0}
 
     # environmental variables used in coverage
     env:
@@ -75,7 +78,6 @@ jobs:
 
       # Install GMT and other required dependencies from conda-forge
       - name: Install dependencies
-        shell: bash -l {0}
         run: |
           conda install gmt=6.1.1 numpy pandas xarray netCDF4 packaging \
                         codecov coverage[toml] \
@@ -84,7 +86,6 @@ jobs:
 
       # Show installed pkg information for postmortem diagnostic
       - name: List installed packages
-        shell: bash -l {0}
         run: conda list
 
       # Download cached remote files (artifacts) from GitHub
@@ -98,7 +99,6 @@ jobs:
 
       # Move downloaded files to ~/.gmt directory and list them
       - name: Move and list downloaded remote files
-        shell: bash -l {0}
         run: |
           mkdir -p ~/.gmt
           mv .gmt/* ~/.gmt
@@ -108,14 +108,12 @@ jobs:
 
       # Install the package that we want to test
       - name: Install the package
-        shell: bash -l {0}
         run: |
           python setup.py sdist --formats=zip
           pip install dist/*
 
       # Run the tests
       - name: Test with pytest
-        shell: bash -l {0}
         run: make test PYTEST_EXTRA="-r P"
 
       # Upload diff images on test failure

.github/workflows/ci_tests_dev.yaml

@@ -106,7 +106,6 @@ jobs:
 
       # Move downloaded files to ~/.gmt directory and list them
       - name: Move and list downloaded remote files
-        shell: bash -l {0}
         run: |
           mkdir -p ~/.gmt
           mv .gmt/* ~/.gmt

doc/conf.py

@@ -9,7 +9,7 @@
 # isort: off
 from sphinx_gallery.sorting import (  # pylint: disable=no-name-in-module
     ExplicitOrder,
-    FileNameSortKey,
+    ExampleTitleSortKey,
 )
 from pygmt import __commit__, __version__
 from pygmt.sphinx_gallery import PyGMTScraper
@@ -71,10 +71,13 @@
     "gallery_dirs": ["gallery", "tutorials", "projections"],
     "subsection_order": ExplicitOrder(
         [
-            "../examples/gallery/line",
-            "../examples/gallery/coast",
-            "../examples/gallery/plot",
-            "../examples/gallery/grid",
+            "../examples/gallery/maps",
+            "../examples/gallery/lines",
+            "../examples/gallery/symbols",
+            "../examples/gallery/images",
+            "../examples/gallery/3d_plots",
+            "../examples/gallery/seismology",
+            "../examples/gallery/embellishments",
             "../examples/projections/azim",
             "../examples/projections/conic",
             "../examples/projections/cyl",
@@ -88,7 +91,7 @@
     # Remove the "Download all examples" button from the top level gallery
     "download_all_examples": False,
     # Sort gallery example by file name instead of number of lines (default)
-    "within_subsection_order": FileNameSortKey,
+    "within_subsection_order": ExampleTitleSortKey,
     # directory where function granular galleries are stored
     "backreferences_dir": "api/generated/backreferences",
     # Modules for which function level galleries are created.  In

doc/index.rst

@@ -0,0 +1,2 @@
+3D Plots
+--------