Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/automat/files/
Date: Fri, 17 Mar 2023 12:34:22
Message-Id: 1679056451.aedf9819765ae28dcc80f3f81e0ef8c707be5dba.arthurzam@gentoo
1 commit: aedf9819765ae28dcc80f3f81e0ef8c707be5dba
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Fri Mar 17 12:14:45 2023 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 17 12:34:11 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aedf9819
7
8 dev-python/automat: remove unused patch(es)
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
12
13 .../automat/files/automat-20.2.0-ignore-m2r.patch | 25 -----------
14 .../automat/files/automat-20.2.0-py311.patch | 23 ----------
15 .../test_visualize-twisted-import-errors.patch | 52 ----------------------
16 3 files changed, 100 deletions(-)
17
18 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
19 deleted file mode 100644
20 index 5e3ef39f33e1..000000000000
21 --- a/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch
22 +++ /dev/null
23 @@ -1,25 +0,0 @@
24 -Completely ignore m2r (which is now last-rited) so we can drop the hard-blocker
25 -which makes world upgrades a pain (installed m2r would break b/c of newer
26 -mistune, and would break automat build).
27 -
28 -https://github.com/miyakogi/m2r/issues/66
29 -https://bugs.gentoo.org/848900
30 -https://bugs.gentoo.org/847532
31 ---- a/setup.py
32 -+++ b/setup.py
33 -@@ -4,13 +4,8 @@ Setup file for automat
34 -
35 - from setuptools import setup, find_packages
36 -
37 --try:
38 -- from m2r import parse_from_file
39 -- long_description = parse_from_file('README.md')
40 --except(IOError, ImportError):
41 -- print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n")
42 -- import io
43 -- long_description = io.open('README.md', encoding="utf-8").read()
44 -+import io
45 -+long_description = io.open('README.md', encoding="utf-8").read()
46 -
47 - setup(
48 - name='Automat',
49
50 diff --git a/dev-python/automat/files/automat-20.2.0-py311.patch b/dev-python/automat/files/automat-20.2.0-py311.patch
51 deleted file mode 100644
52 index 14ca69e7235d..000000000000
53 --- a/dev-python/automat/files/automat-20.2.0-py311.patch
54 +++ /dev/null
55 @@ -1,23 +0,0 @@
56 -https://github.com/glyph/automat/commit/d0c2845ead9b8f576042d42134bfb5c63086be39
57 -
58 -diff --git a/automat/_introspection.py b/automat/_introspection.py
59 -index 3f7307d..403cddb 100644
60 ---- a/automat/_introspection.py
61 -+++ b/automat/_introspection.py
62 -@@ -6,6 +6,8 @@
63 -
64 -
65 - def copycode(template, changes):
66 -+ if hasattr(code, "replace"):
67 -+ return template.replace(**{"co_" + k : v for k, v in changes.items()})
68 - names = [
69 - "argcount", "nlocals", "stacksize", "flags", "code", "consts",
70 - "names", "varnames", "filename", "name", "firstlineno", "lnotab",
71 -@@ -23,7 +25,6 @@ def copycode(template, changes):
72 - return code(*values)
73 -
74 -
75 --
76 - def copyfunction(template, funcchanges, codechanges):
77 - names = [
78 - "globals", "name", "defaults", "closure",
79
80 diff --git a/dev-python/automat/files/test_visualize-twisted-import-errors.patch b/dev-python/automat/files/test_visualize-twisted-import-errors.patch
81 deleted file mode 100644
82 index b3d8938cf7de..000000000000
83 --- a/dev-python/automat/files/test_visualize-twisted-import-errors.patch
84 +++ /dev/null
85 @@ -1,52 +0,0 @@
86 -From 9f6312e0c2504c27b72bb228a37ed5ac58776e94 Mon Sep 17 00:00:00 2001
87 -From: Brian Dolbec <dolsen@g.o>
88 -Date: Wed, 10 Jun 2020 07:31:45 -0700
89 -Subject: [PATCH] Fix _test_visualize.py twisted import errors
90 -
91 -When graphviz modules are installed but not twisted, this creates test failures
92 -in _discover.py which hard depends on twisted being installed.
93 -
94 -Signed-off-by: Brian Dolbec <dolsen@g.o>
95 ----
96 - automat/_test/test_visualize.py | 4 ++++
97 - 1 file changed, 4 insertions(+)
98 -
99 -diff --git a/automat/_test/test_visualize.py b/automat/_test/test_visualize.py
100 -index 987eb3c..142c4bf 100644
101 ---- a/automat/_test/test_visualize.py
102 -+++ b/automat/_test/test_visualize.py
103 -@@ -62,6 +62,7 @@ def sampleMachine():
104 -
105 -
106 - @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
107 -+@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
108 - class ElementMakerTests(TestCase):
109 - """
110 - L{elementMaker} generates HTML representing the specified element.
111 -@@ -134,6 +135,7 @@ def isLeaf(element):
112 -
113 -
114 - @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
115 -+@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
116 - class TableMakerTests(TestCase):
117 - """
118 - Tests that ensure L{tableMaker} generates HTML tables usable as
119 -@@ -214,6 +216,7 @@ class TableMakerTests(TestCase):
120 -
121 - @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
122 - @skipIf(not isGraphvizInstalled(), "Graphviz tools are not installed.")
123 -+@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
124 - class IntegrationTests(TestCase):
125 - """
126 - Tests which make sure Graphviz can understand the output produced by
127 -@@ -232,6 +235,7 @@ class IntegrationTests(TestCase):
128 -
129 -
130 - @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
131 -+@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
132 - class SpotChecks(TestCase):
133 - """
134 - Tests to make sure that the output contains salient features of the machine
135 ---
136 -libgit2 0.99.0
137 -