public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/iniconfig/files/, dev-python/iniconfig/
@ 2021-01-13 20:16 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2021-01-13 20:16 UTC (permalink / raw
  To: gentoo-commits

commit:     618dbb5eaaf88290af57dc7f1f9aaddd1e4ce97f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 20:08:25 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 20:15:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618dbb5e

dev-python/iniconfig: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/iniconfig/Manifest                      |  1 -
 .../iniconfig/files/iniconfig-1.0.0-pytest-5.patch | 57 ----------------------
 dev-python/iniconfig/iniconfig-1.0.0.ebuild        | 25 ----------
 3 files changed, 83 deletions(-)

diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 9834a43946f..3aec5a70f66 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,2 +1 @@
-DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
 DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee

diff --git a/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch b/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
deleted file mode 100644
index f8fca367b34..00000000000
--- a/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From da205253f0d78204900ec82b6cb2cb0afd9f1254 Mon Sep 17 00:00:00 2001
-From: Stanislav Levin <slev@altlinux.org>
-Date: Thu, 8 Aug 2019 19:43:12 +0300
-Subject: [PATCH] Fix Pytest 5 errors
-
-This fixes
-"""
-pytest.PytestDeprecationWarning: raises(..., 'code(as_a_string)')
-is deprecated, use the context manager form or use `exec()` directly.
-"""
-
-Fixes: https://github.com/RonnyPfannschmidt/iniconfig/issues/6
-Signed-off-by: Stanislav Levin <slev@altlinux.org>
----
- test_iniconfig.py | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/test_iniconfig.py b/test_iniconfig.py
-index 27fd53f..fe12421 100644
---- a/test_iniconfig.py
-+++ b/test_iniconfig.py
-@@ -150,27 +150,25 @@ def test_iniconfig_from_file(tmpdir):
-     assert list(config.sections) == ['metadata']
-     config = IniConfig(path, "[diff]")
-     assert list(config.sections) == ['diff']
--    py.test.raises(TypeError, "IniConfig(data=path.read())")
-+    with pytest.raises(TypeError):
-+        IniConfig(data=path.read())
- 
- 
- def test_iniconfig_section_first(tmpdir):
--    excinfo = py.test.raises(ParseError, """
-+    with pytest.raises(ParseError) as excinfo:
-         IniConfig("x", data='name=1')
--    """)
-     assert excinfo.value.msg == "no section header defined"
- 
- 
- def test_iniconig_section_duplicate_fails():
--    excinfo = py.test.raises(ParseError, r"""
-+    with pytest.raises(ParseError) as excinfo:
-         IniConfig("x", data='[section]\n[section]')
--    """)
-     assert 'duplicate section' in str(excinfo.value)
- 
- 
- def test_iniconfig_duplicate_key_fails():
--    excinfo = py.test.raises(ParseError, r"""
-+    with pytest.raises(ParseError) as excinfo:
-         IniConfig("x", data='[section]\nname = Alice\nname = bob')
--    """)
- 
-     assert 'duplicate name' in str(excinfo.value)
- 
--- 
-2.28.0
-

diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
deleted file mode 100644
index 89b47a779d4..00000000000
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Brain-dead simple config-ini parsing"
-HOMEPAGE="
-	https://github.com/RonnyPfannschmidt/iniconfig
-	"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest-5.patch
-)


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/iniconfig/files/, dev-python/iniconfig/
@ 2023-02-16 20:21 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-02-16 20:21 UTC (permalink / raw
  To: gentoo-commits

commit:     2c8f1f093b775a66f679d57c22849ff7f8e9c233
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 20:20:31 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 20:20:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8f1f09

dev-python/iniconfig: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/iniconfig/Manifest                      |  1 -
 .../iniconfig/files/iniconfig-1.1.1-py.patch       | 41 ----------------------
 dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild     | 30 ----------------
 3 files changed, 72 deletions(-)

diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 75386e40fa89..b8e9cf1e05c2 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,2 +1 @@
-DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
 DIST iniconfig-2.0.0.gh.tar.gz 8077 BLAKE2B bb24006bafed64bc28d7a784ed24663dbcea782ef241b9c7ccb5dc0268f6d6ce149882155617d4c021805457c7c5e4775437d267da6905266fb84e877f16e09c SHA512 e474aaa904070ed79dbbd2b4b572574ebb591b97a4ca0f9c4e4aef437af01035d2f73c48bb670afcec2cd8b7ea093b92d6b0c0eca7ba42033418a2b0e0ac80ad

diff --git a/dev-python/iniconfig/files/iniconfig-1.1.1-py.patch b/dev-python/iniconfig/files/iniconfig-1.1.1-py.patch
deleted file mode 100644
index c1722bd3a466..000000000000
--- a/dev-python/iniconfig/files/iniconfig-1.1.1-py.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6b714f558b6cfb9f25c58b70eeb134f3bfa1bebd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?=
- <frenzy.madness@gmail.com>
-Date: Wed, 30 Nov 2022 22:47:56 +0100
-Subject: [PATCH] Drop dependency on py
-
-pytest 7.2 and tox 4 no longer depend on py and it's not needed here as well.
----
- testing/test_iniconfig.py | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/testing/test_iniconfig.py b/testing/test_iniconfig.py
-index fe12421..027949d 100644
---- a/testing/test_iniconfig.py
-+++ b/testing/test_iniconfig.py
-@@ -1,4 +1,3 @@
--import py
- import pytest
- from iniconfig import IniConfig, ParseError, __all__ as ALL
- from iniconfig import iscommentline
-@@ -100,7 +99,7 @@ def parse(input):
- 
- 
- def parse_a_error(input):
--    return py.test.raises(ParseError, parse, input)
-+    return pytest.raises(ParseError, parse, input)
- 
- 
- def test_tokenize(input, expected):
-@@ -135,7 +134,7 @@ def test_section_cant_be_empty():
-     assert excinfo.value.lineno == 0
- 
- 
--@py.test.mark.parametrize('line', [
-+@pytest.mark.parametrize('line', [
-     '!!',
-     ])
- def test_error_on_weird_lines(line):
--- 
-2.39.0
-

diff --git a/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
deleted file mode 100644
index 7b80e71f636b..000000000000
--- a/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020-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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Brain-dead simple config-ini parsing"
-HOMEPAGE="
-	https://github.com/pytest-dev/iniconfig/
-	https://pypi.org/project/iniconfig/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py.patch
-)


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/iniconfig/files/, dev-python/iniconfig/
@ 2022-12-23 18:03 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2022-12-23 18:03 UTC (permalink / raw
  To: gentoo-commits

commit:     f7d4df563d424b8de27b30a1a67477b71092eb7c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 18:02:22 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 18:02:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d4df56

dev-python/iniconfig: Fix compatibility with pytest-7.2+

Closes: https://bugs.gentoo.org/887983
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../iniconfig/files/iniconfig-1.1.1-py.patch       | 41 ++++++++++++++++++++++
 dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild     |  4 +++
 2 files changed, 45 insertions(+)

diff --git a/dev-python/iniconfig/files/iniconfig-1.1.1-py.patch b/dev-python/iniconfig/files/iniconfig-1.1.1-py.patch
new file mode 100644
index 000000000000..c1722bd3a466
--- /dev/null
+++ b/dev-python/iniconfig/files/iniconfig-1.1.1-py.patch
@@ -0,0 +1,41 @@
+From 6b714f558b6cfb9f25c58b70eeb134f3bfa1bebd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?=
+ <frenzy.madness@gmail.com>
+Date: Wed, 30 Nov 2022 22:47:56 +0100
+Subject: [PATCH] Drop dependency on py
+
+pytest 7.2 and tox 4 no longer depend on py and it's not needed here as well.
+---
+ testing/test_iniconfig.py | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/testing/test_iniconfig.py b/testing/test_iniconfig.py
+index fe12421..027949d 100644
+--- a/testing/test_iniconfig.py
++++ b/testing/test_iniconfig.py
+@@ -1,4 +1,3 @@
+-import py
+ import pytest
+ from iniconfig import IniConfig, ParseError, __all__ as ALL
+ from iniconfig import iscommentline
+@@ -100,7 +99,7 @@ def parse(input):
+ 
+ 
+ def parse_a_error(input):
+-    return py.test.raises(ParseError, parse, input)
++    return pytest.raises(ParseError, parse, input)
+ 
+ 
+ def test_tokenize(input, expected):
+@@ -135,7 +134,7 @@ def test_section_cant_be_empty():
+     assert excinfo.value.lineno == 0
+ 
+ 
+-@py.test.mark.parametrize('line', [
++@pytest.mark.parametrize('line', [
+     '!!',
+     ])
+ def test_error_on_weird_lines(line):
+-- 
+2.39.0
+

diff --git a/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
index eed3a00ab16f..22ff44d24447 100644
--- a/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
@@ -24,3 +24,7 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py.patch
+)


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/iniconfig/files/, dev-python/iniconfig/
@ 2020-07-30 14:30 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2020-07-30 14:30 UTC (permalink / raw
  To: gentoo-commits

commit:     4efca2579ada33cc1cefc39327cab5a485a4a228
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 06:30:01 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 14:30:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4efca257

dev-python/iniconfig: New dep of dev-python/pytest

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/iniconfig/Manifest                      |  1 +
 .../iniconfig/files/iniconfig-1.0.0-pytest-5.patch | 57 ++++++++++++++++++++++
 dev-python/iniconfig/iniconfig-1.0.0.ebuild        | 25 ++++++++++
 dev-python/iniconfig/metadata.xml                  |  7 +++
 4 files changed, 90 insertions(+)

diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
new file mode 100644
index 00000000000..83d9ec04a49
--- /dev/null
+++ b/dev-python/iniconfig/Manifest
@@ -0,0 +1 @@
+DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1

diff --git a/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch b/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
new file mode 100644
index 00000000000..f8fca367b34
--- /dev/null
+++ b/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
@@ -0,0 +1,57 @@
+From da205253f0d78204900ec82b6cb2cb0afd9f1254 Mon Sep 17 00:00:00 2001
+From: Stanislav Levin <slev@altlinux.org>
+Date: Thu, 8 Aug 2019 19:43:12 +0300
+Subject: [PATCH] Fix Pytest 5 errors
+
+This fixes
+"""
+pytest.PytestDeprecationWarning: raises(..., 'code(as_a_string)')
+is deprecated, use the context manager form or use `exec()` directly.
+"""
+
+Fixes: https://github.com/RonnyPfannschmidt/iniconfig/issues/6
+Signed-off-by: Stanislav Levin <slev@altlinux.org>
+---
+ test_iniconfig.py | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/test_iniconfig.py b/test_iniconfig.py
+index 27fd53f..fe12421 100644
+--- a/test_iniconfig.py
++++ b/test_iniconfig.py
+@@ -150,27 +150,25 @@ def test_iniconfig_from_file(tmpdir):
+     assert list(config.sections) == ['metadata']
+     config = IniConfig(path, "[diff]")
+     assert list(config.sections) == ['diff']
+-    py.test.raises(TypeError, "IniConfig(data=path.read())")
++    with pytest.raises(TypeError):
++        IniConfig(data=path.read())
+ 
+ 
+ def test_iniconfig_section_first(tmpdir):
+-    excinfo = py.test.raises(ParseError, """
++    with pytest.raises(ParseError) as excinfo:
+         IniConfig("x", data='name=1')
+-    """)
+     assert excinfo.value.msg == "no section header defined"
+ 
+ 
+ def test_iniconig_section_duplicate_fails():
+-    excinfo = py.test.raises(ParseError, r"""
++    with pytest.raises(ParseError) as excinfo:
+         IniConfig("x", data='[section]\n[section]')
+-    """)
+     assert 'duplicate section' in str(excinfo.value)
+ 
+ 
+ def test_iniconfig_duplicate_key_fails():
+-    excinfo = py.test.raises(ParseError, r"""
++    with pytest.raises(ParseError) as excinfo:
+         IniConfig("x", data='[section]\nname = Alice\nname = bob')
+-    """)
+ 
+     assert 'duplicate name' in str(excinfo.value)
+ 
+-- 
+2.28.0
+

diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
new file mode 100644
index 00000000000..52b493fe771
--- /dev/null
+++ b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Brain-dead simple config-ini parsing"
+HOMEPAGE="
+	https://github.com/RonnyPfannschmidt/iniconfig
+	"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest-5.patch
+)

diff --git a/dev-python/iniconfig/metadata.xml b/dev-python/iniconfig/metadata.xml
new file mode 100644
index 00000000000..266e3f19ca5
--- /dev/null
+++ b/dev-python/iniconfig/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>


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

end of thread, other threads:[~2023-02-16 20:21 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-13 20:16 [gentoo-commits] repo/gentoo:master commit in: dev-python/iniconfig/files/, dev-python/iniconfig/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2023-02-16 20:21 Michał Górny
2022-12-23 18:03 Michał Górny
2020-07-30 14:30 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