public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/argparse-manpage/, dev-python/argparse-manpage/files/
@ 2021-09-07 12:17 Arthur Zamarin
  0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2021-09-07 12:17 UTC (permalink / raw
  To: gentoo-commits

commit:     763be25dcbe872d8fc44b4850cd5aee011b84b1d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  7 12:17:14 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 12:17:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763be25d

dev-python/argparse-manpage: patch out six dep

Closes: https://bugs.gentoo.org/811969
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../argparse-manpage/argparse-manpage-1.5.ebuild      |  4 ++++
 .../files/argparse-manpage-1.5-remove-six-dep.patch   | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild b/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild
index f1f23c8c017..749cf578346 100644
--- a/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild
+++ b/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild
@@ -14,4 +14,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+PATCHES=(
+	"${FILESDIR}/${P}-remove-six-dep.patch"
+)
+
 distutils_enable_tests pytest

diff --git a/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch b/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch
new file mode 100644
index 00000000000..7a5aa777739
--- /dev/null
+++ b/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch
@@ -0,0 +1,19 @@
+--- a/examples/copr/copr_cli/main.py
++++ b/examples/copr/copr_cli/main.py
+@@ -8,15 +8,11 @@ import argparse
+ import sys
+ import datetime
+ import time
+-import six
+ import simplejson
+ from collections import defaultdict
+ 
+ import logging
+-if six.PY2:
+-    from urlparse import urlparse
+-else:
+-    from urllib.parse import urlparse
++from urllib.parse import urlparse
+ 
+ if sys.version_info < (2, 7):
+     class NullHandler(logging.Handler):


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/argparse-manpage/, dev-python/argparse-manpage/files/
@ 2022-04-27 18:13 Patrick McLean
  0 siblings, 0 replies; 2+ messages in thread
From: Patrick McLean @ 2022-04-27 18:13 UTC (permalink / raw
  To: gentoo-commits

commit:     ee6b47705d28f3abda0483fe9d943eac4aa953ee
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 18:13:07 2022 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 18:13:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee6b4770

dev-python/argparse-manpage: add 3, remove old

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-python/argparse-manpage/Manifest               |  4 +---
 .../argparse-manpage-1.5-r1.ebuild                 | 21 -----------------
 .../argparse-manpage/argparse-manpage-2.ebuild     | 27 ----------------------
 ...anpage-2.1.ebuild => argparse-manpage-3.ebuild} |  5 ++--
 .../argparse-manpage-1.5-remove-six-dep.patch      | 19 ---------------
 5 files changed, 4 insertions(+), 72 deletions(-)

diff --git a/dev-python/argparse-manpage/Manifest b/dev-python/argparse-manpage/Manifest
index 6a7cf556053e..97807aa8377b 100644
--- a/dev-python/argparse-manpage/Manifest
+++ b/dev-python/argparse-manpage/Manifest
@@ -1,4 +1,2 @@
-DIST argparse-manpage-1.5.tar.gz 34290 BLAKE2B 598a0eb0d4816a764c1ba4093b18e28d7865c9a113db1910793748eb24394636a9e1caad86fef5416933ae5341026048d1e39ce928131a8796a5d66a40e36853 SHA512 bfdea19fa62ac029754d6df26c4fb51c18f7fee4fae681c1117253627e724cf1ff1db5196ad0690fd436cebbe403536905f157cb7eae7be50d321c663b491fd0
-DIST argparse-manpage-2.1.tar.gz 39889 BLAKE2B 9c534b775e59064062d91587e275acf0af343cef864009e290c9a5224e481cd2f7cde87e85b2b0135483d6119e711cd6668d8455315eeb2a28d335c8ef37e3ae SHA512 aed2908bec8f6bee0f8619c6d5cff742fdac0f44ab7f65b8d0c1aa3409ec0335ce763cd2177b2606111b9ba5fe43698b04ace43f9017034cf99a7142eccd9ea0
 DIST argparse-manpage-2.2.tar.gz 39963 BLAKE2B 3ba427653c51265be944309dbd94368b9e62f46ec9fa3315a9b7da2de1fc6ae3399408488b74fb1c62ed39f70034d6429f3825c0857b07b71c277922870fbc13 SHA512 1708d33633405f1c4b9c96acd78cdbc5e3465089c7de0c5d0654f9f70ac1b7176f3798fd8bd8e7c0f2163b28dcc6d41ea2b68f2e2b03652677af3ba945d14588
-DIST argparse-manpage-2.tar.gz 38279 BLAKE2B 24edcb71aed7731178d24e99a36baf8be2270f6d4da0d884610da294d44313d913f8aa2db381eae77409ec504b18346688d5f7f27257285b7aa92d453b1a58f1 SHA512 24854cd5209635e8938716f97cb4eb283152a2a109c554385a78a5145c6e0f38c76a9172d607fb3ffdf610e8d3f7270ed94f6b4612ce731ea9dafe0a1bebebe6
+DIST argparse-manpage-3.tar.gz 45091 BLAKE2B b2ab9d4863227eacaf566865cd47763b9a52f4fd445ae78cf8212b3762a14c1ceb7f9008d25b8828f5e5da23e120a7be6d48239bb300670e559000de1e75fd68 SHA512 96225cf71dc60c638bd312331622e5b60589d7e6baf59fdfca0d90d24cff2bb232696c754c440c4e239949ea1a6280699c4f0f7816c50ec62bf77474d0c48cf4

diff --git a/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild b/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild
deleted file mode 100644
index d081471fcbc5..000000000000
--- a/dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Automatically build man-pages for your Python project"
-HOMEPAGE="https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/"
-SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-six-dep.patch"
-)
-
-distutils_enable_tests pytest

