From a10eaf069c1ace6bf398995dc57e5c23aba7005c Mon Sep 17 00:00:00 2001 From: OscarL Date: Wed, 6 Sep 2023 02:38:13 -0300 Subject: [PATCH] constantly: style cleanups, fix build. (#9368) --- .../constantly/constantly-15.1.0~git.recipe | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dev-python/constantly/constantly-15.1.0~git.recipe b/dev-python/constantly/constantly-15.1.0~git.recipe index d2f9c2f3c..a99a7f359 100644 --- a/dev-python/constantly/constantly-15.1.0~git.recipe +++ b/dev-python/constantly/constantly-15.1.0~git.recipe @@ -5,7 +5,7 @@ Originally twisted.python.constants from the Twisted project." HOMEPAGE="https://github.com/twisted/constantly" COPYRIGHT="2011-2015 Twisted Matrix Laboratories et all" LICENSE="MIT" -REVISION="3" +REVISION="4" srcGitRev="39887b6e131a72b04a338919519e972de668c586" SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="0cfe2235cd6fcd677ffb0710891ffb839a1d748b98acb32e5df683e6f4a1ea71" @@ -28,23 +28,31 @@ BUILD_REQUIRES=" PYTHON_PACKAGES=(python39 python310) PYTHON_VERSIONS=(3.9 3.10) for i in "${!PYTHON_PACKAGES[@]}"; do -pythonPackage=${PYTHON_PACKAGES[i]} -pythonVersion=${PYTHON_VERSIONS[$i]} -eval "PROVIDES_${pythonPackage}=\"\ - ${portName}_$pythonPackage = $portVersion\ - \"; \ -REQUIRES_$pythonPackage=\"\ - haiku\n\ - cmd:python$pythonVersion\ - \"" -BUILD_REQUIRES="$BUILD_REQUIRES - setuptools_$pythonPackage" -BUILD_PREREQUIRES="$BUILD_PREREQUIRES - cmd:python$pythonVersion" + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + eval "PROVIDES_${pythonPackage}=\" + ${portName}_$pythonPackage = $portVersion + \"" + eval "REQUIRES_$pythonPackage=\" + haiku + cmd:python$pythonVersion + \"" + BUILD_REQUIRES+=" + setuptools_$pythonPackage + " + BUILD_PREREQUIRES+=" + cmd:python$pythonVersion + " done INSTALL() { + # Patch this call, otherwise we get: + # "setuptools.extern.packaging.version.InvalidVersion: [...]: 'refs-gh-pull-20-rebase'" + sed -i -e 's|version=versioneer.get_version()|version="15.1.0dev"|' \ + $sourceDir/setup.py + for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} pythonVersion=${PYTHON_VERSIONS[$i]} @@ -52,15 +60,17 @@ INSTALL() python=python$pythonVersion installLocation="$prefix"/lib/$python/vendor-packages/ export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p "$installLocation" rm -rf build + $python setup.py build install \ --root=/ --prefix="$prefix" install -m 755 -d "$docDir" install -m 644 -t "$docDir" README.rst - packageEntries $pythonPackage \ + packageEntries $pythonPackage \ "$prefix"/lib/$python \ "$docDir" done