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

python311Packages.pyregion: 2.1.1 -> 2.2.0; fix darwin build #270042

Merged
merged 1 commit into from Nov 27, 2023
Merged

python311Packages.pyregion: 2.1.1 -> 2.2.0; fix darwin build #270042

merged 1 commit into from Nov 27, 2023
+30 −34

Conversation

ghost
Copy link

@ghost ghost commented Nov 26, 2023 •
edited by ghost
Loading

https://github.com/astropy/pyregion/blob/2.2.0/CHANGES.rst

add -Wno-error=int-conversion for clang to not error out on cython generated code. (code returns NULL rather than 0). gcc warns but does not error.

  • enable all unit tests for darwin
  • cleanup the propagatedBuildInputs
  • remove stale substitueInPlace

ZHF: #265948
https://hydra.nixos.org/build/241194996

darwin failures due to https://hydra.nixos.org/build/241694951 which will be fixed when this and #270027 are merged

Result of nixpkgs-review run on x86_64-darwin 1

16 packages failed to build:
  • python310Packages.aplpy
  • python310Packages.aplpy.dist
  • python310Packages.glueviz
  • python310Packages.glueviz.dist
  • python310Packages.pvextractor
  • python310Packages.pvextractor.dist
  • python310Packages.spectral-cube
  • python310Packages.spectral-cube.dist
  • python311Packages.aplpy
  • python311Packages.aplpy.dist
  • python311Packages.glueviz
  • python311Packages.glueviz.dist
  • python311Packages.pvextractor
  • python311Packages.pvextractor.dist
  • python311Packages.spectral-cube
  • python311Packages.spectral-cube.dist
4 packages built:
  • python310Packages.pyregion
  • python310Packages.pyregion.dist
  • python311Packages.pyregion
  • python311Packages.pyregion.dist

with this PR and #270027 all packages build

Result of nixpkgs-review run on x86_64-darwin 1

28 packages built:
  • python310Packages.aplpy
  • python310Packages.aplpy.dist
  • python310Packages.astropy-healpix
  • python310Packages.astropy-healpix.dist
  • python310Packages.glueviz
  • python310Packages.glueviz.dist
  • python310Packages.pvextractor
  • python310Packages.pvextractor.dist
  • python310Packages.pyregion
  • python310Packages.pyregion.dist
  • python310Packages.reproject
  • python310Packages.reproject.dist
  • python310Packages.spectral-cube
  • python310Packages.spectral-cube.dist
  • python311Packages.aplpy
  • python311Packages.aplpy.dist
  • python311Packages.astropy-healpix
  • python311Packages.astropy-healpix.dist
  • python311Packages.glueviz
  • python311Packages.glueviz.dist
  • python311Packages.pvextractor
  • python311Packages.pvextractor.dist
  • python311Packages.pyregion
  • python311Packages.pyregion.dist
  • python311Packages.reproject
  • python311Packages.reproject.dist
  • python311Packages.spectral-cube
  • python311Packages.spectral-cube.dist

Result of nixpkgs-review run on x86_64-linux 1

20 packages built:
  • python310Packages.aplpy
  • python310Packages.aplpy.dist
  • python310Packages.glueviz
  • python310Packages.glueviz.dist
  • python310Packages.pvextractor
  • python310Packages.pvextractor.dist
  • python310Packages.pyregion
  • python310Packages.pyregion.dist
  • python310Packages.spectral-cube
  • python310Packages.spectral-cube.dist
  • python311Packages.aplpy
  • python311Packages.aplpy.dist
  • python311Packages.glueviz
  • python311Packages.glueviz.dist
  • python311Packages.pvextractor
  • python311Packages.pvextractor.dist
  • python311Packages.pyregion
  • python311Packages.pyregion.dist
  • python311Packages.spectral-cube
  • python311Packages.spectral-cube.dist

Description of changes

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/)
  • 23.11 Release Notes (or backporting 23.05 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.

Priorities

Add a 👍 reaction to pull requests you find important.

@ghost ghost mentioned this pull request Nov 26, 2023
Merged
13 tasks
@ghost ghost added 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign backport release-23.11 labels Nov 26, 2023
@ghost ghost requested a review from smaret November 26, 2023 05:01
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Nov 26, 2023
smaret
smaret approved these changes Nov 27, 2023
View reviewed changes
Copy link
Member

@smaret smaret left a comment •
edited
Loading

Choose a reason for hiding this comment

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

This looks good to me. I'm just curious about the preCheck block (see my comment bellow). But it the tests pass, this is fine with me.

pkgs/development/python-modules/pyregion/default.nix Outdated Show resolved Hide resolved
python311Packages.pyregion: 2.1.1 -> 2.2.0; fix darwin build
8326361 
https://github.com/astropy/pyregion/blob/2.2.0/CHANGES.rst

add -Wno-error=int-conversion for clang to not error out on generated
code. (code returns NULL rather than 0). gcc warns but does not error.
@ofborg ofborg bot requested a review from smaret November 27, 2023 21:34
risicle
risicle approved these changes Nov 27, 2023
View reviewed changes
Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

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

nixpkgs-review happy, macos 12 x86_64, nixos x86_64

@risicle risicle merged commit 24d1305 into NixOS:master Nov 27, 2023
8 of 9 checks passed
@github-actions GitHub Actions
Copy link
Contributor

Successfully created backport PR for release-23.11:

@github-actions github-actions bot mentioned this pull request Nov 27, 2023
Merged
1 task
@ghost ghost deleted the pyregion-fix branch November 29, 2023 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@smaret smaret Awaiting requested review from smaret

Assignees
No one assigned
Labels
0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 6.topic: darwin Running or building packages on Darwin 6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@smaret @risicle