summaryrefslogtreecommitdiff
path: root/dev-python/manuel
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/manuel')
-rw-r--r--dev-python/manuel/Manifest1
-rw-r--r--dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch120
2 files changed, 0 insertions, 121 deletions
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index 353bc7d2dc10..1d77889e36f8 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,4 +1,3 @@
-AUX manuel-1.8.0-rm_zope_test.patch 3693 BLAKE2B 444261de258ddc0a24aa2eaf517385712da421c6a8dc322c45e6bc980a87e10c22b6f10285d1d4352ae3542999d53f2bffc71b833d7bd9181b8708b2fde957cd SHA512 47dbc28c5d66895c764997de7a5c04aefd92de6aac6094f8184de849f906e5a1650e2c483868bf5ce77e7d81893f51410a19d7d38f732b4e0a1e54bb728836e9
DIST manuel-1.10.1.tar.gz 42142 BLAKE2B 91d23d804b3f5a2c6f696a8c7a8701f09ae6e881ac9a1c76004be301ab77f58596d0bdae4b11f484e495ea581d66d55d5bed05f5b36d81951d35923c8bfc163d SHA512 39376852e2ecb8a19b2f565464e53f475577edf68e89b3d267f94374a444714ed38ef63da638a02dcec2df851869d57c0d256dca4b436b37ff36b6b3a822710b
DIST manuel-1.9.0.tar.gz 39640 BLAKE2B 1b699b92816297fee13a65ed2c4fc9ee3683f8e47e7fbf06178c97167ae29cabcedc48edec48b053f725889b39111b3634f0305ac651b5674292d046434fd134 SHA512 519b0fd1bd7ef3414dec69f721a6f1265603d28e3b61681acf46e9fba6fdc66efb6c0a82d814af8348bb7c07c3c4c299ae94ea7d6415436592ac37fccaacf18a
EBUILD manuel-1.10.1.ebuild 613 BLAKE2B d88f3ff621176ed0aa102d853beadd97f7bbbc79e4b3d140d18a7821ac584ce489bfd1aa202e93823ad9180ae03533ad218370f1252e036766f8862bb383fc32 SHA512 081624c14f49755e08900e26d0d4f336bdc7dc39b75ddfb44afe7c717e6d66bce1184eb8cef8ecc39ab5521ac8ea0dceaf93b283b97e6b76a049cc1c90a6ac24
diff --git a/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch b/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch
deleted file mode 100644
index d1b61cc678ab..000000000000
--- a/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch
+++ /dev/null
@@ -1,120 +0,0 @@
- setup.py | 6 ------
- src/manuel/index.txt | 26 ++++++++------------------
- src/manuel/tests.py | 13 +++++++++----
- 3 files changed, 17 insertions(+), 28 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 4561779..b6730c8 100644
---- a/setup.py
-+++ b/setup.py
-@@ -20,8 +20,6 @@ with open('README.rst') as readme:
- with open('CHANGES.rst') as changes:
- long_description = readme.read() + '\n\n' + changes.read()
-
--tests_require = ['zope.testing']
--
- setup(
- name='manuel',
- version='1.8.0',
-@@ -44,10 +42,6 @@ setup(
- 'License :: OSI Approved :: Apache Software License',
- ],
- license='Apache Software License, Version 2.0',
-- extras_require={
-- 'tests': tests_require,
-- },
-- tests_require=tests_require,
- test_suite='manuel.tests.test_suite',
- install_requires=[
- 'setuptools',
-diff --git a/src/manuel/index.txt b/src/manuel/index.txt
-index c1d85f3..a315317 100644
---- a/src/manuel/index.txt
-+++ b/src/manuel/index.txt
-@@ -166,16 +166,16 @@ can pass in your own class to `TestSuite`.
-
- .. code-block:: python
-
-- import os.path
-- import manuel.testing
-+ import os.path
-+ import manuel.testing
-
-- class StripDirsTestCase(manuel.testing.TestCase):
-- def shortDescription(self):
-- return os.path.basename(str(self))
-- suite = manuel.testing.TestSuite(
-- m, path_to_test, TestCase=StripDirsTestCase)
-+ class StripDirsTestCase(manuel.testing.TestCase):
-+ def shortDescription(self):
-+ return os.path.basename(str(self))
-+ suite = manuel.testing.TestSuite(
-+ m, path_to_test, TestCase=StripDirsTestCase)
-
-- >>> list(suite)[0].shortDescription()
-+ list(suite)[0].shortDescription()
- 'bugs.txt'
-
-
-@@ -236,16 +236,6 @@ checkers <http://docs.python.org/library/doctest.html#outputchecker-objects>`_
- smoothes over the differences between CPython's and PyPy's NameError
- messages:
-
--.. code-block:: python
--
-- import re
-- import zope.testing.renormalizing
-- checker = zope.testing.renormalizing.RENormalizing([
-- (re.compile(r"NameError: global name '([a-zA-Z0-9_]+)' is not defined"),
-- r"NameError: name '\1' is not defined"),
-- ])
--
--
- .. reset-globs
- .. _capture:
-
-diff --git a/src/manuel/tests.py b/src/manuel/tests.py
-index 07723a6..b1a3a76 100644
---- a/src/manuel/tests.py
-+++ b/src/manuel/tests.py
-@@ -11,11 +11,12 @@ import manuel.testing
- import os.path
- import re
- import unittest
--import zope.testing.renormalizing
-
- here = os.path.dirname(os.path.abspath(__file__))
-
--checker = zope.testing.renormalizing.RENormalizing([
-+try:
-+ import zope.testing.renormalizing
-+ checker = zope.testing.renormalizing.RENormalizing([
- (re.compile(r"<unittest\.result\.TestResult"), '<unittest.TestResult'),
- # PyPy spells some error messages differently
- (re.compile(r"NameError: global name '([a-zA-Z0-9_]+)' is not defined"),
-@@ -25,7 +26,9 @@ checker = zope.testing.renormalizing.RENormalizing([
- r"<\1 object"),
- (re.compile(r"<SRE_Match object"),
- r"<_sre.SRE_Match object"),
--])
-+ ])
-+except ImportError:
-+ pass
-
-
- def turtle_on_the_bottom_test():
-@@ -59,7 +62,6 @@ def test_suite():
- optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
-
- m = manuel.ignore.Manuel()
-- m += manuel.doctest.Manuel(optionflags=optionflags, checker=checker)
- m += manuel.codeblock.Manuel()
- m += manuel.capture.Manuel()
- m += manuel.testcase.SectionManuel()
-@@ -73,3 +75,6 @@ def test_suite():
- suite,
- doctest.DocTestSuite(),
- ))
-+
-+if __name__ == '__main__':
-+ unittest.TextTestRunner().run(test_suite())