aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPo-Chuan Hsieh <sunpoet@FreeBSD.org>2023-02-05 18:16:47 +0000
committerPo-Chuan Hsieh <sunpoet@FreeBSD.org>2023-02-05 18:16:47 +0000
commitde6965254c3a007efcf697c3d455b54d2aeb2383 (patch)
treea11140f37e080730e179fc2414c9ed5b4d65316c
parent973f951b648a14fa1e415a0be0b151ccdd11d6f5 (diff)
downloadports-de6965254c3a007efcf697c3d455b54d2aeb2383.tar.gz
ports-de6965254c3a007efcf697c3d455b54d2aeb2383.zip
Mk/Uses/python.mk: Fix USE_PYTHON=pep517: always compile and install bytecode
- While I'm here, use long options for easier reading [1][2] - Bump PORTREVISION of dependent ports (USE_PYTHON=pep517) for package change It fixes build_fs_violation of dependent ports in poudriere (with -t flag). It is also the default behavior of installer [2]. from py-sphinx log: =>> Checking for staging violations... done =>> Error: Filesystem touched during stage (files must install to ${STAGEDIR}): extra: usr/local/lib/python3.9/site-packages/importlib_metadata/__pycache__ =>> Cleaning up wrkdir from installer documentation: --compile-bytecode Possible choices: 0, 1, 2 generate bytecode for the specified optimization level(s) (default=0, 1) --no-compile-bytecode don’t generate bytecode for installed modules Default: False With hat: python Reference: https://pypa-build.readthedocs.io/en/stable/ [1] https://installer.pypa.io/en/stable/cli/installer/ [2]
Diffstat
-rw-r--r--Mk/Uses/python.mk15
-rw-r--r--audio/py-gtts/Makefile1
-rw-r--r--biology/py-resdk/Makefile1
-rw-r--r--cad/py-cocotb/Makefile1
-rw-r--r--devel/poetry/Makefile2
-rw-r--r--devel/py-find-libpython/Makefile1
-rw-r--r--devel/py-importlib-metadata/Makefile1
-rw-r--r--devel/py-interface-meta/Makefile1
-rw-r--r--devel/py-mediafile/Makefile2
-rw-r--r--devel/py-poetry-plugin-export/Makefile1
-rw-r--r--devel/py-pyls-black/Makefile2
-rw-r--r--devel/py-pytoolconfig/Makefile1
-rw-r--r--dns/letsdns/Makefile2
-rw-r--r--graphics/py-glcontext/Makefile1
-rw-r--r--graphics/py-moderngl-window/Makefile1
-rw-r--r--graphics/py-moderngl/Makefile1
-rw-r--r--graphics/py-traitsui/Makefile1
-rw-r--r--misc/py-einops/Makefile1
-rw-r--r--security/py-securesystemslib/Makefile1
-rw-r--r--security/py-tuf/Makefile1
-rw-r--r--sysutils/py-docker/Makefile1
-rw-r--r--textproc/py-sphinx-autoapi/Makefile1
-rw-r--r--www/py-fastapi/Makefile1
23 files changed, 30 insertions, 11 deletions
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index 8ac80fcacd76..6c6c5415c9cc 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -179,13 +179,13 @@
# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info
#
# PEP517_BUILD_CMD - Command sequence for a PEP-517 build frontend that builds a wheel.
-# default: ${PYTHON_CMD} -m build -n -w
+# default: ${PYTHON_CMD} -m build --no-isolation --wheel
#
# PEP517_BUILD_DEPEND - Port needed to execute ${PEP517_BUILD_CMD}.
# default: ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR}
#
# PEP517_INSTALL_CMD - Command sequence for a PEP-517 install frontend that installs a wheel.
-# default: ${PYTHON_CMD} -m installer -d ${STAGEDIR} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl
+# default: ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${PORTVERSION}-*.whl
#
# PEP517_INSTALL_DEPEND - Port needed to execute ${PEP517_INSTALL_CMD}.
# default: ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR}
@@ -656,10 +656,10 @@ PYDISTUTILS_EGGINFO?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_
PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
# PEP-517 support
-PEP517_BUILD_CMD?= ${PYTHON_CMD} -m build -n -w
-PEP517_BUILD_DEPEND?= ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR}
-PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer -d ${STAGEDIR} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl
-PEP517_INSTALL_DEPEND?= ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR}
+PEP517_BUILD_CMD?= ${PYTHON_CMD} -m build --no-isolation --wheel
+PEP517_BUILD_DEPEND?= ${PYTHON_PKGNAMEPREFIX}build>=0:devel/py-build@${PY_FLAVOR}
+PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl
+PEP517_INSTALL_DEPEND?= ${PYTHON_PKGNAMEPREFIX}installer>=0:devel/py-installer@${PY_FLAVOR}
# nose support
. if defined(_PYTHON_FEATURE_NOSE)
@@ -858,7 +858,8 @@ do-install:
@${SED} -e 's|^|${PYTHONPREFIX_SITELIBDIR}/|' \
-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../bin/|bin/|' \
-e 's|\,.*$$||' \
- ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST}
+ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C|[-_]+|_|g}-${PORTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST}
+ @cd ${STAGEDIR}${PREFIX} && ${FIND} lib -name '*.pyc' >> ${_PYTHONPKGLIST}
. endif
. endif # defined(_PYTHON_FEATURE_PEP517)
diff --git a/audio/py-gtts/Makefile b/audio/py-gtts/Makefile
index fcad55b5b02b..bb74ce8681e9 100644
--- a/audio/py-gtts/Makefile
+++ b/audio/py-gtts/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gTTS
DISTVERSION= 2.3.1
+PORTREVISION= 1
CATEGORIES= audio python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/biology/py-resdk/Makefile b/biology/py-resdk/Makefile
index 8bab7800ba6a..26507db29a15 100644
--- a/biology/py-resdk/Makefile
+++ b/biology/py-resdk/Makefile
@@ -1,5 +1,6 @@
PORTNAME= resdk
DISTVERSION= 16.0.0
+PORTREVISION= 1
CATEGORIES= biology python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/cad/py-cocotb/Makefile b/cad/py-cocotb/Makefile
index 211f36f0ab29..028bba005c16 100644
--- a/cad/py-cocotb/Makefile
+++ b/cad/py-cocotb/Makefile
@@ -1,6 +1,7 @@
PORTNAME= cocotb
DISTVERSIONPREFIX= v
DISTVERSION= 1.7.2
+PORTREVISION= 1
CATEGORIES= cad python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/poetry/Makefile b/devel/poetry/Makefile
index 0ebd15085d2e..806082d0d190 100644
--- a/devel/poetry/Makefile
+++ b/devel/poetry/Makefile
@@ -1,6 +1,6 @@
PORTNAME= poetry
DISTVERSION= 1.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMESUFFIX= -python-tool
diff --git a/devel/py-find-libpython/Makefile b/devel/py-find-libpython/Makefile
index 7bcb691dcbee..a73d97f48882 100644
--- a/devel/py-find-libpython/Makefile
+++ b/devel/py-find-libpython/Makefile
@@ -1,5 +1,6 @@
PORTNAME= find-libpython
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-importlib-metadata/Makefile b/devel/py-importlib-metadata/Makefile
index 51dd799a6911..81e1c488df56 100644
--- a/devel/py-importlib-metadata/Makefile
+++ b/devel/py-importlib-metadata/Makefile
@@ -1,5 +1,6 @@
PORTNAME= importlib-metadata
PORTVERSION= 6.0.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-interface-meta/Makefile b/devel/py-interface-meta/Makefile
index 009b6237a262..becf56cb4402 100644
--- a/devel/py-interface-meta/Makefile
+++ b/devel/py-interface-meta/Makefile
@@ -1,5 +1,6 @@
PORTNAME= interface-meta
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-mediafile/Makefile b/devel/py-mediafile/Makefile
index 7d747c2dca07..6e4331eb660e 100644
--- a/devel/py-mediafile/Makefile
+++ b/devel/py-mediafile/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mediafile
DISTVERSION= 0.11.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-poetry-plugin-export/Makefile b/devel/py-poetry-plugin-export/Makefile
index dab3541c211f..b2cf83d2ca2e 100644
--- a/devel/py-poetry-plugin-export/Makefile
+++ b/devel/py-poetry-plugin-export/Makefile
@@ -1,5 +1,6 @@
PORTNAME= poetry-plugin-export
DISTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pyls-black/Makefile b/devel/py-pyls-black/Makefile
index 05739d37292b..578360aedf54 100644
--- a/devel/py-pyls-black/Makefile
+++ b/devel/py-pyls-black/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pyls-black
PORTVERSION= 0.4.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pytoolconfig/Makefile b/devel/py-pytoolconfig/Makefile
index af425e207357..9f91c819bb37 100644
--- a/devel/py-pytoolconfig/Makefile
+++ b/devel/py-pytoolconfig/Makefile
@@ -1,5 +1,6 @@
PORTNAME= pytoolconfig
PORTVERSION= 1.2.5
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/dns/letsdns/Makefile b/dns/letsdns/Makefile
index e06ae3a167ac..ebde0885fe32 100644
--- a/dns/letsdns/Makefile
+++ b/dns/letsdns/Makefile
@@ -1,6 +1,6 @@
PORTNAME= letsdns
DISTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= dns
MAINTAINER= flo@FreeBSD.org
diff --git a/graphics/py-glcontext/Makefile b/graphics/py-glcontext/Makefile
index a208bdab9399..50beb004d7ae 100644
--- a/graphics/py-glcontext/Makefile
+++ b/graphics/py-glcontext/Makefile
@@ -1,5 +1,6 @@
PORTNAME= glcontext
DISTVERSION= 2.3.7
+PORTREVISION= 1
CATEGORIES= graphics
#MASTER_SITES= PYPI # no tests
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-moderngl-window/Makefile b/graphics/py-moderngl-window/Makefile
index 9fa380b079f8..25eec71294f8 100644
--- a/graphics/py-moderngl-window/Makefile
+++ b/graphics/py-moderngl-window/Makefile
@@ -1,5 +1,6 @@
PORTNAME= moderngl-window
DISTVERSION= 2.4.2
+PORTREVISION= 1
CATEGORIES= graphics
#MASTER_SITES= PYPI # no tests
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-moderngl/Makefile b/graphics/py-moderngl/Makefile
index ea2b34133fdd..21cda7e8a29a 100644
--- a/graphics/py-moderngl/Makefile
+++ b/graphics/py-moderngl/Makefile
@@ -1,5 +1,6 @@
PORTNAME= moderngl
DISTVERSION= 5.7.4
+PORTREVISION= 1
CATEGORIES= graphics
#MASTER_SITES= PYPI # no tests
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-traitsui/Makefile b/graphics/py-traitsui/Makefile
index 9aba963ae11d..f91747b0e797 100644
--- a/graphics/py-traitsui/Makefile
+++ b/graphics/py-traitsui/Makefile
@@ -1,5 +1,6 @@
PORTNAME= traitsui
DISTVERSION= 7.4.3
+PORTREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/misc/py-einops/Makefile b/misc/py-einops/Makefile
index cc9798f1751e..714798781c0c 100644
--- a/misc/py-einops/Makefile
+++ b/misc/py-einops/Makefile
@@ -1,5 +1,6 @@
PORTNAME= einops
DISTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= misc # machine-learning
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-securesystemslib/Makefile b/security/py-securesystemslib/Makefile
index 344ac32442de..6bf47630822f 100644
--- a/security/py-securesystemslib/Makefile
+++ b/security/py-securesystemslib/Makefile
@@ -1,5 +1,6 @@
PORTNAME= securesystemslib
PORTVERSION= 0.26.0
+PORTREVISION= 1
CATEGORIES= security python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-tuf/Makefile b/security/py-tuf/Makefile
index 30a629a08a38..2c9850d56470 100644
--- a/security/py-tuf/Makefile
+++ b/security/py-tuf/Makefile
@@ -1,5 +1,6 @@
PORTNAME= tuf
PORTVERSION= 2.1.0
+PORTREVISION= 1
CATEGORIES= security devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-docker/Makefile b/sysutils/py-docker/Makefile
index c41ae5e627e3..525ef55930a8 100644
--- a/sysutils/py-docker/Makefile
+++ b/sysutils/py-docker/Makefile
@@ -1,5 +1,6 @@
PORTNAME= docker
PORTVERSION= 6.0.1
+PORTREVISION= 1
CATEGORIES= sysutils python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-sphinx-autoapi/Makefile b/textproc/py-sphinx-autoapi/Makefile
index 9eaac2011ef2..f69857858aa8 100644
--- a/textproc/py-sphinx-autoapi/Makefile
+++ b/textproc/py-sphinx-autoapi/Makefile
@@ -1,5 +1,6 @@
PORTNAME= sphinx-autoapi
DISTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= textproc python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-fastapi/Makefile b/www/py-fastapi/Makefile
index 23ffa657d8c9..1238cb5c2220 100644
--- a/www/py-fastapi/Makefile
+++ b/www/py-fastapi/Makefile
@@ -1,5 +1,6 @@
PORTNAME= fastapi
PORTVERSION= 0.89.1
+PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
generated by cgit v1.2.3 (git 2.25.1) at 2023-12-03 16:54:17 +0000