[gentoo-commits] repo/gentoo:master commit in: dev-python/fastjsonschema/files/, dev-python/fastjsonschema/

[gentoo-commits] repo/gentoo:master commit in: dev-python/fastjsonschema/files/, dev-python/fastjsonschema/

[Michał Górny]

commit:     1cf80c25fdea65c399018f856f430fe208e95294
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 14:06:22 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr  2 16:18:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf80c25

dev-python/fastjsonschema: Backport pytest-8 fix

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

 .../fastjsonschema/fastjsonschema-2.19.1.ebuild    |  5 ++
 .../files/fastjsonschema-2.19.1-pytest-8.patch     | 67 ++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/dev-python/fastjsonschema/fastjsonschema-2.19.1.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.19.1.ebuild
index 602928a877f2..2308e701735e 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.19.1.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.19.1.ebuild
@@ -23,3 +23,8 @@ distutils_enable_tests pytest
 EPYTEST_IGNORE=(
 	tests/benchmarks
 )
+
+PATCHES=(
+	# https://github.com/horejsek/python-fastjsonschema/pull/180
+	"${FILESDIR}/${P}-pytest-8.patch"
+)

diff --git a/dev-python/fastjsonschema/files/fastjsonschema-2.19.1-pytest-8.patch b/dev-python/fastjsonschema/files/fastjsonschema-2.19.1-pytest-8.patch
new file mode 100644
index 000000000000..40cd057f6299
--- /dev/null
+++ b/dev-python/fastjsonschema/files/fastjsonschema-2.19.1-pytest-8.patch
@@ -0,0 +1,67 @@
+From 427a34e9ef409fefd8f1f7ae7e1c2a2bb7eb4496 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Edgar=20Ram=C3=ADrez=20Mondrag=C3=B3n?=
+ <edgarrm358@gmail.com>
+Date: Tue, 14 Nov 2023 18:05:17 -0600
+Subject: [PATCH] Use `warnings.catch_warnings` instead of `pytest.warns(None)`
+ in tests
+
+---
+ tests/test_pattern_properties.py | 7 ++++---
+ tests/test_string.py             | 7 ++++---
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/tests/test_pattern_properties.py b/tests/test_pattern_properties.py
+index ae86946..945315b 100644
+--- a/tests/test_pattern_properties.py
++++ b/tests/test_pattern_properties.py
+@@ -1,3 +1,5 @@
++import warnings
++
+ import pytest
+ 
+ 
+@@ -59,12 +61,11 @@ def test_pattern_with_escape_no_warnings(asserter):
+         'bar': {}
+     }
+ 
+-    with pytest.warns(None) as record:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         asserter({
+             'type': 'object',
+             'patternProperties': {
+                 '\\w+': {'type': 'object'}
+             }
+         }, value, value)
+-
+-    assert len(record) == 0
+diff --git a/tests/test_string.py b/tests/test_string.py
+index a8e8318..12fc3c9 100644
+--- a/tests/test_string.py
++++ b/tests/test_string.py
+@@ -1,3 +1,5 @@
++import warnings
++
+ import pytest
+ 
+ from fastjsonschema import JsonSchemaValueException
+@@ -74,14 +76,13 @@ def test_pattern_with_space(asserter, pattern):
+ 
+ 
+ def test_pattern_with_escape_no_warnings(asserter):
+-    with pytest.warns(None) as record:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         asserter({
+             'type': 'string',
+             'pattern': '\\s'
+         }, ' ', ' ')
+ 
+-    assert len(record) == 0
+-
+ 
+ exc = JsonSchemaValueException('data must be a valid regex', value='{data}', name='data', definition='{definition}', rule='format')
+ @pytest.mark.parametrize('value, expected', [
+-- 
+2.44.0
+

[gentoo-commits] repo/gentoo:master commit in: dev-python/fastjsonschema/files/, dev-python/fastjsonschema/

[Michał Górny]

commit:     b0278d513be42c77503da19c114ed1b257349455
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 06:30:40 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 06:35:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0278d51

dev-python/fastjsonschema: Remove old

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

 dev-python/fastjsonschema/Manifest                 |  1 -
 .../fastjsonschema/fastjsonschema-2.19.1.ebuild    | 30 ----------
 .../files/fastjsonschema-2.19.1-pytest-8.patch     | 67 ----------------------
 3 files changed, 98 deletions(-)

diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 79bedb09a3b0..cb5819766185 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,2 +1 @@
-DIST fastjsonschema-2.19.1.tar.gz 372732 BLAKE2B f028e027483e02969c4d750a888659add9dd7f661776ab42242f74492272267b93a2248cdc50b78389091cc1a1fd7661abbf377d81edf73df35ed1e222be7328 SHA512 b276788ebe1d3a6bc5d1463c2a4940fbe5c9e0a7919c813b78f385faa406527cac34d4042e6a69e0ca1631f3e5ed0bc351e13d9d1e245132a1607e010a5a2346
 DIST fastjsonschema-2.20.0.tar.gz 373056 BLAKE2B 99e80a6aa05aef421c5d95149f5f40f0a732bd686888f32067295c19d9c1d7569bf628d06b59bbeb68ea302e06de700b05c27e7a44e018b213e0c1a7f4dc1304 SHA512 7881937a02c7487d1dfd7499dbe85e8f8e359b9686673f32491d93cef1d7a949df5309b0d4a5cc525a7d9c8269568bc34e9d072ec1a49e44d5becbf8718b250d

diff --git a/dev-python/fastjsonschema/fastjsonschema-2.19.1.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.19.1.ebuild
deleted file mode 100644
index cf18821f1b26..000000000000
--- a/dev-python/fastjsonschema/fastjsonschema-2.19.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast JSON schema validator for Python"
-HOMEPAGE="
-	https://github.com/horejsek/python-fastjsonschema/
-	https://pypi.org/project/fastjsonschema/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	tests/benchmarks
-)
-
-PATCHES=(
-	# https://github.com/horejsek/python-fastjsonschema/pull/180
-	"${FILESDIR}/${P}-pytest-8.patch"
-)

diff --git a/dev-python/fastjsonschema/files/fastjsonschema-2.19.1-pytest-8.patch b/dev-python/fastjsonschema/files/fastjsonschema-2.19.1-pytest-8.patch
deleted file mode 100644
index 40cd057f6299..000000000000
--- a/dev-python/fastjsonschema/files/fastjsonschema-2.19.1-pytest-8.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 427a34e9ef409fefd8f1f7ae7e1c2a2bb7eb4496 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Edgar=20Ram=C3=ADrez=20Mondrag=C3=B3n?=
- <edgarrm358@gmail.com>
-Date: Tue, 14 Nov 2023 18:05:17 -0600
-Subject: [PATCH] Use `warnings.catch_warnings` instead of `pytest.warns(None)`
- in tests
-
----
- tests/test_pattern_properties.py | 7 ++++---
- tests/test_string.py             | 7 ++++---
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/tests/test_pattern_properties.py b/tests/test_pattern_properties.py
-index ae86946..945315b 100644
---- a/tests/test_pattern_properties.py
-+++ b/tests/test_pattern_properties.py
-@@ -1,3 +1,5 @@
-+import warnings
-+
- import pytest
- 
- 
-@@ -59,12 +61,11 @@ def test_pattern_with_escape_no_warnings(asserter):
-         'bar': {}
-     }
- 
--    with pytest.warns(None) as record:
-+    with warnings.catch_warnings():
-+        warnings.simplefilter("error")
-         asserter({
-             'type': 'object',
-             'patternProperties': {
-                 '\\w+': {'type': 'object'}
-             }
-         }, value, value)
--
--    assert len(record) == 0
-diff --git a/tests/test_string.py b/tests/test_string.py
-index a8e8318..12fc3c9 100644
---- a/tests/test_string.py
-+++ b/tests/test_string.py
-@@ -1,3 +1,5 @@
-+import warnings
-+
- import pytest
- 
- from fastjsonschema import JsonSchemaValueException
-@@ -74,14 +76,13 @@ def test_pattern_with_space(asserter, pattern):
- 
- 
- def test_pattern_with_escape_no_warnings(asserter):
--    with pytest.warns(None) as record:
-+    with warnings.catch_warnings():
-+        warnings.simplefilter("error")
-         asserter({
-             'type': 'string',
-             'pattern': '\\s'
-         }, ' ', ' ')
- 
--    assert len(record) == 0
--
- 
- exc = JsonSchemaValueException('data must be a valid regex', value='{data}', name='data', definition='{definition}', rule='format')
- @pytest.mark.parametrize('value, expected', [
--- 
-2.44.0
-