Bug 273727 - [exp-run] Replace USES=pycryptography* with USE_PYTHON=cryptography{,_build,_test}
Summary: [exp-run] Replace USES=pycryptography* with USE_PYTHON=cryptography{,_build,_...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Po-Chuan Hsieh
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-09-11 19:17 UTC by Po-Chuan Hsieh
Modified: 2023-09-30 01:14 UTC (History)
2 users (show)

See Also:
antoine: exp-run+


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Po-Chuan Hsieh freebsd_committer freebsd_triage 2023-09-11 19:17:18 UTC
patch: https://people.freebsd.org/~sunpoet/patch/USE_PYTHON=cryptography.txt

The patch includes the following changes:
- Introduce USE_PYTHON=cryptographycryptography{,_build,_test}
- Replace USES=pycryptography with USE_PYTHON=cryptography cryptography_build
- Replace USES=pycryptography:build with USE_PYTHON=cryptography_build
- Replace USES=pycryptography:run with USE_PYTHON=cryptography
- Replace USES=pycryptography:test with USE_PYTHON=cryptography_test
- Remove Mk/Uses/pycryptography.mk
Comment 1 Tobias C. Berner freebsd_committer freebsd_triage 2023-09-12 06:45:52 UTC
Thanks for taking this :)
Comment 2 Antoine Brodin freebsd_committer freebsd_triage 2023-09-21 14:37:30 UTC
There are 2 typos in the patch:

--- a/security/py-sslyze/Makefile
+++ b/security/py-sslyze/Makefile
@@ -16,8 +16,8 @@ RUN_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}nassl>=5<6:security/py-nassl@${PY_FLAVOR} \
                ${PYTHON_PKGNAMEPREFIX}openssl>=23,1<24,1:security/py-openssl@${PY_FLAVOR} \
                ${PYTHON_PKGNAMEPREFIX}tls-parser>=2<3:security/py-tls-parser@${PY_FLAVOR}

-USES=          pycryptography:run python
-USE_PYTHON=    autoplist concurrent distutils
+USES=          ython
+USE_PYTHON=    autoplist concurrent cryptography distutils



diff --git a/security/py-sshpubkeys/Makefile b/security/py-sshpubkeys/Makefile
index bd4f2d0eeed7..82d83457b1da 100644
--- a/security/py-sshpubkeys/Makefile
+++ b/security/py-sshpubkeys/Makefile
@@ -13,8 +13,8 @@ LICENSE=      BSD3CLAUSE

 RUN_DEPENDS=   ${PYTHON_PKGNAMEPREFIX}ecdsa>=0.13:security/py-ecdsa@${PY_FLAVOR}

-USES=          pycryptography:run python
-USE_PYTHON=    autoplist concurrent distutils
+USES=          ython
+USE_PYTHON=    autoplist concurrent cryptography distutils
Comment 3 Antoine Brodin freebsd_committer freebsd_triage 2023-09-21 14:39:28 UTC
a 3rd typo:

diff --git a/security/py-stem/Makefile b/security/py-stem/Makefile
index 94abc1fc56d1..ef779b8668c8 100644
--- a/security/py-stem/Makefile
+++ b/security/py-stem/Makefile
@@ -15,8 +15,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
                ${PYTHON_PKGNAMEPREFIX}pyflakes>0:devel/py-pyflakes@${PY_FLAVOR} \
                ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR}

-USES=          python pycryptography:run
-USE_PYTHON=    distutils autoplist concurrent
+USES=          python
+USE_PYTHON=    autoplist concurrent cryptography istutils
 NO_ARCH=       yes

 do-test:
Comment 4 Antoine Brodin freebsd_committer freebsd_triage 2023-09-22 19:29:42 UTC
With the 3 typos fixed exp-run looks fine
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-09-29 14:32:22 UTC
A commit in branch main references this bug:

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

