From 2d446203bcf1a0db08e99abca43513d246dfa73d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Apr 2018 21:52:00 +0100 Subject: gentoo resync : 05.04.2018 --- dev-util/spec-cleaner/Manifest | 9 ++-- .../files/spec-cleaner-1.0.6-pytest-runner.patch | 11 +++++ dev-util/spec-cleaner/metadata.xml | 8 ++++ dev-util/spec-cleaner/spec-cleaner-0.8.9.ebuild | 43 ------------------- dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild | 48 ++++++++++++++++++++++ dev-util/spec-cleaner/spec-cleaner-9999.ebuild | 19 +++++---- 6 files changed, 84 insertions(+), 54 deletions(-) create mode 100644 dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch delete mode 100644 dev-util/spec-cleaner/spec-cleaner-0.8.9.ebuild create mode 100644 dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild (limited to 'dev-util/spec-cleaner') diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest index 1b08af325847..0999bc2dec61 100644 --- a/dev-util/spec-cleaner/Manifest +++ b/dev-util/spec-cleaner/Manifest @@ -1,4 +1,5 @@ -DIST spec-cleaner-0.8.9.tar.gz 100949 BLAKE2B da95f336d05677350018c4e48c61023b35b8b97d731a08fe90ae147b32c374cf55a904e1f0559cc7c42b50acfe3b7a8c5b4cf25e596dce387b58417657fab8c5 SHA512 9e89c2760b429baa38be2ce2149fbd323b38a4c6159421192b07e612e359666810dc6077b2befd8a6d91b03aabc78bd4f81bb0e5cf5b4a274061b0aae0ab66f8 -EBUILD spec-cleaner-0.8.9.ebuild 878 BLAKE2B 609953e91f2aafa9071ed914ff9d442836aa2fdc32aeb0306f05f219ad45178381f1b6579045e542222ba64ba6c3ac5dcc9971c3623f41f6a09bea6ebce244b9 SHA512 18f047622b1b235f424b24e98809697e96d9217df6c1a29010ed23c4a031d17ad7b7fdd7d4b4c5e18f9f40e7cd0d5870e2058669f5d72fac89a1746350c8ca87 -EBUILD spec-cleaner-9999.ebuild 878 BLAKE2B 609953e91f2aafa9071ed914ff9d442836aa2fdc32aeb0306f05f219ad45178381f1b6579045e542222ba64ba6c3ac5dcc9971c3623f41f6a09bea6ebce244b9 SHA512 18f047622b1b235f424b24e98809697e96d9217df6c1a29010ed23c4a031d17ad7b7fdd7d4b4c5e18f9f40e7cd0d5870e2058669f5d72fac89a1746350c8ca87 -MISC metadata.xml 225 BLAKE2B 827d485e6a34bee26949a1779a852bbb87ea60d437e2345921bbc01a4f9d5e7e29b63ad56d7ade75954faa8feba95e129054b33b2dc2c6ed6fdd0245efe6ce3a SHA512 b2a0be2871dbfe8122f8868dfbee024f38fd9e3d1652909ad4c3f270623f8be84cd4605200792af0c412bda171ca20c4132d6228cad28a4eaeec615f8df8ae61 +AUX spec-cleaner-1.0.6-pytest-runner.patch 348 BLAKE2B 4bdb0a4db5eb581f826f14452c980381756945985e9d45c09f2e7b16fb7f2367e7781d8a1b7b69f02e2c33cb1527fbcd437462cfed9061ca9ed4edfe4a439b9a SHA512 d971124da1dc1b8c93a359bd139bb6fa9226b383d0261a18f2f821a857872b6fc501649f66f5ad754c17e0f86c14c43eba59f25b9f99e804f76ccdcb973bb0ca +DIST spec-cleaner-1.0.6.tar.gz 450602 BLAKE2B acd298421f2c119e24dc52cf63e149194d5baa1282f9aef902e2ccaf51de040f5817641b4077f209656f715ea6ceb19bf55b8661c32cd24f461c58f9126d9e19 SHA512 a27b5dc7fdb02ca5c632faa5b6a2b71d6db3e9f97950f20c15b14584fa240ff7b69dc981ca67f4fcb6af207dff28a8267447ad0eb918e06ce2294436892e0eef +EBUILD spec-cleaner-1.0.6.ebuild 977 BLAKE2B ea12ef15c6134849b9bffb8b970a343d4326db4a7b07f2b8c13692d9c842b717392141cd52f7d5936e94f8d8dc85087c0f357d6ecdf8cbc77a583a8386164c4c SHA512 50bc9535c4b3cc1a328b7fc4ce3c050efe0985af9325cd947a72616e77d9df9b98c80f700579bfe24bb32d3cbab935e42e2d0d62e5ee0151e4ff8a7260069e42 +EBUILD spec-cleaner-9999.ebuild 977 BLAKE2B ea12ef15c6134849b9bffb8b970a343d4326db4a7b07f2b8c13692d9c842b717392141cd52f7d5936e94f8d8dc85087c0f357d6ecdf8cbc77a583a8386164c4c SHA512 50bc9535c4b3cc1a328b7fc4ce3c050efe0985af9325cd947a72616e77d9df9b98c80f700579bfe24bb32d3cbab935e42e2d0d62e5ee0151e4ff8a7260069e42 +MISC metadata.xml 450 BLAKE2B b091afea0453f996442347131d337d2cb516a4a5e08a98e0b0ab4a6f2cdd19f7d4d284f02a9fecf35590998fd3143b9151c3cd6632c0bd7148374d307b0a28c0 SHA512 6f10ea61bcc2e9982fb7e1383959f36c77d881a495a9251819b47d168114272c5f26b7e5bcc80657f5d8a79ec18e0a1e7c54201fa6c773bc64d3ceff2a1ddc3c diff --git a/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch b/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch new file mode 100644 index 000000000000..b280cce28bf4 --- /dev/null +++ b/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2018-03-19 15:23:46.128000000 +0000 ++++ b/setup.py 2018-03-19 15:24:26.920000000 +0000 +@@ -43,7 +43,6 @@ + platforms=['Linux'], + keywords=['SUSE', 'RPM', '.spec', 'cleaner'], + +- setup_requires=['pytest-runner'], +- tests_require=['pytest', 'pytest-cov'], ++ tests_require=['pytest'], + + packages=['spec_cleaner'], diff --git a/dev-util/spec-cleaner/metadata.xml b/dev-util/spec-cleaner/metadata.xml index 1f5d6f413c44..209ca060ffe3 100644 --- a/dev-util/spec-cleaner/metadata.xml +++ b/dev-util/spec-cleaner/metadata.xml @@ -1,6 +1,14 @@ + + jubalh@iodoru.org + Michael Vetter + + + proxy-maint@gentoo.org + Proxy Maintainers + openSUSE/spec-cleaner diff --git a/dev-util/spec-cleaner/spec-cleaner-0.8.9.ebuild b/dev-util/spec-cleaner/spec-cleaner-0.8.9.ebuild deleted file mode 100644 index 61a6579ab757..000000000000 --- a/dev-util/spec-cleaner/spec-cleaner-0.8.9.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git" -inherit distutils-r1 -[[ ${PV} == 9999 ]] && inherit git-r3 - -DESCRIPTION="SUSE spec file cleaner and formatter" -HOMEPAGE="https://github.com/openSUSE/spec-cleaner" -[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -[[ ${PV} != 9999 ]] && \ -KEYWORDS="~amd64 ~x86" -IUSE="test" - -DEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) -" -RDEPEND=" - ${PYTHON_DEPS} -" - -[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}" - -src_prepare() { - # we have libexec - sed -i \ - -e 's:lib/obs:libexec/obs:g' \ - setup.py || die - distutils-r1_src_prepare -} - -python_test() { - nosetests -} diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild new file mode 100644 index 000000000000..297d0528ae6b --- /dev/null +++ b/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{3_4,3_5} ) +EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git" +inherit distutils-r1 +[[ ${PV} == 9999 ]] && inherit git-r3 + +DESCRIPTION="SUSE spec file cleaner and formatter" +HOMEPAGE="https://github.com/openSUSE/spec-cleaner" +[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +[[ ${PV} != 9999 ]] && +KEYWORDS="~amd64 ~x86" +IUSE="test" + +DEPEND=" + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + ) +" +RDEPEND=" + ${PYTHON_DEPS} + >=app-arch/rpm-4.11.0.1 +" + +PATCHES=( + # pytest-runner is only needed in test scenario + "${FILESDIR}/${PN}-1.0.6-pytest-runner.patch" +) + +[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}" + +src_prepare() { + # we have libexec + sed -i \ + -e 's:lib/obs:libexec/obs:g' \ + setup.py || die + distutils-r1_src_prepare +} + +python_test() { + esetup.py test +} diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild index 61a6579ab757..297d0528ae6b 100644 --- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild +++ b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{3_4,3_5} ) EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git" inherit distutils-r1 [[ ${PV} == 9999 ]] && inherit git-r3 @@ -14,20 +14,25 @@ HOMEPAGE="https://github.com/openSUSE/spec-cleaner" LICENSE="BSD" SLOT="0" -[[ ${PV} != 9999 ]] && \ +[[ ${PV} != 9999 ]] && KEYWORDS="~amd64 ~x86" IUSE="test" DEPEND=" test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] ) " RDEPEND=" ${PYTHON_DEPS} + >=app-arch/rpm-4.11.0.1 " +PATCHES=( + # pytest-runner is only needed in test scenario + "${FILESDIR}/${PN}-1.0.6-pytest-runner.patch" +) + [[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}" src_prepare() { @@ -39,5 +44,5 @@ src_prepare() { } python_test() { - nosetests + esetup.py test } -- cgit v1.2.3