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.

Sign up for GitHub

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

Jump to bottom

qgis: 3.10.1 -> 3.10.4 (+ libs) #83317

Merged
merged 3 commits into from Mar 25, 2020
Merged

qgis: 3.10.1 -> 3.10.4 (+ libs) #83317

merged 3 commits into from Mar 25, 2020

Conversation

lsix
Copy link
Member

@lsix lsix commented Mar 24, 2020

Motivation for this change

Update QGIS.

In this PR, I do not upgrade proj up to 7.0.0 since I intend to backport those changes to release-20.03. I’ll do the proj-7.0.0 update after in a separate PR.

The update of pyproj makes it python2 incompatible and few packages become unavailable in python2Packages as a consequence, but I do not think this is a problem (python2 is deprecated anyway).

This closes #78755

cc @das-g

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from vbgl March 24, 2020 21:29
das-g
das-g reviewed Mar 24, 2020
View reviewed changes
Copy link
Member

@das-g das-g left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️ Diff LGTM. 👍

🤔 I wonder whether proj: 6.1.1 -> 6.3.1 (currently cbb385a) and pythonPackages.pyproj: 2.2.2 -> 2.6.0 (currently da164cb) should instead be done in a single commit, as one AFAIK cannot bump one without breaking the other.

⏳ I didn't test it, yet.

@das-g das-g mentioned this pull request Mar 24, 2020
Closed
6 tasks
@lsix
Copy link
Member Author

lsix commented Mar 24, 2020

Should be better.

@lsix
Copy link
Member Author

lsix commented Mar 24, 2020

I think (but not tested yet, I’ll have a look when I’ll prepare the release-20.03 backport) that I can only disable the tests with rounding issues in pyproj (arising in both versions) and it should work. But I’ll check when preparing the backport since I would prefer not to update pyproj since it removes python2 packages.

jonringer
jonringer approved these changes Mar 25, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM
commits LGTM

[68 built, 300 copied (2511.5 MiB), 497.3 MiB DL]
https://github.com/NixOS/nixpkgs/pull/83317
8 package marked as broken and skipped:
gazebo gazebo-headless gazeboSimulator.gazebo6 gazeboSimulator.gazebo6-headless gazeboSimulator.gazebo7 gazeboSimulator.gazebo7-headless gplates openspace

56 package built:
gdal gdal_1_11 gdal_2 grass libLAS libgeotiff libspatialite mapnik merkaartor mysql-workbench openorienteering-mapper osm2pgsql osm2xmap perl528Packages.Tirex perl530Packages.Tirex postgresqlPackages.postgis proj python27Packages.fiona python27Packages.gdal python27Packages.labelbox python27Packages.python-mapnik python27Packages.rasterio python27Packages.tilestache python27Packages.worldengine python37Packages.basemap python37Packages.cartopy python37Packages.fiona python37Packages.geopandas python37Packages.labelbox python37Packages.osmnx python37Packages.owslib python37Packages.pyproj python37Packages.python-mapnik python37Packages.rasterio worldengine-cli python38Packages.basemap python38Packages.cartopy python38Packages.fiona python38Packages.gdal python38Packages.geopandas python38Packages.labelbox python38Packages.osmnx python38Packages.owslib python38Packages.pyproj python38Packages.python-mapnik python38Packages.rasterio python38Packages.worldengine qgis qgis-unwrapped qlandkartegt qmapshack readosm saga spatialite_tools xastir xygrib

@jonringer
Copy link
Contributor

thinking I wonder whether proj: 6.1.1 -> 6.3.1 (currently cbb385a) and pythonPackages.pyproj: 2.2.2 -> 2.6.0 (currently da164cb) should instead be done in a single commit, as one AFAIK cannot bump one without breaking the other.

I would have them as separate commits, as it might help to bisect if the bump in pyproj or proj caused a regression

@jonringer jonringer merged commit 8e8efc7 into NixOS:master Mar 25, 2020
@lsix lsix mentioned this pull request Mar 25, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@das-g das-g das-g requested changes

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@vbgl vbgl Awaiting requested review from vbgl

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

upgrade QGIS to 3.10.2
3 participants
@lsix @jonringer @das-g