Skip to content

Commit d75eb78

Browse files
committed
Merge branch 'main' into refactor/data_kind
2 parents 21f581a + ff246c6 commit d75eb78

File tree

8 files changed

+14
-12
lines changed

8 files changed

+14
-12
lines changed

.github/workflows/ci_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
sphinx-autodoc-typehints
114114
sphinx-copybutton
115115
sphinx-design
116-
sphinx-gallery<0.17.0
116+
sphinx-gallery
117117
sphinx_rtd_theme
118118
119119
# Download cached remote files (artifacts) from GitHub

ci/requirements/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ dependencies:
2828
- sphinx-autodoc-typehints
2929
- sphinx-copybutton
3030
- sphinx-design
31-
- sphinx-gallery<0.17.0
31+
- sphinx-gallery
3232
- sphinx_rtd_theme

doc/techref/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ visit the {gmt-docs}`GMT Technical Reference <reference.html>`.
88
```{toctree}
99
:maxdepth: 1
1010
11+
projections.rst
1112
encodings.md
1213
```

examples/projections/table/README.txt renamed to doc/techref/projections.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Projection Table
2-
----------------
1+
GMT Map Projections
2+
-------------------
33

44
The table below shows the projection codes for the 31 GMT projections:
55

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- sphinx-autodoc-typehints
4141
- sphinx-copybutton
4242
- sphinx-design
43-
- sphinx-gallery<0.17.0
43+
- sphinx-gallery
4444
- sphinx_rtd_theme
4545
# Dev dependencies (type hints)
4646
- mypy

examples/projections/README.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
Projections
22
===========
33

4-
PyGMT supports many map projections. Use the ``projection`` parameter to specify which
5-
one you want to use in all plotting methods. The projection is specified by a one-letter
6-
code along with (sometimes optional) reference longitude and latitude and the
7-
width of the map (for example, **A**\ *lon0/lat0*\ [*/horizon*\ ]\ */width*). The map
8-
height is determined based on the region and projection.
4+
PyGMT supports many map projections; see :doc:`/techref/projections` for an overview.
5+
Use the ``projection`` parameter to specify which one you want to use in all plotting
6+
methods. The projection is specified by a one-letter code along with (sometimes optional)
7+
reference longitude and latitude and the width of the map (for example,
8+
**A**\ *lon0/lat0*\ [*/horizon*\ ]\ */width*). The map height is determined based on the
9+
region and projection.
910

1011
These are all the available projections:

pygmt/datasets/tile_map.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def load_tile_map(
122122
* band (band) uint8 ... 1 2 3
123123
* y (y) float64 ... -7.081e-10 -7.858e+04 ... -1.996e+07 -2.004e+07
124124
* x (x) float64 ... -2.004e+07 -1.996e+07 ... 1.996e+07 2.004e+07
125-
spatial_ref int64 ... 0
125+
spatial_ref int... 0
126126
>>> # CRS is set only if rioxarray is available
127127
>>> if hasattr(raster, "rio"):
128128
... raster.rio.crs

pygmt/src/text.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def text_( # noqa: PLR0912
6363
The text strings passed via the ``text`` parameter can contain ASCII characters and
6464
non-ASCII characters defined in the Adobe ISOLatin1+, Adobe Symbol, Adobe
6565
ZapfDingbats and ISO-8859-x (x can be 1-11, 13-16) encodings. Refer to
66-
:doc:`techref/encodings` for the full list of supported non-ASCII characters.
66+
:doc:`/techref/encodings` for the full list of supported non-ASCII characters.
6767
6868
Full option list at :gmt-docs:`text.html`.
6969

0 commit comments

Comments
 (0)