Bug 266211 - devel/py-maturin: update to 0.13.2
Summary: devel/py-maturin: update to 0.13.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Kai Knoblich
URL: https://github.com/PyO3/maturin/blob/...
Keywords:
Depends on:
Blocks: 266213
  Show dependency treegraph
 
Reported: 2022-09-04 02:41 UTC by Ivan Rozhuk
Modified: 2022-09-10 11:20 UTC (History)
1 user (show)

See Also:
kai: maintainer-feedback+


Attachments
patch (3.16 KB, patch)
2022-09-04 02:41 UTC, Ivan Rozhuk
no flags Details | Diff
patch (89.56 KB, patch)
2022-09-04 02:42 UTC, Ivan Rozhuk
no flags Details | Diff
patch, add build deps (90.16 KB, patch)
2022-09-08 08:10 UTC, Ivan Rozhuk
no flags Details | Diff
py-maturin-0.13.2-revised.patch (90.72 KB, patch)
2022-09-09 05:19 UTC, Kai Knoblich
kai: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Ivan Rozhuk 2022-09-04 02:41:19 UTC
Created attachment 236346 [details]
patch

Newer version required to build devel/py-orjson
Comment 1 Ivan Rozhuk 2022-09-04 02:42:28 UTC
Created attachment 236348 [details]
patch
Comment 2 Ivan Rozhuk 2022-09-08 08:10:00 UTC
Created attachment 236432 [details]
patch, add build deps

Probably these deps should be added as run dep too.
Comment 3 Kai Knoblich freebsd_committer freebsd_triage 2022-09-09 05:19:17 UTC
Created attachment 236446 [details]
py-maturin-0.13.2-revised.patch

(In reply to Ivan Rozhuk from comment #2)

Hi Ivan, thanks for your work and the patches, much appreciated!

I made some small modifications based on your second patch:

* Set the Python dependencies as given in the "setup.py" except for textproc/py-tomli which is also required for build. (This might be a bug in the setup.py).

* Removed the "openssl-src" from CARGO_CRATES and added another patch to avoid using the vendored copy of OpenSSL:

> /!\ py39-maturin-0.13.2: Makefile warnings, please consider fixing /!\
> 
> Please make sure this port uses the system OpenSSL and consider removing
> CARGO_CRATES=openssl-src-111.22.0+1.1.1q (a vendored copy of OpenSSL) from
> the build, e.g., by patching Cargo.toml appropriately.

* At last but not least: Rebased the patch against the recent WWW field changes.

QA:
~~~
poudriere -> OK (12.3-, 13.1-RELEASE, 14.0-CURRENT@8c309d48aab amd64)

We also need to take care of "www/py-adblock": 

Adding BINARY_ALIAS=python3=${PYTHON_CMD} is required for it to avoid build failures once the update for devel/py-maturin lands.

I plan to commit the patch the upcoming weekend and I'll leave it attached here for reviewing/testing until then.
Comment 4 commit-hook freebsd_committer freebsd_triage 2022-09-10 10:52:57 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8978bbb9747c44ba8ddf8058ea3419c363e92bf2

commit 8978bbb9747c44ba8ddf8058ea3419c363e92bf2
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2022-09-10 10:33:40 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2022-09-10 10:33:40 +0000

    www/py-adblock: Prepare for py-maturin >= 0.13.0

    * Since the 0.13.0 release maturin no longer searches for the Python
      interpreters by default and uses the current interpreter found in the
      PATH environment variable.  Thus set BINARY_ALIAS to give a specific
      Python interpreter during build.

    * Fix build as well if building the port for multiple Python flavors by
      using FLAVOR_DEFAULT_ALL in poudriere and BUILD_ALL_PYTHON_FLAVORS in
      the make.conf.

    * Add CONFLICTS_INSTALL because a shared library is installed outside of
      Python's site-lib directory.

    * No bump of PORTREVISION as the package content isn't changed.

    PR:             266211 (related)
    Approved by:    portmgr (blanket)

 www/py-adblock/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
Comment 5 commit-hook freebsd_committer freebsd_triage 2022-09-10 10:52:58 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a706257a32e3f2a82dac91c9f5a82d3461b50ba7

commit a706257a32e3f2a82dac91c9f5a82d3461b50ba7
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2022-09-10 10:37:22 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2022-09-10 10:37:22 +0000

    devel/py-maturin: Update to 0.13.2

    * Since the 0.13.0 release maturin no longer searches for the Python
      interpreters by default and uses the current interpreter found in the
      PATH environment variable.  Thus set BINARY_ALIAS to give a specific
      Python interpreter during build.

    * Remove two patches that were upstreamed.

    Changelog since 0.11.3:

    https://github.com/PyO3/maturin/blob/v0.13.2/Changelog.md

    PR:             266211
    Reported by:    Ivan Rozhuk
    Co-Authored by: Ivan Rozhuk
    MFH:            No (contains breaking changes)

 devel/py-maturin/Makefile                          | 428 ++++++-----
 devel/py-maturin/distinfo                          | 826 ++++++++++++---------
 .../patch-cargo-crates_xwin-0.2.5_Cargo.toml (new) |  15 +
 devel/py-maturin/files/patch-setup.py (gone)       |  39 -
 devel/py-maturin/files/patch-src_target.rs (gone)  |  29 -
 5 files changed, 756 insertions(+), 581 deletions(-)
Comment 6 Kai Knoblich freebsd_committer freebsd_triage 2022-09-10 11:20:36 UTC
Committed, thank you for the patches!