diff --git a/dev-python/argparse-manpage/argparse-manpage-2.ebuild b/dev-python/argparse-manpage/argparse-manpage-2.ebuild
deleted file mode 100644
index 5199ae12a243..000000000000
--- a/dev-python/argparse-manpage/argparse-manpage-2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Automatically build man-pages for your Python project"
-HOMEPAGE="https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/"
-SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	epytest
-}

diff --git a/dev-python/argparse-manpage/argparse-manpage-2.1.ebuild b/dev-python/argparse-manpage/argparse-manpage-3.ebuild
similarity index 82%
rename from dev-python/argparse-manpage/argparse-manpage-2.1.ebuild
rename to dev-python/argparse-manpage/argparse-manpage-3.ebuild
index 5e779edcda9c..6a4098d8b5b0 100644
--- a/dev-python/argparse-manpage/argparse-manpage-2.1.ebuild
+++ b/dev-python/argparse-manpage/argparse-manpage-3.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Automatically build man-pages for your Python project"
@@ -12,7 +13,7 @@ SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86"
 
 BDEPEND="
 	test? (

diff --git a/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch b/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch
deleted file mode 100644
index 7a5aa777739a..000000000000
--- a/dev-python/argparse-manpage/files/argparse-manpage-1.5-remove-six-dep.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/examples/copr/copr_cli/main.py
-+++ b/examples/copr/copr_cli/main.py
-@@ -8,15 +8,11 @@ import argparse
- import sys
- import datetime
- import time
--import six
- import simplejson
- from collections import defaultdict
- 
- import logging
--if six.PY2:
--    from urlparse import urlparse
--else:
--    from urllib.parse import urlparse
-+from urllib.parse import urlparse
- 
- if sys.version_info < (2, 7):
-     class NullHandler(logging.Handler):


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-04-27 18:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-27 18:13 [gentoo-commits] repo/gentoo:master commit in: dev-python/argparse-manpage/, dev-python/argparse-manpage/files/ Patrick McLean
  -- strict thread matches above, loose matches on Subject: below --
2021-09-07 12:17 Arthur Zamarin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox