diff --git a/dev-python/nose/nose-1.3.7.recipe b/dev-python/nose/nose-1.3.7.recipe index 190eb49b2..05f420274 100644 --- a/dev-python/nose/nose-1.3.7.recipe +++ b/dev-python/nose/nose-1.3.7.recipe @@ -16,11 +16,9 @@ HOMEPAGE="https://readthedocs.io/docs/nose/ https://github.com/nose-devs/nose" COPYRIGHT="2008-2010 anatoly techtonik" LICENSE="GNU LGPL v2.1" -REVISION="1" -SOURCE_URI="https://github.com/nose-devs/nose/archive/release_$portVersion.tar.gz" -CHECKSUM_SHA256="ab1ee7744662c5bf58a510ae46d879ebe140c3e40d6871c09b36b24b6a480b39" -SOURCE_FILENAME="nose-$portVersion.tar.gz" -SOURCE_DIR="nose-release_$portVersion" +REVISION="2" +SOURCE_URI="https://pypi.io/packages/source/n/nose/nose-$portVersion.tar.gz" +CHECKSUM_SHA256="f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98" ARCHITECTURES="any" @@ -32,18 +30,10 @@ REQUIRES=" " BUILD_REQUIRES=" haiku_devel - setuptools_python - setuptools_python3 - six_python - six_python3 - " -BUILD_PREREQUIRES=" - cmd:python - cmd:python3 " -PYTHON_PACKAGES=(python python3) -PYTHON_VERSIONS=(2.7 3.6) +PYTHON_PACKAGES=(python python36 python3) +PYTHON_VERSIONS=(2.7 3.6 3.7) for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} pythonVersion=${PYTHON_VERSIONS[i]} @@ -55,6 +45,12 @@ for i in "${!PYTHON_PACKAGES[@]}"; do haiku cmd:python$pythonVersion \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage + six_$pythonPackage + " +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" done PATCH() @@ -101,8 +97,8 @@ INSTALL() cd "$sourceDir" mkdir -p "$docDir" cp -rt "$docDir" \ - README.txt DEVELOPERS.txt CHANGELOG NOTES NEWS* doc/* - rm "$docDir"/{doc_tests,Makefile} + README.txt CHANGELOG NEWS* doc/* + rm -f "$docDir"/Makefile } TEST()