Skip to content

Commit b9a3267

Browse files
authored
Merge branch 'main' into alias-system
2 parents 88a216c + 89021cd commit b9a3267

File tree

3 files changed

+10
-51
lines changed

3 files changed

+10
-51
lines changed

.github/workflows/ci_tests.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,15 @@ jobs:
7979
pandas-version: ''
8080
xarray-version: ''
8181
optional-packages: ' contextily geopandas ipython pyarrow rioxarray sphinx-gallery'
82+
# The job below is for testing geopandas v0.x on Ubuntu.
83+
# The python-version here can't be the versions in the matrix.python-version
84+
# defined above. Otherwise, other jobs will be overridden by this one.
85+
- os: 'ubuntu-latest'
86+
python-version: '3.11' # Can't be 3.10 or 3.12.
87+
numpy-version: '1.24'
88+
pandas-version: ''
89+
xarray-version: ''
90+
optional-packages: ' geopandas<1'
8291

8392
timeout-minutes: 30
8493
defaults:

doc/_static/style.css

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -48,38 +48,6 @@ p {
4848
font-size: 4em;
4949
}
5050

51-
.api-module {
52-
margin-bottom: 80px;
53-
}
54-
55-
.youtube-embed {
56-
max-width: 600px;
57-
margin-bottom: 24px;
58-
}
59-
60-
.video-container {
61-
position:relative;
62-
padding-bottom:56.25%;
63-
padding-top:30px;
64-
height:0;
65-
overflow:hidden;
66-
}
67-
68-
.video-container iframe, .video-container object, .video-container embed {
69-
position:absolute;
70-
top:0;
71-
left:0;
72-
width:100%;
73-
height:100%;
74-
}
75-
76-
/*.wy-menu-vertical header, .wy-menu-vertical p.caption {*/
77-
/*font-size: 90%;*/
78-
/*font-weight: bold;*/
79-
/*color: #eeeeee;*/
80-
/*letter-spacing: 0.12em;*/
81-
/*}*/
82-
8351
.wy-nav-content {
8452
max-width: 1000px;
8553
}
@@ -137,22 +105,6 @@ html.writer-html5 .rst-content dl.field-list {
137105
}
138106
}
139107

140-
/* Style for the copy button */
141-
/* Safe to remove for sphinx-copybutton>0.3.1
142-
* https://github.com/executablebooks/sphinx-copybutton/pull/107
143-
*/
144-
a.copybtn {
145-
position: absolute;
146-
top: .2em;
147-
right: .2em;
148-
width: 1.3em;
149-
height: 1.3em;
150-
opacity: .3;
151-
transition: opacity 0.5s;
152-
border: none;
153-
user-select: none;
154-
}
155-
156108
/* Atkinson Hyperlegible regular */
157109
@font-face {
158110
font-family: "Atkinson Hyperlegible";
@@ -189,9 +141,6 @@ a.copybtn {
189141
.sphx-glr-thumbcontainer {
190142
border: solid #d6d6d6 1px!important;
191143
text-align: center!important;
192-
}
193-
194-
.sphx-glr-thumbcontainer {
195144
min-height: 240px!important;
196145
min-width: 180px!important;
197146
}

pygmt/helpers/tempfile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ def tempfile_from_geojson(geojson):
153153
if dtype in {"int", "int64"}:
154154
overflow = geojson[col].abs().max() > 2**31 - 1
155155
schema["properties"][col] = "float" if overflow else "int32"
156+
geojson[col] = geojson[col].astype(schema["properties"][col])
156157
ogrgmt_kwargs["schema"] = schema
157158
else: # GeoPandas v1.x.
158159
# The default engine "pyogrio" doesn't support the 'schema' parameter

0 commit comments

Comments
 (0)