* [gentoo-commits] repo/gentoo:master commit in: dev-python/configobj/, dev-python/configobj/files/
@ 2017-05-02 13:11 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2017-05-02 13:11 UTC (permalink / raw
To: gentoo-commits
commit: 428eda97354e4f08a05728aaafb966494ffa5440
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 2 12:14:23 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 2 13:11:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428eda97
dev-python/configobj: Clean old versions up
dev-python/configobj/Manifest | 2 --
dev-python/configobj/configobj-4.7.2-r2.ebuild | 40 ----------------------
dev-python/configobj/configobj-5.0.5.ebuild | 29 ----------------
.../files/configobj-4.7.2-fix_tests.patch | 11 ------
4 files changed, 82 deletions(-)
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index 8ebb884657f..2b0b6a2b9c3 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,3 +1 @@
-DIST configobj-4.7.2.zip 143618 SHA256 332a0d20d4d736d521d95cb2cf069b1ac7c858985207db4296f4050396558c49 SHA512 510b7ce461932d504808a9aeb539265b9fddb17c9451076f8b6be796f38617a5095d3c287c78c38a1825d76be462ca0224f5ae3b614f67fd69c6260b399d802f WHIRLPOOL e38ea000479792be4c9ddf17fca8d17bc486cd2ef0363a7fc29922012b485ca8c2a9ac8b7eb06676783b87ca8ec37da41a8a44e7111dcaf07244318e1599924b
-DIST configobj-5.0.5.tar.gz 33232 SHA256 766eff273f2cbb007a3ea8aa69429ee9b1553aa96fe282c6ace3769b9ac47b08 SHA512 6dfb30fff22b1a62a191876161c20c7236d49137a0def85ea2ddf80a6810347f586bbec2dffbcd58ed942591f362b7741ec2f9464fb377e852edc6748b12ba6a WHIRLPOOL ff4c202b15188f501f2538db16a518e154a93bffa31c2d89e509220967d6bde51f7dc1e062f3d57895bf024a04554f42cc8d527d89b93ff9a6e1127dadc9d035
DIST configobj-5.0.6.tar.gz 33248 SHA256 a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902 SHA512 f253fdd0bc3fcd37f56c9ceb28f5c8c739b0861e099b07a3929645907c97b2261f0529850a95c1a42507846f72d88a0992fcd1e1d6fa8654dc713d120f769963 WHIRLPOOL fc8472d7fd161f4ccd09e3d99c6e97d3ecfe008b3cd16d623ef6ecd598148a41b4658c6ce7488f30eb581e2fcc09bbb8887240e77582d3c272b88c8da87ebb08
diff --git a/dev-python/configobj/configobj-4.7.2-r2.ebuild b/dev-python/configobj/configobj-4.7.2-r2.ebuild
deleted file mode 100644
index d204ed57afd..00000000000
--- a/dev-python/configobj/configobj-4.7.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Simple config file reader and writer"
-HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://code.google.com/p/configobj/ https://pypi.python.org/pypi/configobj"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-fix_tests.patch )
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
- sed -e "s/ \(doctest\.testmod(.*\)/ sys.exit(\1[0] != 0)/" -i validate.py || die
-}
-
-python_test() {
- "${PYTHON}" validate.py -v || die
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- if use doc; then
- rm -f docs/BSD*
- insinto /usr/share/doc/${PF}/html
- doins -r docs/* || die "doins failed"
- fi
-}
diff --git a/dev-python/configobj/configobj-5.0.5.ebuild b/dev-python/configobj/configobj-5.0.5.ebuild
deleted file mode 100644
index a55fd1e5ef5..00000000000
--- a/dev-python/configobj/configobj-5.0.5.ebuild
+++ /dev/null
@@ -1,29 +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} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple config file reader and writer"
-HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://code.google.com/p/configobj/ https://pypi.python.org/pypi/configobj"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- # Not to install un-needed _version.py
- sed -e "/^MODULES =/s/, '_version'//" -i setup.py
- sed -e "s/^from _version import __version__$/__version__ = '${PV}'/" -i configobj.py
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- "${PYTHON}" validate.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/configobj/files/configobj-4.7.2-fix_tests.patch b/dev-python/configobj/files/configobj-4.7.2-fix_tests.patch
deleted file mode 100644
index c0b867e0ee7..00000000000
--- a/dev-python/configobj/files/configobj-4.7.2-fix_tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- validate.py
-+++ validate.py
-@@ -268,8 +268,6 @@
- 16908291
- >>> int(dottedQuadToNum('1.2.3.4'))
- 16909060
-- >>> dottedQuadToNum('255.255.255.255')
-- 4294967295L
- >>> dottedQuadToNum('255.255.255.256')
- Traceback (most recent call last):
- ValueError: Not a good dotted-quad IP: 255.255.255.256
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/configobj/, dev-python/configobj/files/
@ 2020-08-05 4:41 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-08-05 4:41 UTC (permalink / raw
To: gentoo-commits
commit: aa7b6cafbab7839dc371bd48d4c1b44f32ce5c87
Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Mon Jul 27 20:22:44 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 5 04:41:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa7b6caf
dev-python/configobj: Various fixes
Switch SRC_URI to Github release tarball, add patch to fix tests on arm,
EAPI bump, add DISTUTILS_USE_SETUPTOOLS=no like the eclass suggests.
Closes: https://bugs.gentoo.org/732092
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/16865
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/configobj/Manifest | 1 +
dev-python/configobj/configobj-5.0.6-r1.ebuild | 25 ++++++++++
.../files/configobj-5.0.6-fix-py2-tests.patch | 55 ++++++++++++++++++++++
3 files changed, 81 insertions(+)
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index 09a7a68b348..a606bd2e893 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1 +1,2 @@
+DIST configobj-5.0.6.gh.tar.gz 143664 BLAKE2B b554d0aec903aecb55387a0164cd6f8d442e9fc1ab231ce7f7123e7a5041e07a86f5f7bf70492ca93fcdc1bd3caa5b855c427f060842e3b4a7524afbcc417a76 SHA512 326eb86e362f281ebf07abcb1cf7616abb270c482eafe842371cda8708245ca5e8262f1644b7164664ecc10e9004ed061c9de18cd233a657d4697dbc3ba3c59d
DIST configobj-5.0.6.tar.gz 33248 BLAKE2B b58a22fdf247f1c3022108e24abb4de55620ce75f6aeb5f269f008a5668e07b8c1d0c49e4059d7f4c4c361d269ead39c3784377635c7718f92c2381e69c56cb5 SHA512 f253fdd0bc3fcd37f56c9ceb28f5c8c739b0861e099b07a3929645907c97b2261f0529850a95c1a42507846f72d88a0992fcd1e1d6fa8654dc713d120f769963
diff --git a/dev-python/configobj/configobj-5.0.6-r1.ebuild b/dev-python/configobj/configobj-5.0.6-r1.ebuild
new file mode 100644
index 00000000000..469eee85be8
--- /dev/null
+++ b/dev-python/configobj/configobj-5.0.6-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Simple config file reader and writer"
+HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/"
+SRC_URI="https://github.com/DiffSK/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-fix-py2-tests.patch" )
+
+python_test() {
+ "${EPYTHON}" validate.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
new file mode 100644
index 00000000000..5ac64a256cb
--- /dev/null
+++ b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
@@ -0,0 +1,55 @@
+Upstream: https://github.com/DiffSK/configobj/commit/e2731538d1a37a5b67a6e518848be6a8988043ae
+
+diff --git a/tests/test_validate.py b/tests/test_validate.py
+index bffb0dc..4eed7e9 100644
+--- a/tests/test_validate.py
++++ b/tests/test_validate.py
+@@ -161,3 +161,26 @@ class TestBasic(object):
+ 'test3': 3,
+ 'test4': 6.0
+ }}}
++
++
++class TestDottedQuadToNum(object):
++
++ def test_stripped(self):
++ assert dottedQuadToNum('192.0.2.0') == 3221225984
++ assert dottedQuadToNum('192.0.2.1 ') == 3221225985
++ assert dottedQuadToNum(' 192.0.2.2') == 3221225986
++ assert dottedQuadToNum('\t\t192.0.2.3\n') == 3221225987
++ with pytest.raises(ValueError) as excinfo:
++ dottedQuadToNum('192. 0. 2. 4')
++ assert str(excinfo.value) == 'Not a good dotted-quad IP: 192. 0. 2. 4'
++
++ def test_boundaries(self):
++ assert dottedQuadToNum('0.0.0.0') == 0
++ assert dottedQuadToNum('255.255.255.255') == 4294967295
++ with pytest.raises(ValueError) as excinfo:
++ dottedQuadToNum('255.255.255.256')
++ assert str(excinfo.value) == (
++ 'Not a good dotted-quad IP: 255.255.255.256')
++ with pytest.raises(ValueError) as excinfo:
++ dottedQuadToNum('-1')
++ assert str(excinfo.value) == 'Not a good dotted-quad IP: -1'
+diff --git a/validate.py b/validate.py
+index b7a964c..9d8c94d 100644
+--- a/validate.py
++++ b/validate.py
+@@ -277,17 +277,8 @@ def dottedQuadToNum(ip):
+
+ >>> int(dottedQuadToNum('1 '))
+ 1
+- >>> int(dottedQuadToNum(' 1.2'))
+- 16777218
+- >>> int(dottedQuadToNum(' 1.2.3 '))
+- 16908291
+ >>> int(dottedQuadToNum('1.2.3.4'))
+ 16909060
+- >>> dottedQuadToNum('255.255.255.255')
+- 4294967295
+- >>> dottedQuadToNum('255.255.255.256')
+- Traceback (most recent call last):
+- ValueError: Not a good dotted-quad IP: 255.255.255.256
+ """
+
+ # import here to avoid it when ip_addr values are not used
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/configobj/, dev-python/configobj/files/
@ 2023-02-21 7:50 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2023-02-21 7:50 UTC (permalink / raw
To: gentoo-commits
commit: f4f0202193e0962c058300d7fc5419899d829e15
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 07:46:06 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 07:50:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f02021
dev-python/configobj: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/configobj/Manifest | 1 -
dev-python/configobj/configobj-5.0.6-r2.ebuild | 23 -------------
.../files/configobj-5.0.6-fix-py2-tests.patch | 40 ----------------------
3 files changed, 64 deletions(-)
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index a66999359b64..737c0496a495 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,2 +1 @@
-DIST configobj-5.0.6.gh.tar.gz 143664 BLAKE2B b554d0aec903aecb55387a0164cd6f8d442e9fc1ab231ce7f7123e7a5041e07a86f5f7bf70492ca93fcdc1bd3caa5b855c427f060842e3b4a7524afbcc417a76 SHA512 326eb86e362f281ebf07abcb1cf7616abb270c482eafe842371cda8708245ca5e8262f1644b7164664ecc10e9004ed061c9de18cd233a657d4697dbc3ba3c59d
DIST configobj-5.0.8.gh.tar.gz 99071 BLAKE2B 61fb8622f3771f56f3a67511ce0eee11b9022a47a6a48858fafad966dd7fb18387d18dc0c32984bec064c2b03a7c72570248a967bf428f871c5b8ba4353a71e7 SHA512 26cdfec9f4d7adbab579191b29e6642f4f2a6fc73353f877565b76682d6087748f466f9cbb82fccfb2d409bace29c377c2276848179f5cb396e6ff1375c8edf2
diff --git a/dev-python/configobj/configobj-5.0.6-r2.ebuild b/dev-python/configobj/configobj-5.0.6-r2.ebuild
deleted file mode 100644
index 944ed672f97a..000000000000
--- a/dev-python/configobj/configobj-5.0.6-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple config file reader and writer"
-HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/"
-SRC_URI="https://github.com/DiffSK/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${P}-fix-py2-tests.patch" )
-
-distutils_enable_tests pytest
diff --git a/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
deleted file mode 100644
index 49576b4f43e7..000000000000
--- a/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/tests/test_validate.py b/tests/test_validate.py
-index bffb0dc..c7d57d3 100644
---- a/tests/test_validate.py
-+++ b/tests/test_validate.py
-@@ -2,7 +2,7 @@
-
- from configobj import ConfigObj
- import pytest
--from validate import Validator, VdtValueTooSmallError
-+from validate import Validator, VdtValueTooSmallError, dottedQuadToNum
-
-
- class TestBasic(object):
-@@ -161,3 +161,26 @@ class TestBasic(object):
- 'test3': 3,
- 'test4': 6.0
- }}}
-+
-+
-+class TestDottedQuadToNum(object):
-+
-+ def test_stripped(self):
-+ assert dottedQuadToNum('192.0.2.0') == 3221225984
-+ assert dottedQuadToNum('192.0.2.1 ') == 3221225985
-+ assert dottedQuadToNum(' 192.0.2.2') == 3221225986
-+ assert dottedQuadToNum('\t\t192.0.2.3\n') == 3221225987
-+ with pytest.raises(ValueError) as excinfo:
-+ dottedQuadToNum('192. 0. 2. 4')
-+ assert str(excinfo.value) == 'Not a good dotted-quad IP: 192. 0. 2. 4'
-+
-+ def test_boundaries(self):
-+ assert dottedQuadToNum('0.0.0.0') == 0
-+ assert dottedQuadToNum('255.255.255.255') == 4294967295
-+ with pytest.raises(ValueError) as excinfo:
-+ dottedQuadToNum('255.255.255.256')
-+ assert str(excinfo.value) == (
-+ 'Not a good dotted-quad IP: 255.255.255.256')
-+ with pytest.raises(ValueError) as excinfo:
-+ dottedQuadToNum('-1')
-+ assert str(excinfo.value) == 'Not a good dotted-quad IP: -1'
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-21 7:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-05 4:41 [gentoo-commits] repo/gentoo:master commit in: dev-python/configobj/, dev-python/configobj/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-02-21 7:50 Michał Górny
2017-05-02 13:11 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox