-
Notifications
You must be signed in to change notification settings - Fork 206
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add gdal 3.5 and 3.6 to CI, update proj/gdal install scripts to use cmake, update drvsupport #1122
Conversation
This pinned version of munch is incompatible with Python 3.11: Line 5 in 9d06389
not sure which one to pick, but there are several newer versions |
Looks like I opened a can of worms. This PR:
The tests testing GDAL functionality (e.g. read / write / append support of drivers or support of drivers for time / datetime) are now marked with @pytest.mark.gdal. These tests should only be executed when adding the Thanks @mwtoews for having a look at this PR. |
There are still some regressions: The cmake configuration step emits the following warning and I'm not exactly sure why:
The FileGDB driver is not included with the cmake install script. But as gdal 3.6 seems to support writing GDB files with the OpenFileGDB driver this seems not be that important. |
@rbuffat can we do without the |
@sgillies Sorry I forgot about this PR.
What I intended to implement is that the |
That seems not to work as intended. I will have a look at it later. |
With the current changes, when pytest is run using
When using
@sgillies I'm not sure this is the way this should be done. It looks too complicated, which often indicates that something is done wrong. I will look at it again when I have more brain capacity left. Or what is your opinion, should we avoid meddling with the markers in |
@sgillies This PR should now be ready for a review.
|
@@ -56,7 +56,7 @@ | |||
# GeoJSON GeoJSON Yes Yes Yes | |||
("GeoJSON", "raw"), | |||
# GeoJSONSeq GeoJSON sequences Yes Yes Yes | |||
("GeoJSONSeq", "rw"), | |||
("GeoJSONSeq", "raw"), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"raw" only since GDAL 3.6
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is limited in the driver_mode_mingdal
dict:
Line 169 in ac7aeeb
'GeoJSONSeq': (3, 6, 0), |
@rbuffat, friendly ping. Is this something you see moving forward soon? |
@zklaus The PR is ready to be reviewed. It is currently only for the 1.9 branch, but the same changes should also apply for the 1.8 branch. This PR does not change the functionality of Fiona (expect that without it Fiona limits some driver capabilities that GDAL gained with version 3.6) |
@@ -8,6 +8,7 @@ filterwarnings = | |||
markers = | |||
iconv: marks tests that require gdal to be compiled with iconv | |||
network: marks tests that require a network connection | |||
wheel: marks test that only works when installed from wheel | |||
wheel: marks tests that only works when installed from wheel | |||
gdal: marks tests that are only dependent on GDAL functionality (e.g. for drvsupport) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rbuffat thank you!
@sgillies should this be backported to maint-1.8 for a 1.8.23 release? |
@rbuffat if people use Fiona 1.8.22 with 3.6.0 they will see a few failing tests, but no breakage, right? I'm inclined to not backport and not make a new release. |
Fyi, I have effectively backported this in conda-forge/fiona-feedstock#203 |
See #1099 (comment)