Commit 60d558e
authored
Merge pull request OSGeo#13697 from rouault/parquet_conflict_with_geoarrow_pyarrow
Parquet: avoid conflicts with geoarrow.pyarrow Python module when …File tree
4 files changed
+222
-197
lines changed- .github/workflows
- autotest/ogr
- data/parquet
- ogr/ogrsf_frmts/parquet
4 files changed
+222
-197
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
434 | 434 | | |
435 | 435 | | |
436 | 436 | | |
437 | | - | |
| 437 | + | |
438 | 438 | | |
439 | 439 | | |
440 | 440 | | |
| |||
Binary file not shown.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4275 | 4275 | | |
4276 | 4276 | | |
4277 | 4277 | | |
| 4278 | + | |
| 4279 | + | |
| 4280 | + | |
| 4281 | + | |
| 4282 | + | |
| 4283 | + | |
| 4284 | + | |
| 4285 | + | |
| 4286 | + | |
| 4287 | + | |
| 4288 | + | |
| 4289 | + | |
| 4290 | + | |
| 4291 | + | |
| 4292 | + | |
| 4293 | + | |
4278 | 4294 | | |
4279 | 4295 | | |
4280 | 4296 | | |
| |||
0 commit comments