macOS deploy: use the new plistlib API #20298

pull jonasschnelli wants to merge 1 commits into bitcoin:master from jonasschnelli:2020/11/macdeployfix changing 1 files +2 −1
  1. jonasschnelli commented at 9:08 am on November 4, 2020: contributor

    See https://docs.python.org/3/library/plistlib.html. The old API was deprecated in 3.4 and removed in 3.9.

    AFAIK the macdeployplus scripts is only used when calling make deploy locally (on macOS). The linux cross compile build (like gitian) are not affected by this PR.

  2. jonasschnelli added the label macOS on Nov 4, 2020
  3. in contrib/macdeploy/macdeployqtplus:590 in 5a7bc12ac2 outdated
    585@@ -586,7 +586,12 @@ if len(config.fancy) == 1:
    586         sys.exit(1)
    587     
    588     try:
    589-        fancy = plistlib.readPlist(p)
    590+        # the old plistlib API was removed in python3.9, use the new API instead
    591+        if (sys.version_info.major, sys.version_info.minor) >= (3, 9):
    


    MarcoFalke commented at 9:23 am on November 4, 2020:

    no need for this check. This has been added in python 3.4 https://docs.python.org/3.4/library/plistlib.html#plistlib.load

    And we don’t even support 3.4 anymore.


    jonasschnelli commented at 9:28 am on November 4, 2020:
    You’r right. 3.5 is our minimum anyways. Removed the check.
  4. MarcoFalke added the label Build system on Nov 4, 2020
  5. macOS deploy: use the new plistlib API
    See https://docs.python.org/3/library/plistlib.html.
    The new API was added in 3.4 and old removed in 3.9.
    04a69c200e
  6. jonasschnelli force-pushed on Nov 4, 2020
  7. MarcoFalke renamed this:
    macOS deploy: use the new plistlib API if python>=3.9
    macOS deploy: use the new plistlib API
    on Nov 4, 2020
  8. fanquake commented at 9:57 am on November 4, 2020: member

    AFAIK the macdeployplus scripts is only used when calling make deploy locally (on macOS). The linux cross compile build (like gitian) are not affected by this PR.

    The macdeployqtplus script is used on macOS and Linux for the cross-compile/gitian. See here: https://github.com/bitcoin/bitcoin/blob/88776c2926061482ab551b0cf5c408fc1bc39ac3/Makefile.am#L153-L155

  9. jonasschnelli commented at 10:12 am on November 4, 2020: contributor
    @fanquake: thanks for the clarification.
  10. MarcoFalke added the label Needs gitian build on Nov 4, 2020
  11. MarcoFalke added the label Needs Guix build on Nov 4, 2020
  12. practicalswift commented at 5:07 pm on November 4, 2020: contributor
    ACK 04a69c200e0d18ae63c7e47898f85d1b4cb5c23d: patch looks correct
  13. DrahtBot commented at 4:41 am on November 5, 2020: member

    Guix builds

    File commit 88776c2926061482ab551b0cf5c408fc1bc39ac3(master) commit 05e19606b33c4f7e8d6bfb1c4a449ab5ebf3cc6b(master and this pull)
    *-aarch64-linux-gnu-debug.tar.gz 432a867245e807d2... 2c4d78a0d1ae0028...
    *-aarch64-linux-gnu.tar.gz 5d33524358f4a2e9... d1fd3fc23719fd39...
    *-arm-linux-gnueabihf-debug.tar.gz bff3f4db6ebd6f90... 20540db4af9a460c...
    *-arm-linux-gnueabihf.tar.gz 2d4144ec8e3ba1bb... 5fb56604660a4ae6...
    *-riscv64-linux-gnu-debug.tar.gz 436b4f446f2e88b1... 1c2cdc9b8150fca6...
    *-riscv64-linux-gnu.tar.gz fa08a931020c7c72... 62cb985fd4a3eb13...
    *-win-unsigned.tar.gz 45612c286ff0f1c4... 09c9acea76a149b4...
    *-win64-debug.zip 7bf200c1e7640360... 72033e7ed3f57979...
    *-win64-setup-unsigned.exe 648acd525e54387d... dfa980747718bb16...
    *-win64.zip b7ce5ad9a66bf941... 1f03051db1c87df4...
    *-x86_64-linux-gnu-debug.tar.gz 28ca2931fd5dc14c... eaea01ba57cfab03...
    *-x86_64-linux-gnu.tar.gz 36e9ad035b619f49... 06066765bd5b1924...
    *.tar.gz cdf987665874397b... 257c0aa0937ecdac...
    guix_build.log b6ef0a2fe66eb051... 6f73dff945f81786...
    guix_build.log.diff 349ddd0761f21430...
  14. DrahtBot removed the label Needs Guix build on Nov 5, 2020
  15. DrahtBot commented at 9:46 pm on November 5, 2020: member

    Gitian builds

    File commit 67600880159a8a00393ea4969288393a7dfc514d(master) commit 422c67c8a287bd8b3cae695ec835e53c698ce9d7(master and this pull)
    *-aarch64-linux-gnu-debug.tar.gz ab983cbacf45ff9f... e409e7d99cb7420c...
    *-aarch64-linux-gnu.tar.gz c7d9a2922ad9b05a... f7a6db6c77a728ba...
    *-arm-linux-gnueabihf-debug.tar.gz fc96ea9f010a846c... 245a93024269e77f...
    *-arm-linux-gnueabihf.tar.gz e02f181afc61db42... 2e9b64b88d3ff700...
    *-osx-unsigned.dmg 51782f1a178fc943... edde5f379cd3005a...
    *-osx64.tar.gz 015ef71a8dccaf58... 0a41c89eca16384b...
    *-riscv64-linux-gnu-debug.tar.gz a105b0ac88dbf5f0... a73ffcfc7bca8eac...
    *-riscv64-linux-gnu.tar.gz 5d55c984ebb16dfb... ed4356056741c403...
    *-win64-debug.zip 3653e0bd8db1ba83... 5c66975f6d04ef27...
    *-win64-setup-unsigned.exe 1f5b9bf852eebc88... 7400fdd64709b25d...
    *-win64.zip 5c94564d7a0aea17... f91d0998b4101a94...
    *-x86_64-linux-gnu-debug.tar.gz ade3c45cd696ce0b... 673e08a25409292c...
    *-x86_64-linux-gnu.tar.gz 869894c9d8329460... 23bb4ab33b2310ab...
    *.tar.gz 9bd157c62a081a25... 103cf5f427a37f38...
    bitcoin-core-linux-0.21-res.yml 47703b72bb7f9943... f99dd25579b93a1b...
    bitcoin-core-osx-0.21-res.yml 26e9a8e1aab6ac0d... 929a57d6df0694c6...
    bitcoin-core-win-0.21-res.yml 38783ba37a447606... 749c33e5c614145f...
    linux-build.log 00509ce5a7a37f01... 853ba4683da303d3...
    osx-build.log 6ca156e19df6b27d... da0cf766a966a0cb...
    win-build.log 045e68c93813cef4... d0b83f3aa8b4569f...
    bitcoin-core-linux-0.21-res.yml.diff 1dd6e8493f18fbdb...
    bitcoin-core-osx-0.21-res.yml.diff 19a803ff04eb22c0...
    bitcoin-core-win-0.21-res.yml.diff 969e6ae9f10d9766...
    linux-build.log.diff a36863f71aa70551...
    osx-build.log.diff 00201a69dddd54c0...
    win-build.log.diff b5d49e850987de42...
  16. DrahtBot removed the label Needs gitian build on Nov 5, 2020
  17. fanquake approved
  18. fanquake commented at 7:32 am on November 6, 2020: member
    ACK 04a69c200e0d18ae63c7e47898f85d1b4cb5c23d - I checked that make deploy on macOS currently fails when building master and using Python 3.9. This PR fixes that, and it’s fine to use (and backport) these changes as they only require Python 3.4. Related note: I think we could just about drop our native_biplist dependency entirely given some changes upstream.
  19. fanquake merged this on Nov 6, 2020
  20. fanquake closed this on Nov 6, 2020

  21. fanquake commented at 7:41 am on November 6, 2020: member
    Added to #20166 for backporting to the 0.20 branch.
  22. sidhujag referenced this in commit db0541567c on Nov 6, 2020
  23. fanquake commented at 1:14 pm on November 7, 2020: member
    Followed up with removing native_biplist in #20333.
  24. MarcoFalke referenced this in commit a2fa11f9de on Nov 18, 2020
  25. MarkLTZ referenced this in commit c61e643b75 on Nov 21, 2020
  26. furszy referenced this in commit 816f42d7ac on May 25, 2021
  27. PastaPastaPasta referenced this in commit 200bb08825 on Jun 27, 2021
  28. PastaPastaPasta referenced this in commit ad6fc88d72 on Jun 28, 2021
  29. PastaPastaPasta referenced this in commit 05f6216320 on Jun 29, 2021
  30. PastaPastaPasta referenced this in commit 89c3e472c5 on Jul 1, 2021
  31. PastaPastaPasta referenced this in commit b2aec7a71b on Jul 1, 2021
  32. PastaPastaPasta referenced this in commit 93c29e3207 on Jul 15, 2021
  33. PastaPastaPasta referenced this in commit d33ae6a445 on Jul 15, 2021
  34. PastaPastaPasta referenced this in commit 7613d3c433 on Jul 16, 2021
  35. gabriel-bjg referenced this in commit b6198f9457 on Jul 16, 2021
  36. DrahtBot locked this on Feb 15, 2022

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-17 06:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me