* [gentoo-commits] repo/gentoo:master commit in: dev-python/subunit/, dev-python/subunit/files/
@ 2020-07-17 5:08 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2020-07-17 5:08 UTC (permalink / raw
To: gentoo-commits
commit: 29ac65577eb50cf7301f7605ac01a06ac2861bdf
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 17 05:07:42 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 05:08:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29ac6557
dev-python/subunit: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/subunit/Manifest | 1 -
dev-python/subunit/files/1.0.0-tests.patch | 25 --------
dev-python/subunit/subunit-1.2.0-r1.ebuild | 96 ------------------------------
3 files changed, 122 deletions(-)
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index 60d5b945c2b..cfcaf554695 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,2 +1 @@
-DIST subunit-1.2.0.tar.gz 460532 BLAKE2B 7f8a459afc576efed8fbf271a9d2e175ae9de9dda68acb26322f222ac46f12fee5dece4cb2679fca608ba307a3692aa84b13d0e093606bd89a53c69b2081cd44 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c
DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
diff --git a/dev-python/subunit/files/1.0.0-tests.patch b/dev-python/subunit/files/1.0.0-tests.patch
deleted file mode 100644
index d83a1900cbe..00000000000
--- a/dev-python/subunit/files/1.0.0-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur subunit-1.0.0.orig/python/subunit/tests/test_run.py subunit-1.0.0/python/subunit/tests/test_run.py
---- python/subunit/tests/test_run.py 2014-11-18 16:59:26.000000000 +0800
-+++ python/subunit/tests/test_run.py 2015-03-26 13:25:19.193341069 +0800
-@@ -77,21 +77,6 @@
- exc = self.assertRaises(SystemExit, runner.list, None, loader=loader)
- self.assertEqual((2,), exc.args)
-
-- class FailingTest(TestCase):
-- def test_fail(self):
-- 1/0
--
-- def test_exits_zero_when_tests_fail(self):
-- bytestream = io.BytesIO()
-- stream = io.TextIOWrapper(bytestream, encoding="utf8")
-- try:
-- self.assertEqual(None, run.main(
-- argv=["progName", "subunit.tests.test_run.TestSubunitTestRunner.FailingTest"],
-- stdout=stream))
-- except SystemExit:
-- self.fail("SystemExit raised")
-- self.assertThat(bytestream.getvalue(), StartsWith(_b('\xb3')))
--
- class ExitingTest(TestCase):
- def test_exit(self):
- raise SystemExit(0)
diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild
deleted file mode 100644
index 69fe77e2dca..00000000000
--- a/dev-python/subunit/subunit-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1 eutils ltprune multilib-minimal versionator
-
-DESCRIPTION="A streaming protocol for test results"
-HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit/"
-SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
- dev-python/extras[${PYTHON_USEDEP}]
- dev-lang/perl:="
-
-DEPEND="
- ${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
- >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
- virtual/pkgconfig
- test? (
- dev-python/fixtures[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/testscenarios[${PYTHON_USEDEP}]
- )"
-
-# Take out rogue & trivial failing tests that exit the suite before it even gets started
-# The removed class in fact works fine in py3 and fails with py2.7 & pupu
-# The setu to restrict this patch is just those 2 is not worth it.
-PATCHES=( "${FILESDIR}"/1.0.0-tests.patch )
-
-src_prepare() {
- sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
-
- # Install perl modules in vendor_perl, bug 534654.
- export INSTALLDIRS=vendor
-
- # needed for perl modules
- distutils-r1_src_prepare
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --enable-shared \
- $(use_enable static-libs static)
-}
-
-multilib_src_compile() {
- default
- multilib_is_native_abi && distutils-r1_src_compile
-}
-
-python_test() {
- local -x PATH="${PWD}/shell/share:${PATH}"
- local -x PYTHONPATH=python
- # Following tests are known to fail in py2.7 & pypy. They pass under py3.
- # DO NOT re-file
- # test_add_error test_add_error_details test_add_expected_failure
- # test_add_expected_failure_details test_add_failure test_add_failure
- # https://bugs.launchpad.net/subunit/+bug/1436686
-
- "${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
-}
-
-multilib_src_test() {
- multilib_is_native_abi && distutils-r1_src_test
-}
-
-multilib_src_install() {
- local targets=(
- install-include_subunitHEADERS
- install-pcdataDATA
- install-exec-local
- install-libLTLIBRARIES
- )
- emake DESTDIR="${D}" "${targets[@]}"
-
- multilib_is_native_abi && distutils-r1_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/subunit/, dev-python/subunit/files/
@ 2020-12-13 22:46 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2020-12-13 22:46 UTC (permalink / raw
To: gentoo-commits
commit: 5f92e68f84de5ab7081731758d40c58f7effce9a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 22:44:18 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 22:44:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f92e68f
dev-python/subunit: call eautoreconf before multilib_copy_sources
Also clean up the werror patch.
Bug: https://bugs.gentoo.org/744313
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-python/subunit/files/subunit-1.4.0-werror.patch | 6 +++---
dev-python/subunit/subunit-1.4.0.ebuild | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dev-python/subunit/files/subunit-1.4.0-werror.patch b/dev-python/subunit/files/subunit-1.4.0-werror.patch
index 99b8b8d2045..e64f74a655e 100644
--- a/dev-python/subunit/files/subunit-1.4.0-werror.patch
+++ b/dev-python/subunit/files/subunit-1.4.0-werror.patch
@@ -1,7 +1,7 @@
# https://bugs.gentoo.org/744313
-diff -NrU5 subunit-1.4.0.orig/configure.ac subunit-1.4.0/configure.ac
---- subunit-1.4.0.orig/configure.ac 2020-12-13 22:03:01.225671695 +0100
-+++ subunit-1.4.0/configure.ac 2020-12-13 22:03:26.899752669 +0100
+
+--- a/configure.ac
++++ b/configure.ac
@@ -4,11 +4,11 @@
m4_define([SUBUNIT_VERSION],
m4_defn([SUBUNIT_MAJOR_VERSION]).m4_defn([SUBUNIT_MINOR_VERSION]).m4_defn([SUBUNIT_MICRO_VERSION]))
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index 39cfb5fff59..9962579f395 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -34,7 +34,9 @@ DEPEND="
dev-python/testscenarios[${PYTHON_USEDEP}]
)"
-PATCHES=( "${FILESDIR}/${P}-werror.patch" )
+PATCHES=(
+ "${FILESDIR}/subunit-1.4.0-werror.patch"
+)
src_prepare() {
sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
@@ -47,8 +49,8 @@ src_prepare() {
python/subunit/tests/test_subunit_tags.py || die
distutils-r1_src_prepare
- multilib_copy_sources
eautoreconf
+ multilib_copy_sources
}
multilib_src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/subunit/, dev-python/subunit/files/
@ 2020-12-13 22:46 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2020-12-13 22:46 UTC (permalink / raw
To: gentoo-commits
commit: 4d73470d3723db147f3ed35a3da90bf6903a3b49
Author: Peter Alfredsen <crabbedhaloablution <AT> icloud <DOT> com>
AuthorDate: Sun Dec 13 21:57:41 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 22:38:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d73470d
dev-python/subunit: remove -Werror from configure.ac
Closes: https://bugs.gentoo.org/744313
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Peter Alfredsen <crabbedhaloablution <AT> icloud.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18644
.../subunit/files/subunit-1.4.0-werror.patch | 34 ++++++++++++++++++++++
dev-python/subunit/subunit-1.4.0.ebuild | 5 +++-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/dev-python/subunit/files/subunit-1.4.0-werror.patch b/dev-python/subunit/files/subunit-1.4.0-werror.patch
new file mode 100644
index 00000000000..99b8b8d2045
--- /dev/null
+++ b/dev-python/subunit/files/subunit-1.4.0-werror.patch
@@ -0,0 +1,34 @@
+# https://bugs.gentoo.org/744313
+diff -NrU5 subunit-1.4.0.orig/configure.ac subunit-1.4.0/configure.ac
+--- subunit-1.4.0.orig/configure.ac 2020-12-13 22:03:01.225671695 +0100
++++ subunit-1.4.0/configure.ac 2020-12-13 22:03:26.899752669 +0100
+@@ -4,11 +4,11 @@
+ m4_define([SUBUNIT_VERSION],
+ m4_defn([SUBUNIT_MAJOR_VERSION]).m4_defn([SUBUNIT_MINOR_VERSION]).m4_defn([SUBUNIT_MICRO_VERSION]))
+ AC_PREREQ([2.59])
+ AC_INIT([subunit], [SUBUNIT_VERSION], [subunit-dev@lists.launchpad.net])
+ AC_CONFIG_SRCDIR([c/lib/child.c])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+ AC_CONFIG_MACRO_DIR([m4])
+ [SUBUNIT_MAJOR_VERSION]=SUBUNIT_MAJOR_VERSION
+ [SUBUNIT_MINOR_VERSION]=SUBUNIT_MINOR_VERSION
+ [SUBUNIT_MICRO_VERSION]=SUBUNIT_MICRO_VERSION
+ [SUBUNIT_VERSION]=SUBUNIT_VERSION
+@@ -26,14 +26,14 @@
+ AC_PROG_LIBTOOL
+ AM_PATH_PYTHON
+
+ AS_IF([test "$GCC" = "yes"],
+ [
+- SUBUNIT_CFLAGS="-Wall -Werror -Wextra -Wstrict-prototypes "
++ SUBUNIT_CFLAGS="-Wall -Wextra -Wstrict-prototypes "
+ SUBUNIT_CFLAGS="$SUBUNIT_CFLAGS -Wmissing-prototypes -Wwrite-strings "
+ SUBUNIT_CFLAGS="$SUBUNIT_CFLAGS -Wno-variadic-macros "
+- SUBUNIT_CXXFLAGS="-Wall -Werror -Wextra -Wwrite-strings -Wno-variadic-macros"
++ SUBUNIT_CXXFLAGS="-Wall -Wextra -Wwrite-strings -Wno-variadic-macros"
+ ])
+
+ AM_CFLAGS="$SUBUNIT_CFLAGS -I\$(top_srcdir)/c/include"
+ AM_CXXFLAGS="$SUBUNIT_CXXFLAGS -I\$(top_srcdir)/c/include"
+ AC_SUBST(AM_CFLAGS)
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index 0719cf5c65f..39cfb5fff59 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..9} pypy3 )
-inherit distutils-r1 multilib-minimal
+inherit distutils-r1 multilib-minimal autotools
DESCRIPTION="A streaming protocol for test results"
HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit/"
@@ -34,6 +34,8 @@ DEPEND="
dev-python/testscenarios[${PYTHON_USEDEP}]
)"
+PATCHES=( "${FILESDIR}/${P}-werror.patch" )
+
src_prepare() {
sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
@@ -46,6 +48,7 @@ src_prepare() {
distutils-r1_src_prepare
multilib_copy_sources
+ eautoreconf
}
multilib_src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-13 22:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-17 5:08 [gentoo-commits] repo/gentoo:master commit in: dev-python/subunit/, dev-python/subunit/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2020-12-13 22:46 Mike Gilbert
2020-12-13 22:46 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox