From 16466880b632580a9f9119b06be1447287dc586c Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sat, 13 Feb 2021 18:17:25 +0000 Subject: Adding metadata --- .../GridDataFormats-0.4.0-r1.ebuild | 22 ---- dev-python/GridDataFormats/Manifest | 1 - dev-python/boto3/Manifest | 1 + dev-python/boto3/boto3-1.17.7.ebuild | 56 ++++++++++ dev-python/botocore/Manifest | 1 + dev-python/botocore/botocore-1.20.7.ebuild | 59 ++++++++++ dev-python/cftime/Manifest | 2 - dev-python/cftime/cftime-1.3.0.ebuild | 29 ----- dev-python/cftime/cftime-1.4.0.ebuild | 28 ----- dev-python/construct/Manifest | 1 + dev-python/construct/construct-2.10.60.ebuild | 38 +++++++ .../manuel/files/manuel-1.8.0-rm_zope_test.patch | 120 --------------------- dev-python/pgspecial/Manifest | 1 + dev-python/pgspecial/pgspecial-1.12.1.ebuild | 25 +++++ dev-python/plotly/Manifest | 2 - dev-python/plotly/plotly-1.9.6.ebuild | 25 ----- dev-python/plotly/plotly-4.10.0.ebuild | 29 ----- .../files/psycopg-2.8.3-avoid-mxdatetime.patch | 24 ----- dev-python/theano-pymc/Manifest | 3 - dev-python/theano-pymc/theano-pymc-1.0.14.ebuild | 42 -------- dev-python/theano-pymc/theano-pymc-1.0.15.ebuild | 60 ----------- dev-python/theano-pymc/theano-pymc-1.1.1.ebuild | 61 ----------- dev-python/transitions/Manifest | 1 + dev-python/transitions/transitions-0.8.7.ebuild | 41 +++++++ dev-python/ubelt/Manifest | 1 - dev-python/ubelt/ubelt-0.9.4.ebuild | 33 ------ .../widgetsnbextension-3.5.1.ebuild | 21 ---- dev-python/xdoctest/Manifest | 3 - dev-python/xdoctest/xdoctest-0.15.0.ebuild | 40 ------- dev-python/xdoctest/xdoctest-0.15.2.ebuild | 35 ------ dev-python/xdoctest/xdoctest-0.15.3.ebuild | 37 ------- 31 files changed, 224 insertions(+), 618 deletions(-) delete mode 100644 dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild create mode 100644 dev-python/boto3/boto3-1.17.7.ebuild create mode 100644 dev-python/botocore/botocore-1.20.7.ebuild delete mode 100644 dev-python/cftime/cftime-1.3.0.ebuild delete mode 100644 dev-python/cftime/cftime-1.4.0.ebuild create mode 100644 dev-python/construct/construct-2.10.60.ebuild delete mode 100644 dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch create mode 100644 dev-python/pgspecial/pgspecial-1.12.1.ebuild delete mode 100644 dev-python/plotly/plotly-1.9.6.ebuild delete mode 100644 dev-python/plotly/plotly-4.10.0.ebuild delete mode 100644 dev-python/psycopg/files/psycopg-2.8.3-avoid-mxdatetime.patch delete mode 100644 dev-python/theano-pymc/theano-pymc-1.0.14.ebuild delete mode 100644 dev-python/theano-pymc/theano-pymc-1.0.15.ebuild delete mode 100644 dev-python/theano-pymc/theano-pymc-1.1.1.ebuild create mode 100644 dev-python/transitions/transitions-0.8.7.ebuild delete mode 100644 dev-python/ubelt/ubelt-0.9.4.ebuild delete mode 100644 dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild delete mode 100644 dev-python/xdoctest/xdoctest-0.15.0.ebuild delete mode 100644 dev-python/xdoctest/xdoctest-0.15.2.ebuild delete mode 100644 dev-python/xdoctest/xdoctest-0.15.3.ebuild (limited to 'dev-python') diff --git a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild deleted file mode 100644 index 6154f1ea02c7..000000000000 --- a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit distutils-r1 - -DESCRIPTION="Reading and writing of data on regular grids in Python" -HOMEPAGE="https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="LGPL-3" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND=" - >=dev-python/numpy-1.0.3[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}]" diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest index f6520d47367d..07d189b3c879 100644 --- a/dev-python/GridDataFormats/Manifest +++ b/dev-python/GridDataFormats/Manifest @@ -1,2 +1 @@ -DIST GridDataFormats-0.4.0.tar.gz 63643 BLAKE2B cbc0bc259c30c9eccf61b11a7ed6e8004979fe2adb2b049f137caddbb71190291011664462c2c1aa4fe2baf822102d59d3079e9e48620b76d37a4812ca150328 SHA512 b480293e2dd17cb484336aa1469a8f0e739fbe7d925190f6a6502e96d0ab26a36271b0a0676c711716abd3e025e86fbec961cf965e950f89be167e0a83ef904c DIST GridDataFormats-0.5.0.tar.gz 1982315 BLAKE2B b230fd2843ab6a5826ee425fb3fad9a0d5d75a292aa3b6b150e76fa515b68000efb8e1b4140619c0c489f34ac7e3ce6d979e97526c212caf3e808be07b33afcd SHA512 9cae1fe0f4f27bd966c1563831f8a9257ecbe14a7a6f011753355070449515b9b0ad1f31867c2c199c9703aebd5a3b40a03c1276f3bb6ff51447f7a870fdefe8 diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index a16ddf895f1b..91535222551c 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -12,3 +12,4 @@ DIST boto3-1.17.3.tar.gz 346250 BLAKE2B 7edf59a88ec32a08056112c088de9aae903daba9 DIST boto3-1.17.4.tar.gz 346342 BLAKE2B 3fba8f8b68edb268f20919bb65c5f8715d6c89c54884395f8080384c2d07ada15894d605a943e2c167ddf7fd3550657367e4b195caf28fd73609763cf23da687 SHA512 45ecf4fe0eb61d09aea5cc5e741544c6b23d6b98de24ab9f646f28d463104ec11116d0afd4b5fbd09f55e1a7ad65a653770efb67d4b023590c218bef4f326af1 DIST boto3-1.17.5.tar.gz 346437 BLAKE2B 43cec95e82c2f4b78132966aebb3fb1b8e8e01929731e0a9aace2a281a86fb789ec940a62b13c2c8f82e03d7c2a7c89b3b919aa39be85e6d14e1459782b90ef8 SHA512 bd3dde9acd33371eaee9715c4d5dfa095f6571f728213992455864da15a8f49053991babe4cc57bb808bc7733101b50baeab6ed6a6e58fc04f25a4eee00b774a DIST boto3-1.17.6.tar.gz 346445 BLAKE2B 778dd820ab134a0c9bc0e67e692e8e1200f84335895a5ed3150eda53ac90dadef09f44c18c2a80858e2c37617c315ff411efec8f1008b8c21179ff519fc4bf9f SHA512 0cca89bd4bfbda7039262ce570c4235bd2ae33e46972026e5f6f66ae42cee9562d23854c3ea23e0fb9b472fc2a28cdabfbb740ae1f0db306c6342cea3c077e82 +DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993 diff --git a/dev-python/boto3/boto3-1.17.7.ebuild b/dev-python/boto3/boto3-1.17.7.ebuild new file mode 100644 index 000000000000..2df16964cdb0 --- /dev/null +++ b/dev-python/boto3/boto3-1.17.7.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=bdepend +inherit distutils-r1 + +DESCRIPTION="The AWS SDK for Python" +HOMEPAGE="https://github.com/boto/boto3" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/boto3" + inherit git-r3 + BOTOCORE_PV=${PV} +else + SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + + # botocore is x.(y+3).z + BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)" +fi + +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +python_prepare_all() { + # don't lock versions to narrow ranges + sed -e '/botocore/ d' \ + -e '/jmespath/ d' \ + -e '/s3transfer/ d' \ + -i setup.py || die + + # prevent an infinite loop + rm tests/functional/docs/test_smoke.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}" +} diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index 70da480a3ec5..0fc2094b7852 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -12,3 +12,4 @@ DIST botocore-1.20.3.tar.gz 7446281 BLAKE2B 536cbe8f6b6c150f3c66468f3e0c51ae0e60 DIST botocore-1.20.4.tar.gz 7447611 BLAKE2B 05cb501cf40748ac1053c4687bd6de7a17d9ac31fe688de8d6aaf8047260f230ea14cc947c4c208a11d26477508b38428fdca116b9fa8212c5ee6ac020a6367f SHA512 b3ec1597b1cf4e9d18e21216f9ba703e4ae0a924653d21cfd93eeffbb13041ad96c3cd099ff1c8631bdcd5c7d6a70e6d36848fdbc44de9f7cebf7ee223918743 DIST botocore-1.20.5.tar.gz 7447859 BLAKE2B 56b6ecbec1834c414983679e4f3cd01f295c48c87bc972ccec77fe972b88a1785ef82c403576f6aa96ebe9041a29535566280228f8b5a5e35d2e4fdb14cac472 SHA512 488584be3ea9b8a7467384a3947349704d0bf0e6817936a70fda69bc8d682d88601188446d50eeae29b4f0680e8f20d717519011d6beecd3f35cb322fb526853 DIST botocore-1.20.6.tar.gz 7450975 BLAKE2B 56ad69b958233a94f6bacff28bffb644bde8cc87dcb8d842f542059548d2aaf5762666077f9b429bc0487808282b806725a05dcd3def6c975f4418f209fc2ec8 SHA512 558c3c3b123aeeeb5aff420e7ff3edbba9165e1cf434f8136ead21e9d94dd85d857732902b10e09386ddc80754d7be37970573ce039296e532b593a101a97950 +DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df diff --git a/dev-python/botocore/botocore-1.20.7.ebuild b/dev-python/botocore/botocore-1.20.7.ebuild new file mode 100644 index 000000000000..9d681f87244c --- /dev/null +++ b/dev-python/botocore/botocore-1.20.7.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="Low-level, data-driven core of boto 3" +HOMEPAGE="https://github.com/boto/botocore" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/botocore" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" +) + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +src_prepare() { + # unpin deps + sed -i -e "s:>=.*':':" setup.py || die + # very unstable + sed -i -e 's:test_stress_test_token_bucket:_&:' \ + tests/functional/retries/test_bucket.py || die + distutils-r1_src_prepare +} + +python_test() { + # note: suites need to be run separately as one of the unit tests + # seems to be leaking mocks and breaking a few functional tests + nosetests -v tests/unit || + die "unit tests failed under ${EPYTHON}" + nosetests -v tests/functional || + die "functional tests failed under ${EPYTHON}" +} diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest index f8c0e0b9fe5a..f91546f042dd 100644 --- a/dev-python/cftime/Manifest +++ b/dev-python/cftime/Manifest @@ -1,3 +1 @@ -DIST cftime-1.3.0.tar.gz 55668 BLAKE2B c233a3d45305476f422ca93f89348b7b3c018b10c0fa42d6649001b7bcdb4d26d230322108def41818449ec78dc531261b52d09252306fb5889ac4011af33828 SHA512 07f79e902142e8a314c9d09af08ea752454e490c3027ee44853f78c725305bf11cad90bd331edd204defded11e7f29173df9bef70ab805a28b745cc0afdd4685 -DIST cftime-1.4.0.tar.gz 46098 BLAKE2B b1ca1eaec2b0b5015d6d8d512ae831bfb36c59061c094f5eaf5931f85ecabdb1b562d1ab56cb1b0b0fcea36fce15d073411fd9afd955ec864a4ca9a71f0a6a82 SHA512 72862d35cbe32eefb1149b345e63fabf1a58bdb145138ea82fb21aa8b4862abae53a2c7719b8cf56670acdcfa9c7bb090cb35f8c2ea711e23bfb031f72ccdc2f DIST cftime-1.4.1.tar.gz 46721 BLAKE2B 903f8c042b6f4738893ee54c9d1b862f6f29b42c67b45800d21e1215979c95d985d56eb234dd52493da331c30b2b55c5c1590b51822bb87eaada7dd2879c57b1 SHA512 2d07b8f423e9945b1ced2e89f03965df5c3b25f932b0e7ce893a6cbd4568c93f0abb1d8e6efebe2cafca2ee19259f3c0878fec4fb91f68bf5dde1ccb67bcdef9 diff --git a/dev-python/cftime/cftime-1.3.0.ebuild b/dev-python/cftime/cftime-1.3.0.ebuild deleted file mode 100644 index 62d7c828fe0e..000000000000 --- a/dev-python/cftime/cftime-1.3.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit distutils-r1 - -DESCRIPTION="Time-handling functionality from netcdf4-python" -HOMEPAGE="https://pypi.org/project/cftime" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-python/numpy[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" -BDEPEND="dev-python/cython[${PYTHON_USEDEP}]" - -distutils_enable_tests pytest - -python_prepare_all() { - # remove pytest-cov dep - sed -i -e "/--cov/d" setup.cfg || die - - distutils-r1_python_prepare_all -} diff --git a/dev-python/cftime/cftime-1.4.0.ebuild b/dev-python/cftime/cftime-1.4.0.ebuild deleted file mode 100644 index 5240371abd71..000000000000 --- a/dev-python/cftime/cftime-1.4.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit distutils-r1 - -DESCRIPTION="Time-handling functionality from netcdf4-python" -HOMEPAGE="https://pypi.org/project/cftime" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-python/numpy[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" -BDEPEND="dev-python/cython[${PYTHON_USEDEP}]" - -distutils_enable_tests pytest - -python_prepare_all() { - # remove pytest-cov dep - sed -i -e "/--cov/d" setup.cfg || die - - distutils-r1_python_prepare_all -} diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest index 9c30ad8519e0..6865c7ba1926 100644 --- a/dev-python/construct/Manifest +++ b/dev-python/construct/Manifest @@ -2,3 +2,4 @@ DIST construct-2.10.56.tar.gz 1184110 BLAKE2B 01ce1800970826ae3584a9733de171e04d DIST construct-2.10.57.tar.gz 1184585 BLAKE2B abaeebf5872cc97cc67d47cf79370fecdb1abafb62fa80b6acfa63de9087f70fa67fd69e90ab4e78e7ac179c1bb1011529e34201c3c2270e1a2651c97cc678b2 SHA512 ef2f0bbcf4cbcf4862033b16ccb428f84d63ca5c867157b47e38b441cb439c953b543cf69f352c0542525fd07b37d1b3b68910ae5331c482e75b4af937e116a1 DIST construct-2.10.58.tar.gz 1184881 BLAKE2B d1dfa005542505b0a154f3c0ae74a1708747b1e7b9f5dc650b924169fa54620719bdf5bb868e616ae58e8890f547eaf3bad5b02ef1f7f7ffeeadffaa87413041 SHA512 8547847e3fa15c020ab7d178b229c5b93744b48497c4cf809a93527be5776eacd52783a0fa38583d694c262c119835c989fcbe0936eb247ca844d252c4bdebb5 DIST construct-2.10.59.tar.gz 1185999 BLAKE2B 35c861d5d4f5d68a158f25cffccda76621e0fe901e5f8bdf9c0aea61e3ddd2174c71767601be3533092a6a28748597cd1a044e4721436748b9a2dac81b81b41b SHA512 bf5867efdb9e1a27ddede6844f5f3466714e38dd97aae09c6990582989801605eebf90099fb3a0ab78deaed4f3b6be38421b635f6332461efd033d5fb8c2c1af +DIST construct-2.10.60.tar.gz 1185983 BLAKE2B e263c15db9d8055db854508f767906e51fb260c47e2df17e2786277a3ed66e9a8599f21299b21d0629997c6ce2afd7651e18aee4c7f22d3e38bdc5db5bd53bd4 SHA512 597e4fd9f0264450fe221e100041a897d25794bea4dd5cbf5f58df8a0829a34490daff10764e6329ade165df631ddce661dceae4417d8f55472b2fad2a53e53d diff --git a/dev-python/construct/construct-2.10.60.ebuild b/dev-python/construct/construct-2.10.60.ebuild new file mode 100644 index 000000000000..6412b720ac1f --- /dev/null +++ b/dev-python/construct/construct-2.10.60.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="A powerful declarative parser for binary data" +HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/" +SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND=" + test? ( + dev-python/arrow[${PYTHON_USEDEP}] + dev-python/cloudpickle[${PYTHON_USEDEP}] + dev-python/lz4[${PYTHON_USEDEP}] + >=dev-python/numpy-1.15.4[${PYTHON_USEDEP}] + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + rm tests/test_benchmarks.py || die +} + +pkg_postinst() { + ewarn "Version 2.10.x has significant API and implementation changes from" + ewarn "previous 2.9.x releases. Please read the documentation at" + ewarn "https://construct.readthedocs.io/en/latest/transition210.html" + ewarn "for more info." +} 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 `_ - 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"