Skip to content

python3Packages.pillow: pull zlib-1.3 fix pending upstream inclusion#250252

Merged
tjni merged 1 commit intoNixOS:stagingfrom
trofi:python3Packages.pillow-zlib-1.3.fix
Aug 22, 2023
Merged

python3Packages.pillow: pull zlib-1.3 fix pending upstream inclusion#250252
tjni merged 1 commit intoNixOS:stagingfrom
trofi:python3Packages.pillow-zlib-1.3.fix

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Aug 19, 2023

Without the change tests fails against zlib-1.3 as:

    def test_sanity(self, tmp_path):
        # internal version number
>       assert re.search(r"\d+\.\d+\.\d+(\.\d+)?$", features.version_codec("zlib"))
E       AssertionError: assert None
E        +  where None = <function search at 0x7ffff74c5c60>('\\d+\\.\\d+\\.\\d+(\\.\\d+)?$', '1.3')
E        +    where <function search at 0x7ffff74c5c60> = re.search
E        +    and   '1.3' = <function version_codec at 0x7ffff6896680>('zlib')
E        +      where <function version_codec at 0x7ffff6896680> = features.version_codec
Tests/test_file_png.py:82: AssertionError

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Aug 19, 2023
@trofi trofi mentioned this pull request Aug 19, 2023
14 tasks
@ofborg ofborg bot requested review from cillianderoiste and prikhi August 19, 2023 22:52
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Aug 19, 2023
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo zlip

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch! Renamed to name = "zlib-1.3.patch";.

Without the change tests fails against `zlib-1.3` as:

        def test_sanity(self, tmp_path):
            # internal version number
    >       assert re.search(r"\d+\.\d+\.\d+(\.\d+)?$", features.version_codec("zlib"))
    E       AssertionError: assert None
    E        +  where None = <function search at 0x7ffff74c5c60>('\\d+\\.\\d+\\.\\d+(\\.\\d+)?$', '1.3')
    E        +    where <function search at 0x7ffff74c5c60> = re.search
    E        +    and   '1.3' = <function version_codec at 0x7ffff6896680>('zlib')
    E        +      where <function version_codec at 0x7ffff6896680> = features.version_codec
    Tests/test_file_png.py:82: AssertionError
@trofi trofi force-pushed the python3Packages.pillow-zlib-1.3.fix branch from 703aec8 to 2f416c0 Compare August 20, 2023 17:32
@tjni
Copy link
Contributor

tjni commented Aug 22, 2023

@ofborg build python310Packages.pillow python311Packages.pillow

Just to sanity check on CI.

@tjni tjni merged commit 050e1f3 into NixOS:staging Aug 22, 2023
@trofi trofi deleted the python3Packages.pillow-zlib-1.3.fix branch August 22, 2023 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants