From d5422eb04dab249a1a419ef91b39fe1de71af1d8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 2 Nov 2021 10:40:23 -0400 Subject: [PATCH] python-nose: remove package python3-nose: fix for Python 3.10 This package is unmaintained but still used in tests for other packages, so let's keep it hobbling along for awhile longer. Fixes #33788. --- srcpkgs/python-nose/template | 28 ------------------- srcpkgs/python3-nose | 1 - .../patches/setup.py.patch | 0 srcpkgs/python3-nose/template | 23 +++++++++++++++ 4 files changed, 23 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/python-nose/template delete mode 120000 srcpkgs/python3-nose rename srcpkgs/{python-nose => python3-nose}/patches/setup.py.patch (100%) create mode 100644 srcpkgs/python3-nose/template diff --git a/srcpkgs/python-nose/template b/srcpkgs/python-nose/template deleted file mode 100644 index 76a0cd0a040..00000000000 --- a/srcpkgs/python-nose/template +++ /dev/null @@ -1,28 +0,0 @@ -# Template file for 'python-nose' -pkgname=python-nose -version=1.3.7 -revision=7 -wrksrc="nose-${version}" -build_style=python-module -pycompile_module="nose" -hostmakedepends="python-setuptools python3-setuptools" -depends="python-setuptools" -short_desc="The nicer testing for Python2" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="https://github.com/nose-devs/nose" -#changelog="https://raw.githubusercontent.com/nose-devs/nose/master/CHANGELOG" -distfiles="${PYPI_SITE}/n/nose/nose-${version}.tar.gz" -checksum=f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98 -alternatives="nose:nosetests:/usr/bin/nosetests2" - -python3-nose_package() { - pycompile_module="nose" - depends="python3-setuptools" - short_desc="${short_desc/Python2/Python3}" - alternatives="nose:nosetests:/usr/bin/nosetests3" - pkg_install() { - vmove usr/bin/*3 - vmove usr/lib/python3* - } -} diff --git a/srcpkgs/python3-nose b/srcpkgs/python3-nose deleted file mode 120000 index 32467a70a1e..00000000000 --- a/srcpkgs/python3-nose +++ /dev/null @@ -1 +0,0 @@ -python-nose \ No newline at end of file diff --git a/srcpkgs/python-nose/patches/setup.py.patch b/srcpkgs/python3-nose/patches/setup.py.patch similarity index 100% rename from srcpkgs/python-nose/patches/setup.py.patch rename to srcpkgs/python3-nose/patches/setup.py.patch diff --git a/srcpkgs/python3-nose/template b/srcpkgs/python3-nose/template new file mode 100644 index 00000000000..58a676fd9f3 --- /dev/null +++ b/srcpkgs/python3-nose/template @@ -0,0 +1,23 @@ +# Template file for 'python3-nose' +pkgname=python3-nose +version=1.3.7 +revision=8 +wrksrc="nose-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-setuptools" +short_desc="Nicer testing for Python3" +maintainer="Orphaned " +license="LGPL-2.1-or-later" +homepage="https://github.com/nose-devs/nose" +changelog="https://raw.githubusercontent.com/nose-devs/nose/master/CHANGELOG" +distfiles="${PYPI_SITE}/n/nose/nose-${version}.tar.gz" +checksum=f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98 +conflicts="python-nose>=0" +# Tests don't work and this package is no longer maintained, just skip them +make_check=no + +post_patch() { + # Convert py2 syntax to py3 since setuptools no longer does it + 2to3-${py3_ver} -w bin nose unit_tests functional_tests +}