* [gentoo-commits] repo/gentoo:master commit in: dev-python/ruamel-yaml/, dev-python/ruamel-yaml/files/
@ 2021-03-11 16:16 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2021-03-11 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 0288a3c565e8846ab922e6e2cd51d54c0f8def6c
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 16:14:34 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 16:16:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0288a3c5
dev-python/ruamel-yaml-0.16.13-r1: skip test_collections_deprecation on pypy3
This only got deprecated in Python 3.7 and our pypy is 3.6-compatible.
Closes: https://bugs.gentoo.org/775473
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
...yaml-0.16.13-pypy3_collection_deprecation.patch | 22 ++++++++++++++++++++++
.../ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild | 4 ++++
2 files changed, 26 insertions(+)
diff --git a/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch b/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch
new file mode 100644
index 00000000000..9f7be2676ec
--- /dev/null
+++ b/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch
@@ -0,0 +1,22 @@
+Note that this implicitly assumes pypy3 to be compatible with CPython 3.6.
+The test could in principle be more robust - but between 3.7 support
+in PyPy is still being alpha-grade and the fact there will be many more
+serious issues with switching the Gentoo pypy3 target to those versions,
+why bother for now.
+
+--- a/_test/test_deprecation.py
++++ b/_test/test_deprecation.py
+@@ -2,11 +2,12 @@
+
+ from __future__ import print_function
+
++import platform
+ import sys
+ import pytest # NOQA
+
+
+-@pytest.mark.skipif(sys.version_info < (3, 7) or sys.version_info >= (3, 9),
++@pytest.mark.skipif(platform.python_implementation() == 'PyPy' or sys.version_info < (3, 7) or sys.version_info >= (3, 9),
+ reason='collections not available?')
+ def test_collections_deprecation():
+ with pytest.warns(DeprecationWarning):
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
index 9d1cf66a423..41502f6c026 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
@@ -26,6 +26,10 @@ BDEPEND="test? (
dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.16.13-pypy3_collection_deprecation.patch
+)
+
S="${WORKDIR}"/${MY_P}
distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/ruamel-yaml/, dev-python/ruamel-yaml/files/
@ 2021-07-03 6:21 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2021-07-03 6:21 UTC (permalink / raw
To: gentoo-commits
commit: cf776b48b8e5d79ff372c94c5a9edb54f4541fba
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 3 06:19:33 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 3 06:21:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf776b48
dev-python/ruamel-yaml: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/ruamel-yaml/Manifest | 5 ---
...yaml-0.16.13-pypy3_collection_deprecation.patch | 19 --------
.../ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild | 46 --------------------
dev-python/ruamel-yaml/ruamel-yaml-0.17.4.ebuild | 50 ----------------------
dev-python/ruamel-yaml/ruamel-yaml-0.17.5.ebuild | 50 ----------------------
dev-python/ruamel-yaml/ruamel-yaml-0.17.7.ebuild | 50 ----------------------
dev-python/ruamel-yaml/ruamel-yaml-0.17.8.ebuild | 50 ----------------------
7 files changed, 270 deletions(-)
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 6a7bc536552..cf99433442b 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,7 +1,2 @@
-DIST ruamel-yaml-0.16.13.tar.xz 178756 BLAKE2B 19ee4713786a33853f42256e5cd3187e9e19b931ebd83a133365de3f080721c5a6f5fb41ff3079473461df47a0ab149981c5e94d08321da8b3c9eb311c226945 SHA512 1366fc0b3b5ea2699ca324636403576134ccc7c725b13c21a7752d1b16c644c93c7f7d82ddc337087d2c02947f95263d7a3fdd162f552ac3a78fa36f1f17b3f1
DIST ruamel-yaml-0.17.10.tar.xz 183116 BLAKE2B 2795f470a3f7da609780109dfac502a5b47184f465c68420f467209275c8857418a4ec7424e130df2e7acef614d93f91551910eceb06cd9e49b365bb23d2a015 SHA512 3cd2598fa37564c44c74720e72babcd2252b2dbcdde626bdcf771b591da5d2852d90bb1f22428e28cd7ec38304be2a437aa0569ffbd3ebb526b2b79a955bc88d
-DIST ruamel-yaml-0.17.4.tar.xz 178028 BLAKE2B 24c9f61cf8e158377ae839f73dcceab8fdbb8071d1a792a37bd96158993602625967805f177719bbe88e917ccaf10ba210b6c01e91bb750f4df6bcc8a4a66450 SHA512 4c3d51ff00ace64e00d5bc8314c8cb6bc193da2a90e2cc9b9ed97510a7035778917c56e10b85cafab50f296f2f46d8817ad1abfa01b0498715f4972d91545dd3
-DIST ruamel-yaml-0.17.5.tar.xz 182484 BLAKE2B 8e06b08799a2b8ec8cd5a732e689dd8413bdb3afdc621fbedfc769fea9cee6b06b33434765dfff048840b4b25b5b9784db6b93e22336cc4306103e91b0269e6b SHA512 99c8ea0cfcd3877b9a17fc781e32302359b9e704f72dbb53ede17fd63a78cce7f670de36a35d3ce9bd64f604c14741fba74a2c6c422a5adf484bbe5a31d464b3
-DIST ruamel-yaml-0.17.7.tar.xz 182984 BLAKE2B 54c196f07cabe7cc97e4e652cb1c66443461f1555e0feb002e7c02e725a094a468733bcb9423c3a6d7450d25ad508a6a7338a107f0b015b2bfb0c42a57d8957f SHA512 0e5c638ac69d41ac5ea4712a97a05a43ec947a6bf9890f7c29aac057ef554fe65b92370bec91eae2803fc83be6ad01f60668f3d81458aaef32871312a62a86b8
-DIST ruamel-yaml-0.17.8.tar.xz 182988 BLAKE2B bd9f19eacac51bf5032738c8cd3da08d42ee109abf69442ab079a2d88267146d23d6facb6bc8683d4b78cff0577271574a7012799828a77ba23631b7b6af5b65 SHA512 69fdcffdb3b4cfb4b7933750b2f3a0ee2f44166c38a0cf3c5ba72bb14c1513ed28138435fecf8f23d72cb76b0489450403f726c5740ee9715f7d993f95438c0f
DIST ruamel-yaml-0.17.9.tar.xz 183112 BLAKE2B 3dc33257435aa164724f8023c3bcd2f693c5dfbb4ac52467c821902819183e119f46e7dbcdab50216c019aa38a3d8fb94eb382c85edc0a08a278492ef53b2597 SHA512 dabc5540f68454d8abb46434bc91161ceb7bc613593c6aad79a4148c4526248d6053e356eb745e4cec7816885c1352f62d3c0a61d3d8a40315fd3ffb0e2f57ef
diff --git a/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch b/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch
deleted file mode 100644
index 15d00625b68..00000000000
--- a/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This does not produce a deprecation warning under PyPy, even pypy3.7
-(last tested on 2021-03-12 using version 7.3.3-beta0).
-
---- a/_test/test_deprecation.py
-+++ b/_test/test_deprecation.py
-@@ -2,11 +2,12 @@
-
- from __future__ import print_function
-
-+import platform
- import sys
- import pytest # NOQA
-
-
--@pytest.mark.skipif(sys.version_info < (3, 7) or sys.version_info >= (3, 9),
-+@pytest.mark.skipif(platform.python_implementation() == 'PyPy' or sys.version_info < (3, 7) or sys.version_info >= (3, 9),
- reason='collections not available?')
- def test_collections_deprecation():
- with pytest.warns(DeprecationWarning):
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
deleted file mode 100644
index d1a9633d5eb..00000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="test? (
- dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-)"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.16.13-pypy3_collection_deprecation.patch
-)
-
-S="${WORKDIR}"/${MY_P}
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
- epytest --ignore _test/lib/
-}
-
-python_install() {
- distutils-r1_python_install --single-version-externally-managed
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.4.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.4.ebuild
deleted file mode 100644
index d4bc00ec084..00000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
- https://pypi.org/project/ruamel.yaml/
- https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
- dev-python/namespace-ruamel[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
- local deselect=()
-
- [[ ${EPYTHON} == pypy3 ]] && deselect+=(
- _test/test_deprecation.py::test_collections_deprecation
- )
-
- epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
- distutils-r1_python_install --single-version-externally-managed
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.5.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.5.ebuild
deleted file mode 100644
index 4b594b0aa1f..00000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
- https://pypi.org/project/ruamel.yaml/
- https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- dev-python/namespace-ruamel[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
- local deselect=()
-
- [[ ${EPYTHON} == pypy3 ]] && deselect+=(
- _test/test_deprecation.py::test_collections_deprecation
- )
-
- epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
- distutils-r1_python_install --single-version-externally-managed
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.7.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.7.ebuild
deleted file mode 100644
index 4b594b0aa1f..00000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
- https://pypi.org/project/ruamel.yaml/
- https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- dev-python/namespace-ruamel[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
- local deselect=()
-
- [[ ${EPYTHON} == pypy3 ]] && deselect+=(
- _test/test_deprecation.py::test_collections_deprecation
- )
-
- epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
- distutils-r1_python_install --single-version-externally-managed
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.8.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.8.ebuild
deleted file mode 100644
index f1cb20246e0..00000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
- https://pypi.org/project/ruamel.yaml/
- https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- dev-python/namespace-ruamel[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
- local deselect=()
-
- [[ ${EPYTHON} == pypy3 ]] && deselect+=(
- _test/test_deprecation.py::test_collections_deprecation
- )
-
- epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
- distutils-r1_python_install --single-version-externally-managed
- find "${ED}" -name '*.pth' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-03 6:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-03 6:21 [gentoo-commits] repo/gentoo:master commit in: dev-python/ruamel-yaml/, dev-python/ruamel-yaml/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-03-11 16:16 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox