pytest, bump version, add dependencies (#8774)

dev-python/pytest/pytest-7.1.3.recipe

@@ -1,77 +0,0 @@
-SUMMARY="A Python testing framework"
-DESCRIPTION="The pytest framework makes it easy to write small tests, yet scales to support complex functional testing for applications and libraries."
-HOMEPAGE="https://pytest.org"
-COPYRIGHT="2010-2020 Holger Krekel and others."
-LICENSE="MIT"
-REVISION="3"
-SOURCE_URI="https://pypi.io/packages/source/p/pytest/pytest-$portVersion.tar.gz"
-CHECKSUM_SHA256="4f365fec2dff9c1162f834d9f18af1ba13062db0c708bf7b946f8a5c76180c39"
-
-ARCHITECTURES="any"
-
-PROVIDES="
-	pytest=$portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-
-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\n\
-	cmd:py.test$pythonVersion\n\
-	cmd:pytest$pythonVersion\n\
-	\"; \
-REQUIRES_$pythonPackage=\"\
-	haiku\n\
-	cmd:python$pythonVersion\n\
-	attrs_$pythonPackage\n\
-	importlib_metadata_$pythonPackage\n\
-	iniconfig_$pythonPackage\n\
-	packaging_$pythonPackage\n\
-	pluggy_$pythonPackage\n\
-	py_$pythonPackage\n\
-	tomli_$pythonPackage\n\
-	zipp_$pythonPackage\n\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_scm_$pythonPackage
-	"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion
-	pip_$pythonPackage
-	"
-done
-
-INSTALL()
-{
-	export SETUPTOOLS_SCM_PRETEND_VERSION=$portVersion
-
-	for i in "${!PYTHON_PACKAGES[@]}"; do
-		pythonPackage=${PYTHON_PACKAGES[i]}
-		pythonVersion=${PYTHON_VERSIONS[$i]}
-
-		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
-
-		mv $prefix/bin/pytest $prefix/bin/pytest$pythonVersion
-		mv $prefix/bin/py.test $prefix/bin/py.test$pythonVersion
-
-		packageEntries  $pythonPackage \
-			$prefix/lib/python* \
-			$prefix/bin
-	done
-}

dev-python/pytest/pytest-7.3.1.recipe

@@ -0,0 +1,90 @@
+SUMMARY="A Python testing framework"
+DESCRIPTION="The pytest framework makes it easy to write small tests, yet scales to support complex functional testing for applications and libraries."
+HOMEPAGE="https://pytest.org"
+COPYRIGHT="2004 Holger Krekel and others."
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://pypi.io/packages/source/p/pytest/pytest-$portVersion.tar.gz"
+CHECKSUM_SHA256="434afafd78b1d78ed0addf160ad2b77a30d35d4bdf8af234fe621919d9ed15e3"
+
+ARCHITECTURES="any"
+
+PROVIDES="
+	$portName=$portVersion
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
+
+PYTHON_PACKAGES=(python39 python310)
+PYTHON_VERSIONS=(3.9 3.10)
+defaultVersion=3.9
+for i in "${!PYTHON_PACKAGES[@]}"; do
+	pythonPackage=${PYTHON_PACKAGES[i]}
+	pythonVersion=${PYTHON_VERSIONS[$i]}
+
+	eval "PROVIDES_${pythonPackage}=\"
+		${portName}_$pythonPackage = $portVersion
+		cmd:py.test_$pythonVersion.py = $portVersion
+		cmd:pytest_$pythonVersion.py = $portVersion
+		\""
+	# Provide non-suffixed cmd only for the default Python version
+	if [ $pythonVersion = $defaultVersion ]; then
+		eval "PROVIDES_$pythonPackage+=\"
+			cmd:py.test = $portVersion
+			cmd:pytest = $portVersion
+			\""
+	fi
+	eval "REQUIRES_$pythonPackage=\"
+		haiku
+		exceptiongroup_$pythonPackage
+		importlib_metadata_$pythonPackage
+		iniconfig_$pythonPackage
+		packaging_$pythonPackage
+		pluggy_$pythonPackage
+		tomli_$pythonPackage
+		cmd:python$pythonVersion
+		\""
+	BUILD_REQUIRES+="
+		setuptools_scm_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		build_$pythonPackage
+		installer_$pythonPackage
+		wheel_$pythonPackage
+		cmd:python$pythonVersion
+		"
+done
+
+INSTALL()
+{
+	export SETUPTOOLS_SCM_PRETEND_VERSION=$portVersion
+
+	for i in "${!PYTHON_PACKAGES[@]}"; do
+		pythonVersion=${PYTHON_VERSIONS[$i]}
+
+		python=python$pythonVersion
+		$python -m build --wheel --skip-dependency-check --no-isolation
+		$python -m installer -p $prefix dist/*.whl
+
+		# Version suffix all the scripts
+		for f in $binDir/*; do
+			mv $f ${f%.py}-${pythonVersion}.py
+		done
+
+		# And provide suffix-less symlinks for the default version
+		if [ $pythonVersion = $defaultVersion ]; then
+			for f in $binDir/*; do
+				ln -sr $f ${f%-$pythonVersion.py}
+			done
+		fi
+
+		packageEntries ${PYTHON_PACKAGES[i]} \
+			$prefix/lib/python* \
+			$binDir
+	done
+}