diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-python/txtorcon | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-python/txtorcon')
7 files changed, 350 insertions, 0 deletions
diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest new file mode 100644 index 000000000000..5b8d9d681cef --- /dev/null +++ b/dev-python/txtorcon/Manifest @@ -0,0 +1,7 @@ +AUX txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch 6250 BLAKE2B 39ab5468825e1744b43efb394eff42b35e2dd95b4a10dd5879fc46ca63b1e228685505aeb9cdc17af60d82305152b9cb2924215611f2e2e2dcfb978032417981 SHA512 e588ae0bb319ad76e6563cce29524e06ac1a47ed634e62e010663a15e75e0e8e6b4001656dee7110aec0ff3ad75b02ec43fc108155c32108803310b34f2e45dd +AUX txtorcon-0.19.3-Removeinstalldocs.patch 1755 BLAKE2B db819619ede7aec946226cbc5dc1e556c63375068bb3bdc94e5e17d3476f6bbe328fb094f4a48b1484da13b9d3ab8166d81a81d7e947b504c7aba674c3aa2aa1 SHA512 b0b563326eeb05171d58832e96bf7f8420c28b40a1b2916402b174238108f2bbfc95092543fef65af92600b822129ea6d8474d085a26f8db286d7a636405a0e6 +AUX txtorcon-0.19.3-Removeunconditionalexamples.patch 964 BLAKE2B cde8fdc85b3809917fefc21603a4de86119ab54dabad0e1258c8a387c632bd034decf1ea0d6a0a829246cacefd8651b84d1aaf10b55d2e5423d6ded58b92bfbd SHA512 3131dce9b4f3bf15d09ebc87b323c06bdc30a833ab7c6a964f31599d0b21fd5baa0c696af1356db58677c58d803033e786a80db1d46444d92b91a9fee2736cf6 +AUX txtorcon-0.19.3-setup.py-Dontinstallthetests.patch 680 BLAKE2B b26bd4e41d8f3b8b9e795e77475c93bb8f8a1ce138c1fbf83af9d3ece46f031e94e90db35e0aa057594004e80d4413c4853d7b3cd7c41b784ac5a40f6a843d8f SHA512 95894caa6c9e6f3f3a2744a1388397b0ff7298bd508579411ce2cb93ea6f990e6068806ef8d4a9fe959b235ed68402925c731beb9ff9b638a8d6ef2c10709eb8 +DIST txtorcon-0.19.3.tar.gz 265716 BLAKE2B c0778c918689906c1066f714f4c6621f176cc413b0ebbe628201727cb7ae24c8f1b5a8a5a030b5cb48b2cea96e29f2f7bb5a54744e36324a938841b11f44474b SHA512 748e23c25c0b287467e0fa7db6ad69a8af7010957a846141b9360b71af0d279153ff401b85d135e7e66171e81117ebc56406e64e660aeda7dde8cd430d0a7254 +EBUILD txtorcon-0.19.3-r1.ebuild 1932 BLAKE2B a06aa7455beee3523cb4f61ac457672ce71766b8785bd498f8df6fbf22d690fef9fbea344f58eeca62b88de9152374d3fe3b458bd25196601577588d28e2d285 SHA512 c615649e37a879426825fea59f3eb931d9ad65cd5f55ded041adfc42a473a5851cddb4ad57029f787e5da3efc5b2fb9d999a54ec9f9e3d97394788aad380bf83 +MISC metadata.xml 582 BLAKE2B 639a0ba4ae0800bb132268203f31d2b5e4ac5b60e8fe6e3a195a83ce27b1bdbdf15deb567e555ba1f8f80135949424273720333893452afbb44efad24b5c0849 SHA512 daf770953774400a5d78293eac0ed1dd9cb61bc4b208ba1f7e48085bbeff90605faccf44df83c7ee5822cffb1158479e85131a5d1cd513acfad812a8c4b9bf50 diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch new file mode 100644 index 000000000000..f142176dade2 --- /dev/null +++ b/dev-python/txtorcon/files/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch @@ -0,0 +1,147 @@ +From d9f0e2ea76cb54e3647fd16f3be0a8f0224505fd Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <dolsen@gentoo.org> +Date: Tue, 19 Sep 2017 11:59:08 -0700 +Subject: [PATCH] test: Move tests under the txtorcon namespace + +--- + MANIFEST.in | 1 - + {test => txtorcon/test}/__init__.py | 0 + {test => txtorcon/test}/py3_torstate.py | 0 + {test => txtorcon/test}/test_addrmap.py | 0 + {test => txtorcon/test}/test_attacher.py | 0 + {test => txtorcon/test}/test_circuit.py | 0 + {test => txtorcon/test}/test_controller.py | 0 + {test => txtorcon/test}/test_endpoints.py | 0 + {test => txtorcon/test}/test_fsm.py | 0 + {test => txtorcon/test}/test_log.py | 0 + {test => txtorcon/test}/test_microdesc.py | 0 + {test => txtorcon/test}/test_router.py | 0 + {test => txtorcon/test}/test_socks.py | 0 + {test => txtorcon/test}/test_stream.py | 0 + {test => txtorcon/test}/test_torconfig.py | 0 + {test => txtorcon/test}/test_torcontrolprotocol.py | 0 + {test => txtorcon/test}/test_torinfo.py | 0 + {test => txtorcon/test}/test_torstate.py | 0 + {test => txtorcon/test}/test_util.py | 0 + {test => txtorcon/test}/test_util_imports.py | 0 + {test => txtorcon/test}/test_web.py | 0 + {test => txtorcon/test}/util.py | 0 + 22 files changed, 1 deletion(-) + rename {test => txtorcon/test}/__init__.py (100%) + rename {test => txtorcon/test}/py3_torstate.py (100%) + rename {test => txtorcon/test}/test_addrmap.py (100%) + rename {test => txtorcon/test}/test_attacher.py (100%) + rename {test => txtorcon/test}/test_circuit.py (100%) + rename {test => txtorcon/test}/test_controller.py (100%) + rename {test => txtorcon/test}/test_endpoints.py (100%) + rename {test => txtorcon/test}/test_fsm.py (100%) + rename {test => txtorcon/test}/test_log.py (100%) + rename {test => txtorcon/test}/test_microdesc.py (100%) + rename {test => txtorcon/test}/test_router.py (100%) + rename {test => txtorcon/test}/test_socks.py (100%) + rename {test => txtorcon/test}/test_stream.py (100%) + rename {test => txtorcon/test}/test_torconfig.py (100%) + rename {test => txtorcon/test}/test_torcontrolprotocol.py (100%) + rename {test => txtorcon/test}/test_torinfo.py (100%) + rename {test => txtorcon/test}/test_torstate.py (100%) + rename {test => txtorcon/test}/test_util.py (100%) + rename {test => txtorcon/test}/test_util_imports.py (100%) + rename {test => txtorcon/test}/test_web.py (100%) + rename {test => txtorcon/test}/util.py (100%) + +diff --git a/MANIFEST.in b/MANIFEST.in +index 13dc4e2..7b8184a 100644 +--- a/MANIFEST.in ++++ b/MANIFEST.in +@@ -22,4 +22,3 @@ include examples/* + exclude examples/*~ + include requirements.txt + include dev-requirements.txt +-include test/*.py +diff --git a/test/__init__.py b/txtorcon/test/__init__.py +similarity index 100% +rename from test/__init__.py +rename to txtorcon/test/__init__.py +diff --git a/test/py3_torstate.py b/txtorcon/test/py3_torstate.py +similarity index 100% +rename from test/py3_torstate.py +rename to txtorcon/test/py3_torstate.py +diff --git a/test/test_addrmap.py b/txtorcon/test/test_addrmap.py +similarity index 100% +rename from test/test_addrmap.py +rename to txtorcon/test/test_addrmap.py +diff --git a/test/test_attacher.py b/txtorcon/test/test_attacher.py +similarity index 100% +rename from test/test_attacher.py +rename to txtorcon/test/test_attacher.py +diff --git a/test/test_circuit.py b/txtorcon/test/test_circuit.py +similarity index 100% +rename from test/test_circuit.py +rename to txtorcon/test/test_circuit.py +diff --git a/test/test_controller.py b/txtorcon/test/test_controller.py +similarity index 100% +rename from test/test_controller.py +rename to txtorcon/test/test_controller.py +diff --git a/test/test_endpoints.py b/txtorcon/test/test_endpoints.py +similarity index 100% +rename from test/test_endpoints.py +rename to txtorcon/test/test_endpoints.py +diff --git a/test/test_fsm.py b/txtorcon/test/test_fsm.py +similarity index 100% +rename from test/test_fsm.py +rename to txtorcon/test/test_fsm.py +diff --git a/test/test_log.py b/txtorcon/test/test_log.py +similarity index 100% +rename from test/test_log.py +rename to txtorcon/test/test_log.py +diff --git a/test/test_microdesc.py b/txtorcon/test/test_microdesc.py +similarity index 100% +rename from test/test_microdesc.py +rename to txtorcon/test/test_microdesc.py +diff --git a/test/test_router.py b/txtorcon/test/test_router.py +similarity index 100% +rename from test/test_router.py +rename to txtorcon/test/test_router.py +diff --git a/test/test_socks.py b/txtorcon/test/test_socks.py +similarity index 100% +rename from test/test_socks.py +rename to txtorcon/test/test_socks.py +diff --git a/test/test_stream.py b/txtorcon/test/test_stream.py +similarity index 100% +rename from test/test_stream.py +rename to txtorcon/test/test_stream.py +diff --git a/test/test_torconfig.py b/txtorcon/test/test_torconfig.py +similarity index 100% +rename from test/test_torconfig.py +rename to txtorcon/test/test_torconfig.py +diff --git a/test/test_torcontrolprotocol.py b/txtorcon/test/test_torcontrolprotocol.py +similarity index 100% +rename from test/test_torcontrolprotocol.py +rename to txtorcon/test/test_torcontrolprotocol.py +diff --git a/test/test_torinfo.py b/txtorcon/test/test_torinfo.py +similarity index 100% +rename from test/test_torinfo.py +rename to txtorcon/test/test_torinfo.py +diff --git a/test/test_torstate.py b/txtorcon/test/test_torstate.py +similarity index 100% +rename from test/test_torstate.py +rename to txtorcon/test/test_torstate.py +diff --git a/test/test_util.py b/txtorcon/test/test_util.py +similarity index 100% +rename from test/test_util.py +rename to txtorcon/test/test_util.py +diff --git a/test/test_util_imports.py b/txtorcon/test/test_util_imports.py +similarity index 100% +rename from test/test_util_imports.py +rename to txtorcon/test/test_util_imports.py +diff --git a/test/test_web.py b/txtorcon/test/test_web.py +similarity index 100% +rename from test/test_web.py +rename to txtorcon/test/test_web.py +diff --git a/test/util.py b/txtorcon/test/util.py +similarity index 100% +rename from test/util.py +rename to txtorcon/test/util.py +-- +2.14.1 + diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-Removeinstalldocs.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-Removeinstalldocs.patch new file mode 100644 index 000000000000..0731132e4f80 --- /dev/null +++ b/dev-python/txtorcon/files/txtorcon-0.19.3-Removeinstalldocs.patch @@ -0,0 +1,53 @@ +From c2ddddde8570793f646c96038afc97fef4a809c0 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <dolsen@gentoo.org> +Date: Tue, 19 Sep 2017 15:12:43 -0700 +Subject: [PATCH] setup.py: Remove remaining docs from data_files install + +These are better handled by distro package managers, don't belong on production installs. +Please make these conditionally installed instead. Preferrably optionally add a build_docs +extension to install the built sphinx docs if that option was passed to setup.py. +--- + setup.py | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/setup.py b/setup.py +index 3020112..a9f3993 100644 +--- a/setup.py ++++ b/setup.py +@@ -26,10 +26,6 @@ description = ''' + https://github.com/meejah/txtorcon + ''' + +-sphinx_rst_files = [x for x in listdir('docs') if x[-3:] == 'rst'] +-sphinx_docs = [join('docs', x) for x in sphinx_rst_files] +-sphinx_docs += [join('docs/_static', x) for x in listdir('docs/_static')] +- + setup( + name='txtorcon', + version=__version__, +@@ -66,22 +62,4 @@ setup( + "txtorcon", + "twisted.plugins", + ], +- +- # I'm a little unclear if I'm doing this "properly", especially +- # the documentation etc. Do we really want "share/txtorcon" for +- # the first member of the tuple? Why does it seem I need to +- # duplicate this in MANIFEST.in? +- +- data_files=[ +- ('share/txtorcon', ['INSTALL', 'README.rst', 'TODO', 'meejah.asc']), +- +- # this includes the Sphinx source for the +- # docs. The "map+filter" construct grabs all .rst +- # files and re-maps the path +- ('share/txtorcon', [ +- 'docs/apilinks_sphinxext.py', +- 'docs/conf.py', +- 'docs/Makefile', +- ] + sphinx_docs), +- ], + ) +-- +2.14.1 + diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-Removeunconditionalexamples.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-Removeunconditionalexamples.patch new file mode 100644 index 000000000000..0cc50141ed28 --- /dev/null +++ b/dev-python/txtorcon/files/txtorcon-0.19.3-Removeunconditionalexamples.patch @@ -0,0 +1,34 @@ +From 3e7f764b18b1f630a23e71db9ca8f7c2e6e8210b Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <dolsen@gentoo.org> +Date: Tue, 19 Sep 2017 15:06:28 -0700 +Subject: [PATCH] setup.py: Remove unconditional examples from data files + install + +--- + setup.py | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/setup.py b/setup.py +index d5f8016..3020112 100644 +--- a/setup.py ++++ b/setup.py +@@ -29,7 +29,6 @@ description = ''' + sphinx_rst_files = [x for x in listdir('docs') if x[-3:] == 'rst'] + sphinx_docs = [join('docs', x) for x in sphinx_rst_files] + sphinx_docs += [join('docs/_static', x) for x in listdir('docs/_static')] +-examples = [x for x in listdir('examples') if x[-3:] == '.py'] + + setup( + name='txtorcon', +@@ -84,8 +83,5 @@ setup( + 'docs/conf.py', + 'docs/Makefile', + ] + sphinx_docs), +- +- # include all the examples +- ('share/txtorcon/examples', [join('examples', x) for x in examples]) + ], + ) +-- +2.14.1 + diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch new file mode 100644 index 000000000000..0cf86fe74fbc --- /dev/null +++ b/dev-python/txtorcon/files/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch @@ -0,0 +1,26 @@ +From f407d11f3d4951c301fd47df211f0d93d107b8d1 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <dolsen@gentoo.org> +Date: Tue, 19 Sep 2017 11:49:14 -0700 +Subject: [PATCH] setup.py: Don't install the tests + +This was installing the tests to its own namespace, not under the txtorcon namespace. +If you want the tests installed, then move them under the txtorcon namespace. +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 38c6421..d5f8016 100644 +--- a/setup.py ++++ b/setup.py +@@ -64,7 +64,6 @@ setup( + url=__url__, + license=__license__, + packages=[ +- "test", + "txtorcon", + "twisted.plugins", + ], +-- +2.14.1 + diff --git a/dev-python/txtorcon/metadata.xml b/dev-python/txtorcon/metadata.xml new file mode 100644 index 000000000000..4767722d6e91 --- /dev/null +++ b/dev-python/txtorcon/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>dolsen@gentoo.org</email> + </maintainer> + <upstream> + <maintainer> + <email>meejah@meejah.ca</email> + <name>meejah</name> + </maintainer> + <remote-id type="pypi">txtorcon</remote-id> + <remote-id type="github">meejah/txtorcon</remote-id> + </upstream> + <longdescription> + txtorcon is an implementation of the control-spec for Tor using the + Twisted networking library for Python. + </longdescription> +</pkgmetadata> diff --git a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild new file mode 100644 index 000000000000..fe3c461f25a4 --- /dev/null +++ b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit distutils-r1 + +DESCRIPTION="Twisted-based Tor controller client, with state-tracking and config abstractions" +HOMEPAGE="https://github.com/meejah/txtorcon https://pypi.org/project/txtorcon/ https://txtorcon.readthedocs.org" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc examples test" + +RDEPEND=" + dev-python/automat[${PYTHON_USEDEP}] + dev-python/incremental[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' python2_7) + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/twisted-16.0.0[${PYTHON_USEDEP},crypt] + >=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}] + doc? ( + dev-python/automat[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' python2_7) + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/repoze-sphinx-autointerface[${PYTHON_USEDEP}] + >=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-python/mock[${PYTHON_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch" + "${FILESDIR}/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch" + "${FILESDIR}/txtorcon-0.19.3-Removeunconditionalexamples.patch" + "${FILESDIR}/txtorcon-0.19.3-Removeinstalldocs.patch" +) + +python_prepare_all() { + sed -e "s/^ipaddress.*//" -i requirements.txt || die + + distutils-r1_python_prepare_all +} +python_test() { + pushd "${TEST_DIR}" > /dev/null || die + /usr/bin/trial txtorcon || die "Tests failed with ${EPYTHON}" + popd > /dev/null || die +} + +python_compile_all() { + use doc && emake -C "${S}/docs" html +} + +python_install_all() { + use doc && dohtml -r "${S}/docs/_build/html/"* + use examples && dodoc -r "${S}/examples/" + distutils-r1_python_install_all +} |