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

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

[Michał Górny]

commit:     69837b616e805bf80b5917b776d2beb8637fb217
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 11:24:08 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 11:24:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69837b61

dev-python/automat: Remove old

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

 dev-python/automat/automat-20.2.0.ebuild           | 62 ----------------------
 .../automat-0.8.0-no-setup-py-m2r-import.patch     | 27 ----------
 2 files changed, 89 deletions(-)

diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
deleted file mode 100644
index b4084934543a..000000000000
--- a/dev-python/automat/automat-20.2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_PN="A${PN:1}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/automat-0.8.0-no-setup-py-m2r-import.patch"
-	"${FILESDIR}/test_visualize-twisted-import-errors.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test ; then
-		# Remove since this is upstream benchmarking tests
-		rm -r benchmark || die "FAILED to remove benchmark tests"
-	fi
-
-	# avoid a setuptools_scm dependency
-	sed -r -i "s:use_scm_version=True:version='${PV}': ;
-		s:[\"']setuptools[_-]scm[\"'](,|)::" setup.py || die
-	# strip m2r dep
-	sed -i -e "/'m2r'/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc docs/examples/*.py
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo "For additional visualization functionality install both these optional dependencies"
-	einfo "    >=dev-python/twisted-16.1.1"
-	einfo "    media-gfx/graphviz[python]"
-}

diff --git a/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch b/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch
deleted file mode 100644
index 161b219626da..000000000000
--- a/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/setup.py b/setup.py
-index d0dec04..7a85a6e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -4,14 +4,6 @@ Setup file for automat
- 
- from setuptools import setup, find_packages
- 
--try:
--    from m2r import parse_from_file
--    long_description = parse_from_file('README.md')
--except(IOError, ImportError):
--    print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n")
--    import io
--    long_description = io.open('README.md', encoding="utf-8").read()
--
- setup(
-     name='Automat',
-     use_scm_version=True,
-@@ -19,7 +11,6 @@ setup(
-     description="""
-     Self-service finite-state machines for the programmer on the go.
-     """.strip(),
--    long_description=long_description,
-     packages=find_packages(exclude=[]),
-     package_dir={'automat': 'automat'},
-     setup_requires=[

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

[Sam James]

commit:     5f2a7ebaa5c68a594443750b31d53a6764d06699
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 19:20:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 19:20:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f2a7eba

dev-python/automat: patch out m2r usage

This avoids the hard blocker with m2r (which is now last-rited) which
makes upgrades a lot smoother (no need for manual intervention).

Bug: https://bugs.gentoo.org/847532
Bug: https://bugs.gentoo.org/848900
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/automat/automat-20.2.0-r1.ebuild        |  2 +-
 .../automat/files/automat-20.2.0-ignore-m2r.patch  | 25 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/dev-python/automat/automat-20.2.0-r1.ebuild b/dev-python/automat/automat-20.2.0-r1.ebuild
index f2407e0572a0..b80987fef5ec 100644
--- a/dev-python/automat/automat-20.2.0-r1.ebuild
+++ b/dev-python/automat/automat-20.2.0-r1.ebuild
@@ -25,12 +25,12 @@ RDEPEND="
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	!!dev-python/m2r
 "
 
 PATCHES=(
 	"${FILESDIR}/test_visualize-twisted-import-errors.patch"
 	"${FILESDIR}/${P}-py311.patch"
+	"${FILESDIR}/${PN}-20.2.0-ignore-m2r.patch"
 )
 
 distutils_enable_tests pytest

diff --git a/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch b/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch
new file mode 100644
index 000000000000..5e3ef39f33e1
--- /dev/null
+++ b/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch
@@ -0,0 +1,25 @@
+Completely ignore m2r (which is now last-rited) so we can drop the hard-blocker
+which makes world upgrades a pain (installed m2r would break b/c of newer
+mistune, and would break automat build).
+
+https://github.com/miyakogi/m2r/issues/66
+https://bugs.gentoo.org/848900
+https://bugs.gentoo.org/847532
+--- a/setup.py
++++ b/setup.py
+@@ -4,13 +4,8 @@ Setup file for automat
+ 
+ from setuptools import setup, find_packages
+ 
+-try:
+-    from m2r import parse_from_file
+-    long_description = parse_from_file('README.md')
+-except(IOError, ImportError):
+-    print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n")
+-    import io
+-    long_description = io.open('README.md', encoding="utf-8").read()
++import io
++long_description = io.open('README.md', encoding="utf-8").read()
+ 
+ setup(
+     name='Automat',