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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

qgis: fix sip and pyqt5-sip compatibility #274408

Merged
merged 1 commit into from Jan 19, 2024

Conversation

imincik
Copy link
Contributor

@imincik imincik commented Dec 15, 2023

Description of changes

This is stable branch fix for sip and pyqt5_sip compatibility issue discovered
in #273561 .

I decided to backport newer version of pyqt5_sip to avoid regression in other
packages. This fix should be removed in NixOS 24.05.

In master branch, this issue was resolved in #273914 .

Closes #273561.

Cc @dvdkon

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 馃憤 reaction to pull requests you find important.

@imincik imincik self-assigned this Dec 15, 2023
@dvdkon
Copy link

dvdkon commented Dec 15, 2023

Thanks. Maybe there should also be a comment added to both sip and pyqt5_sip that their versions need to be synchronised for QGIS (and maybe others)?

@imincik
Copy link
Contributor Author

imincik commented Dec 18, 2023

Usage of pyqt5_sip version 12.13.0 is causing many warnings:

 WARNING    warning:/nix/store/jqr1f2a4d4ihmzjyf8vr9319s0nq7whf-qgis-unwrapped-3.34.1/share/qgis/python/plugins/processing/core/ProcessingConfig.py:37: DeprecationWarning: sipPyTypeDict() is deprecated, the extension module should use sipPyTypeDictRef() instead

Downgrade to 12.12.1 if fixing this problem.

@imincik imincik force-pushed the qgis-fix-sip-pyqt5-sip-compatibility branch from 6b0e65c to 86a1ba7 Compare December 18, 2023 17:28
@imincik
Copy link
Contributor Author

imincik commented Dec 18, 2023

QGIS tested, the output looks OK. Application is not crashing anymore.

  • should succeed
QgsRuleBasedRenderer.Rule(QgsSymbol.defaultSymbol(QgsWkbTypes.LineGeometry))
<qgis._core.QgsRuleBasedRenderer.Rule object at 0x7fa8c2d257e0>
  • should fail
QgsRuleBasedRenderer.Rule(QgsSymbol.defaultSymbol(QgsWkbTypes.LineGeometry), None, label="")
Traceback (most recent call last):
  File "/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/lib/python3.11/code.py", line 90, in runcode
    exec(code, self.locals)
  File "<input>", line 1, in <module>
TypeError: Rule(): argument 2 has unexpected type 'NoneType'

@NixOS/geospatial , this PR is now ready to be reviewed. Great thanks for fix belongs to @dvdkon

@imincik imincik marked this pull request as ready for review December 18, 2023 17:30
@imincik
Copy link
Contributor Author

imincik commented Dec 18, 2023

@ofborg build qgis qgis-ltr

@imincik
Copy link
Contributor Author

imincik commented Dec 18, 2023

Result of nixpkgs-review pr 274408 run on x86_64-linux 1

2 packages built:
  • qgis
  • qgis-ltr

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/week-in-geospatial-team-11-17-dec-2023/37035/1

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/week-in-geospatial-team/37035/2

@nialov
Copy link
Contributor

nialov commented Jan 13, 2024

Result of nixpkgs-review pr 274408 run on x86_64-linux 1

2 packages built:
  • qgis
  • qgis-ltr

@nialov
Copy link
Contributor

nialov commented Jan 13, 2024

Opened the GUI for both QGIS and the LTR version and did brief functionality tests. No issues.

EDIT: Although I might have made the mistake of not providing the branch for nixpkgs-review. Will test again this week hopefully to make sure.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/week-in-geospatial-team/37035/3

@nialov
Copy link
Contributor

nialov commented Jan 19, 2024

Tested with nixpkgs-review -- rev HEAD --branch release-23.11. Tested GUI functionality quickly for both standard and LTS releases.

@imincik
Copy link
Contributor Author

imincik commented Jan 19, 2024

@nialov , thank you very much for testing.

@imincik imincik merged commit 6f9f00d into release-23.11 Jan 19, 2024
25 checks passed
@imincik imincik deleted the qgis-fix-sip-pyqt5-sip-compatibility branch January 19, 2024 14:00
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/week-in-geospatial-team/37035/6

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

Successfully merging this pull request may close these issues.

QGIS PyQGIS bug/crash regression
4 participants