Skip to content

Commit eaa0a50

Browse files
authored
Merge branch 'main' into refactor/logo
2 parents 8e75634 + 38b4d07 commit eaa0a50

16 files changed

Lines changed: 52 additions & 42 deletions

File tree

.github/workflows/ci_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198

199199
# Upload coverage to Codecov
200200
- name: Upload coverage to Codecov
201-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
201+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
202202
if: success() || failure()
203203
with:
204204
use_oidc: true

.github/workflows/format-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
# Generate token from GenericMappingTools bot
20-
- uses: actions/create-github-app-token@v2.2.0
20+
- uses: actions/create-github-app-token@v2.2.1
2121
id: generate-token
2222
with:
2323
app-id: ${{ secrets.APP_ID }}

examples/gallery/embellishments/solar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
terminator_datetime=reference_time,
3333
# Set the fill for the night area to navy blue with 85 % transparency
3434
fill="navyblue@85",
35-
pen="0.5p", # Set the outline to be 0.5 points thick
35+
pen="0.5p", # Set the outline to be 0.5-point thick
3636
)
3737

3838
fig.show()

examples/gallery/images/cross_section.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
# directions, respectively; move the x-label above the horizontal colorbar ("+ml")
4747
position="jBR+o0.7c/0.8c+h+w5c/0.3c+ml",
4848
# Add a box around the colobar, filled in white and a 30 % transparency, with a
49-
# 0.8-points thick, black, outline.
49+
# 0.8-point thick, black, outline.
5050
box=Box(pen="0.8p,black", fill="white@30"),
5151
# Add x- and y-labels ("+l")
5252
frame=["x+lElevation", "y+lm"],
@@ -103,7 +103,7 @@
103103
x=[0, 15],
104104
y=[0, 0],
105105
fill="lightblue", # Fill the polygon in "lightblue"
106-
pen="0.25p,black,solid", # Draw a 0.25-points thick, black, solid outline
106+
pen="0.25p,black,solid", # Draw a 0.25-point thick, black, solid outline
107107
close="+y-8000", # Force closed polygon
108108
)
109109

examples/gallery/maps/shorelines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
fig = pygmt.Figure()
1212
# Make a global Mollweide map with automatic ticks
1313
fig.basemap(region="g", projection="W15c", frame=True)
14-
# Display the shorelines as black lines with 0.5 point thickness
14+
# Display the shorelines as black lines with 0.5-point thickness
1515
fig.coast(shorelines="0.5p,black")
1616
fig.show()

examples/gallery/seismology/meca.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
# Fill extensive quadrants with color "cornsilk"
4646
# [Default is "white"]
4747
extensionfill="cornsilk",
48-
# Draw a 0.5 points thick dark gray ("gray30") solid outline via
48+
# Draw a 0.5-point thick dark gray ("gray30") solid outline via
4949
# the pen parameter [Default is "0.25p,black,solid"]
5050
pen="0.5p,gray30,solid",
5151
)

examples/tutorials/advanced/3d_perspective_image.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
# %%
7676
# The ``perspective`` azimuth can be changed to set the direction that is "up"
77-
# in the figure. The ``contourpen`` parameter sets the pen used to draw contour
77+
# in the figure. The ``contour_pen`` parameter sets the pen used to draw contour
7878
# lines on the surface. :meth:`pygmt.Figure.colorbar` can be used to add a
7979
# color bar to the figure. The ``cmap`` parameter does not need to be passed
8080
# again. To keep the color bar's alignment similar to the figure, use ``True``
@@ -91,8 +91,8 @@
9191
surftype="s",
9292
cmap="geo",
9393
plane="1000+ggrey",
94-
# Set the contour pen thickness to "0.1p"
95-
contourpen="0.1p",
94+
# Set the contour pen thickness to 0.1 points
95+
contour_pen="0.1p",
9696
)
9797
fig.colorbar(perspective=True, frame=["a500", "x+lElevation", "y+lm"])
9898
fig.show()

examples/tutorials/advanced/cartesian_histograms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
frame=["WSne", "xaf10", "ya1f1+lCounts"],
121121
data=data02,
122122
series=10,
123-
# Draw a 1.5-points thick, dashed outline in "orange"
123+
# Draw a 1.5-point thick, dashed outline in "orange"
124124
pen="1.5p,orange,dashed",
125125
histtype=0,
126126
stairs=True,

examples/tutorials/advanced/legends.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
fig.plot(x=1, y=0, style="t0.3c", fill="pink", pen="black", label="pink triangle")
9090
fig.plot(x=[-3, 3], y=[-2, -2], pen="darkred", label="darkred line")
9191

92-
# Add a box with a 2-points thick blue, solid outline and a white fill with a
92+
# Add a box with a 2-point thick blue, solid outline and a white fill with a
9393
# transparency of 30 percent ("@30").
9494
fig.legend(position="jTL+o0.3c/0.2c", box=Box(pen="2p,blue", fill="white@30"))
9595

examples/tutorials/advanced/working_with_panel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
frame="g30", # Add frame and gridlines in steps of 30 degrees on top
5151
land="gray", # Color land masses in "gray"
5252
water="lightblue", # Color water masses in "lightblue"
53-
# Add coastlines with a 0.25 points thick pen in "gray50"
53+
# Add coastlines with a 0.25-point thick pen in "gray50"
5454
shorelines="1/0.25p,gray50",
5555
)
5656
fig.show()

0 commit comments

Comments
 (0)