commit 3754fc5f190b9a31f617d662bb35fd0f96ee8088
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-09-29 14:19:56 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-09-29 14:19:56 +0000

    *: Replace USES=pycryptography* with USE_PYTHON=cryptography{,_build,_test}

    - Introduce USE_PYTHON=cryptography{,_build,_test}
    - Switch all 96 ports from USES=pycryptography to with USE_PYTHON=cryptography{,_build,_test}
    - Remove Mk/Uses/pycryptography.mk

    PR:             273727
    Approved by:    tcberner (portmgr)
    Exp-run by:     antoine

 Mk/Uses/pycryptography.mk (gone)           | 46 ------------------------------
 Mk/Uses/python.mk                          | 30 +++++++++++++++++++
 cad/uranium/Makefile                       |  3 +-
 comms/py-esptool/Makefile                  |  4 +--
 databases/py-mycli/Makefile                |  4 +--
 databases/py-ormar/Makefile                |  2 +-
 databases/py-sqlalchemy-utils/Makefile     |  2 +-
 devel/oci-cli/Makefile                     |  4 +--
 devel/osc/Makefile                         |  4 +--
 devel/py-adb/Makefile                      |  4 +--
 devel/py-aiortc/Makefile                   |  4 +--
 devel/py-azure-identity/Makefile           |  4 +--
 devel/py-azure-keyvault/Makefile           |  4 +--
 devel/py-azure-multiapi-storage/Makefile   |  4 +--
 devel/py-azure-storage-common/Makefile     |  4 +--
 devel/py-castellan/Makefile                |  4 +--
 devel/py-cursive/Makefile                  |  4 +--
 devel/py-moto/Makefile                     |  4 +--
 devel/py-msal/Makefile                     |  4 +--
 devel/py-oci/Makefile                      |  4 +--
 devel/py-openstacksdk/Makefile             |  4 +--
 devel/py-pip/Makefile                      |  4 +--
 devel/py-twisted/Makefile                  |  2 +-
 dns/letsdns/Makefile                       |  4 +--
 dns/py-dns-crawler/Makefile                |  4 +--
 dns/py-dns-lexicon/Makefile                |  4 +--
 dns/py-dnspython/Makefile                  |  2 +-
 finance/electrum/Makefile                  |  4 +--
 finance/py-ccxt/Makefile                   |  4 +--
 mail/py-flanker/Makefile                   |  4 +--
 misc/py-apache-beam/Makefile               |  4 +--
 misc/py-cinder/Makefile                    |  4 +--
 net-im/py-matrix-synapse/Makefile          |  4 +--
 net-mgmt/py-adal/Makefile                  |  4 +--
 net-p2p/reticulum/Makefile                 |  4 +--
 net/onionprobe/Makefile                    |  4 +--
 net/py-cepa/Makefile                       |  4 +--
 net/py-magic-wormhole/Makefile             |  4 +--
 net/py-ripe.atlas.sagan/Makefile           |  4 +--
 net/py-smbprotocol/Makefile                |  4 +--
 net/py-transip/Makefile                    |  4 +--
 net/py-urllib3/Makefile                    |  5 ++--
 net/scapy/Makefile                         |  4 +--
 news/sabnzbd/Makefile                      |  2 +-
 security/caldera/Makefile                  |  3 +-
 security/cowrie/Makefile                   |  4 +--
 security/py-SecretStorage/Makefile         |  4 +--
 security/py-acme/Makefile                  |  4 +--
 security/py-asyncssh/Makefile              |  4 +--
 security/py-authlib/Makefile               |  4 +--
 security/py-azure-keyvault-keys/Makefile   |  4 +--
 security/py-badkeys/Makefile               |  4 +--
 security/py-cert-human/Makefile            |  4 +--
 security/py-certbot/Makefile               |  4 +--
 security/py-dfvfs/Makefile                 |  4 +--
 security/py-fido2/Makefile                 |  4 +--
 security/py-josepy/Makefile                |  4 +--
 security/py-msoffcrypto-tool/Makefile      |  4 +--
 security/py-noiseprotocol/Makefile         |  4 +--
 security/py-oauthlib/Makefile              |  4 +--
 security/py-openssl/Makefile               |  4 +--
 security/py-paramiko/Makefile              |  4 +--
 security/py-pgpy/Makefile                  |  4 +--
 security/py-plaso/Makefile                 |  4 +--
 security/py-pyhanko-certvalidator/Makefile |  4 +--
 security/py-pyhanko/Makefile               |  4 +--
 security/py-pysaml2/Makefile               |  4 +--
 security/py-pysaml24/Makefile              |  4 +--
 security/py-pysaml26/Makefile              |  4 +--
 security/py-pyspnego/Makefile              |  4 +--
 security/py-python-axolotl/Makefile        |  4 +--
 security/py-requests-credssp/Makefile      |  4 +--
 security/py-securesystemslib/Makefile      |  4 +--
 security/py-service-identity/Makefile      |  4 +--
 security/py-service_identity/Makefile      |  4 +--
 security/py-social-auth-core/Makefile      |  4 +--
 security/py-sshpubkeys/Makefile            |  4 +--
 security/py-sslyze/Makefile                |  4 +--
 security/py-stem/Makefile                  |  4 +--
 security/py-trustme/Makefile               |  4 +--
 security/py-txtorcon/Makefile              |  4 +--
 security/py-webauthn/Makefile              |  4 +--
 security/py-yubikey-manager/Makefile       |  4 +--
 sysutils/datadog-integrations/Makefile     |  3 +-
 sysutils/py-ansible-core/Makefile          |  4 +--
 sysutils/py-azure-cli-core/Makefile        |  4 +--
 sysutils/py-azure-cli/Makefile             |  4 +--
 textproc/py-pdfminer.six/Makefile          |  4 +--
 www/buku/Makefile                          |  4 +--
 www/mitmproxy/Makefile                     |  4 +--
 www/py-autobahn/Makefile                   |  4 +--
 www/py-azure-storage/Makefile              |  4 +--
 www/py-flask-jwt-extended/Makefile         |  4 +--
 www/py-pyjwt/Makefile                      |  2 +-
 www/py-pyjwt1/Makefile                     |  5 ++--
 www/py-requests_ntlm/Makefile              |  4 +--
 www/py-scrapy/Makefile                     |  4 +--
 x11/xpra/Makefile                          |  4 +--
 98 files changed, 216 insertions(+), 231 deletions(-)
Comment 6 Po-Chuan Hsieh freebsd_committer freebsd_triage 2023-09-29 14:37:21 UTC
Committed. Thanks!
Comment 7 commit-hook freebsd_committer freebsd_triage 2023-09-30 01:14:57 UTC
A commit in branch main references this bug:

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

commit 0bda50678e09b618573e32c542f7f14f7b7f1d24
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-09-30 01:14:06 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-09-30 01:14:06 +0000

    CHANGES: Document the transition from USES=pycryptography* to USE_PYTHON=cryptography*

    PR:             273727

 CHANGES | 12 ++++++++++++
 1 file changed, 12 insertions(+)