From 8445ac25521a63752f7d902ed865bc875608a87f Mon Sep 17 00:00:00 2001 From: fourtysixandtwo Date: Sun, 31 Mar 2024 07:28:13 -0600 Subject: python/python3-setuptools-scm-opt: README fixes. Applying fixes for current even though they are not needed, but for consistency. Signed-off-by: Willy Sudiarto Raharjo --- python/python3-setuptools-scm-opt/README | 5 +++-- .../python3-setuptools-scm-opt.SlackBuild | 9 +++++---- .../python3-setuptools-scm-opt/python3-setuptools-scm-opt.info | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'python') diff --git a/python/python3-setuptools-scm-opt/README b/python/python3-setuptools-scm-opt/README index 73881e3706..9affc3e333 100644 --- a/python/python3-setuptools-scm-opt/README +++ b/python/python3-setuptools-scm-opt/README @@ -8,9 +8,10 @@ managed file. ImportError: cannot import name '__version__' from ... NOTE: -Installs to /opt/python3.9/site-packages +Installs to /opt/python$PYVER/site-packages Add the following before the python3 build commands in your Slackbuild to use this version over the stock one in 15.0: -export PYTHONPATH=/opt/python3.9/site-packages/ +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages diff --git a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild b/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild index 242de21c16..ff9895deaf 100644 --- a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild +++ b/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-setuptools-scm-opt -# Copyright 2023 fourtysixandtwo +# Copyright 2023-2024 fourtysixandtwo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -66,17 +66,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -export PYTHONPATH=/opt/python3.9/site-packages/ +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages python3 -m build --no-isolation python3 -m installer -d "$PKG" dist/*.whl if [ "$PKG/usr/" != "/usr/" ]; then mkdir -p $PKG/opt - mv $PKG/usr/lib*/python3.9 $PKG/opt/ + mv $PKG/usr/lib*/python$PYVER $PKG/opt/ rmdir $PKG/usr/lib* else - echo "ERROR: \$PKG is not set! We don't want to move the real /usr/lib*/python3.9" + echo "ERROR: \$PKG is not set! We don't want to move the real /usr/lib*/python$PYVER" exit 1 fi diff --git a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info b/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info index c1ef646fca..6ddaa3d8fb 100644 --- a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info +++ b/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info @@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/source/s/setuptools_scm/setupt MD5SUM="036efc8cbff77f9ba420225c4807e938" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-setuptools-opt typing-extensions python3-rich python-importlib_metadata" +REQUIRES="typing-extensions python3-rich python-importlib_metadata" MAINTAINER="fourtysixandtwo" EMAIL="fourtysixandtwo@sliderr.net" -- cgit v1.2.3