Skip to content
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

Bump to cartopy 0.21.0, rasterio 1.3.3, hdf5 1.12.2, qgis 3.22.11 #16

Merged
merged 2 commits into from
Nov 30, 2022

Conversation

weiji14
Copy link
Member

@weiji14 weiji14 commented Nov 29, 2022

Minor version updates to fix mamba solver as reported in #13 (comment). Cherry-picked from #14.

Minor version updates to fix `mamba` solver.
@weiji14
Copy link
Member Author

weiji14 commented Nov 29, 2022

/condalock

@github-actions
Copy link

Binder 👈 Test this PR on Binder

@weiji14 weiji14 marked this pull request as ready for review November 29, 2022 23:41
@yuvipanda
Copy link
Contributor

It looks like merge commits are disabled for this repository, do you know why? I think they're extremely helpful in figuring out which PR a particular change landed in...

@yuvipanda yuvipanda merged commit 8792435 into main Nov 30, 2022
@yuvipanda yuvipanda deleted the bump-qgis-3.22 branch November 30, 2022 00:24
@yuvipanda
Copy link
Contributor

I've just re-enabled them, but not sure why they were disabled in the first place...

@weiji14
Copy link
Member Author

weiji14 commented Nov 30, 2022

Ah sorry, I usually go with squash and merge to keep a linear history. Ok with re-enabling them too if you prefer it that way.

@yuvipanda
Copy link
Contributor

@weiji14 yeah, I really like not losing individual commit messages! I think we can rebase and merge too if you prefer.

@weiji14
Copy link
Member Author

weiji14 commented Nov 30, 2022

Let's stick with regular merges. There shouldn't be too many people making changes to this repo so I can live with a bit of spaghetti git history.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants