Merge branch 'master' into xfail/grdtrack

Author: seisman

.github/workflows/cache_data.yaml

@@ -17,34 +17,36 @@ jobs:
         shell: bash -l {0}
 
     steps:
+      # Checkout current git repository
+      - name: Checkout
+        uses: actions/checkout@v2.3.4
+        with:
+          # fecth all history so that setuptools-scm works
+          fetch-depth: 0
+
       # Setup Miniconda
       - name: Setup Miniconda
         uses: conda-incubator/setup-miniconda@v2.1.1
         with:
           channels: conda-forge
           miniconda-version: "latest"
 
-      # Install GMT
-      - name: Install GMT
-        run: conda install -c conda-forge/label/dev gmt=6.2.0rc2
+      # Install GMT and other required dependencies from conda-forge
+      - name: Install dependencies
+        run: |
+          conda install gmt=6.2.0 \
+                        numpy pandas xarray netCDF4 packaging matplotlib
+
+      # Install the package that we want to test
+      - name: Install the package
+        run: |
+          python setup.py sdist --formats=zip
+          pip install dist/*
 
       # Download remote files
       - name: Download remote data
         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.
-          gmt which -Ga @N35E135.earth_relief_03s_g.nc
-          # @srtm_tiles.nc is needed for 03s and 01s relief data
-          gmt which -Ga @srtm_tiles.nc
-          gmt which -Ga @ridge.txt @Table_5_11.txt @test.dat.nc \
-                        @tut_bathy.nc @tut_quakes.ngdc @tut_ship.xyz \
-                        @usgs_quakes_22.txt @fractures_06.txt
+          python -c "from pygmt.helpers.testing import download_test_data; download_test_data()"
 
       # Upload the downloaded files as artifacts to GitHub
       - name: Upload artifacts to GitHub

.github/workflows/ci_docs.yml

@@ -66,8 +66,7 @@ jobs:
       # Install GMT and other required dependencies from conda-forge
       - name: Install dependencies
         run: |
-          conda install conda-forge/label/dev::gmt=6.2.0rc2 \
-                        numpy pandas xarray netCDF4 packaging \
+          conda install gmt=6.2.0 numpy pandas xarray netCDF4 packaging \
                         ipython make myst-parser \
                         sphinx sphinx-copybutton sphinx-gallery sphinx_rtd_theme
 

.github/workflows/ci_tests.yaml

@@ -89,8 +89,7 @@ jobs:
       # Install GMT and other required dependencies from conda-forge
       - name: Install dependencies
         run: |
-          conda install conda-forge/label/dev::gmt=6.2.0rc2 \
-                        numpy=${{ matrix.numpy-version }} \
+          conda install gmt=6.2.0 numpy=${{ matrix.numpy-version }} \
                         pandas xarray netCDF4 packaging \
                         ${{ matrix.optional-packages }} \
                         codecov coverage[toml] dvc ipython make \

doc/index.rst

@@ -42,6 +42,7 @@
     tutorials/plot.rst
     tutorials/lines.rst
     tutorials/vectors.rst
+    tutorials/date_time_charts.rst
     tutorials/text.rst
     tutorials/contour_map.rst
     tutorials/earth_relief.rst

doc/install.rst

@@ -62,7 +62,7 @@ Which GMT?
 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
+We need the latest GMT (>=6.2.0) 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>`__.
 

doc/maintenance.md

@@ -24,6 +24,21 @@ instead.
   branch are in the `dev` folder. Pages for each release are in their own folders.
   **Automatically updated by GitHub Actions** so you shouldn't have to make commits here.
 
+## Managing GitHub issues
+
+A few guidelines for managing GitHub issues:
+
+* Assign [labels](https://github.com/GenericMappingTools/pygmt/labels) and the expected
+  [milestone](https://github.com/GenericMappingTools/pygmt/milestones) to issues as
+  appropriate.
+* When people request to work on an open issue, either assign the issue to that person
+  and post a comment about the assignment or explain why you are not assigning the 
+  issue to them and, if possible, recommend other issues for them to work on.
+* People with write access should self-assign issues and/or comment on the issues that
+  they will address.
+* For upstream bugs, close the issue after an upstream release fixes the bug. If
+  possible, post a comment when an upstream PR is merged that fixes the problem, and
+  consider adding a regression test for serious bugs.
 
 ## Reviewing and merging pull requests
 

environment.yml

@@ -1,12 +1,11 @@
 name: pygmt
 channels:
-    - conda-forge/label/dev
     - conda-forge
     - defaults
 dependencies:
     # Required dependencies
     - pip
-    - gmt=6.2.0rc2
+    - gmt=6.2.0
     - numpy>=1.17
     - pandas
     - xarray

examples/gallery/embellishments/inset.py

@@ -14,12 +14,17 @@
 # "brown", the water to "lightblue", the shorelines width to "thin", and adding a frame
 fig.coast(region="MG+r2", land="brown", water="lightblue", shorelines="thin", frame="a")
 # Create an inset, setting the position to top left, the width to 3.5 centimeters, and
-# the x- and y-offsets to 0.2 centimeters. The margin is set to 0, and the border is "gold".
-with fig.inset(position="jTL+w3.5c+o0.2c", margin=0, box="+pgold"):
+# the x- and y-offsets to 0.2 centimeters. The margin is set to 0, and the border is "gold"
+# with a pen size of 1.5p.
+with fig.inset(position="jTL+w3.5c+o0.2c", margin=0, box="+p1.5p,gold"):
     # Create a figure in the inset using coast. This example uses the azimuthal
     # orthogonal projection centered at 47E, 20S. The land color is set to "gray" and
-    # Madagascar is highlighted in "red".
+    # Madagascar is highlighted in "red3".
     fig.coast(
-        region="g", projection="G47/-20/3.5c", land="gray", water="white", dcw="MG+gred"
+        region="g",
+        projection="G47/-20/?",
+        land="gray",
+        water="white",
+        dcw="MG+gred3",
     )
 fig.show()