[Pkg-privacy-commits] [txtorcon] 07/08: Python 3 package and doc package
Iain R. Learmonth
irl at moszumanska.debian.org
Sat Sep 16 03:54:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
irl pushed a commit to branch master
in repository txtorcon.
commit 54128f7abae24ec292a74ea9b54c8b34f33cfaf4
Author: Iain R. Learmonth <irl at debian.org>
Date: Sat Sep 16 04:24:21 2017 +0100
Python 3 package and doc package
---
debian/control | 53 ++++++++++++++++++++++++++++++++++++--
debian/python-txtorcon-doc.install | 1 +
debian/python-txtorcon.docs | 1 -
debian/python-txtorcon.examples | 1 -
debian/rules | 24 ++++++++++++-----
5 files changed, 69 insertions(+), 11 deletions(-)
diff --git a/debian/control b/debian/control
index 0c92a7c..4e5575c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,12 +16,18 @@ Build-Depends: debhelper (>= 9),
python-setuptools,
python-sphinx,
python-twisted,
+ python3-all,
+ python3-geoip,
+ python3-mock,
+ python3-repoze.sphinx.autointerface,
+ python3-setuptools,
+ python3-sphinx,
+ python3-twisted,
tor
Standards-Version: 4.1.0
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-privacy/packages/txtorcon.git
Vcs-Git: https://anonscm.debian.org/git/pkg-privacy/packages/txtorcon.git
Homepage: http://github.com/meejah/txtorcon
-X-Python-Version: >= 2.7
Package: python-txtorcon
Architecture: all
@@ -33,7 +39,7 @@ Depends: python-geoip,
${python:Depends}
Suggests: tor
Provides: ${python:Provides}
-Description: Twisted-based asynchronous Tor control protocol implementation
+Description: Twisted-based asynchronous Tor control protocol implementation (Python 2)
txtorcon main feature is to present an asynchronous API to speak the Tor
client protocol in Python. It also provides abstractions to track and get
updates about Tor's state and current configuration (including writing it to
@@ -43,3 +49,46 @@ Description: Twisted-based asynchronous Tor control protocol implementation
Twisted is an event-driven networking engine written in Python and Tor is an
onion-routing network designed to improve people's privacy and anonymity on the
Internet.
+ .
+ This package contains the Python 2 module.
+
+Package: python3-txtorcon
+Architecture: all
+Depends: python3-geoip,
+ python3-ipaddr,
+ python3-twisted,
+ python3-zope.interface,
+ ${misc:Depends},
+ ${python3:Depends}
+Suggests: tor
+Description: Twisted-based asynchronous Tor control protocol implementation (Python 3)
+ txtorcon main feature is to present an asynchronous API to speak the Tor
+ client protocol in Python. It also provides abstractions to track and get
+ updates about Tor's state and current configuration (including writing it to
+ Tor or disk), along with helpers to asynchronously launch slave instances of
+ Tor including Twisted endpoint support.
+ .
+ Twisted is an event-driven networking engine written in Python and Tor is an
+ onion-routing network designed to improve people's privacy and anonymity on the
+ Internet.
+ .
+ This package contains the Python 3 module.
+
+Package: python-txtorcon-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends},
+ ${sphinxdoc:Depends}
+Suggests: tor
+Description: Twisted-based asynchronous Tor control protocol implementation (Documentation)
+ txtorcon main feature is to present an asynchronous API to speak the Tor
+ client protocol in Python. It also provides abstractions to track and get
+ updates about Tor's state and current configuration (including writing it to
+ Tor or disk), along with helpers to asynchronously launch slave instances of
+ Tor including Twisted endpoint support.
+ .
+ Twisted is an event-driven networking engine written in Python and Tor is an
+ onion-routing network designed to improve people's privacy and anonymity on the
+ Internet.
+ .
+ This package contains the common documentation.
diff --git a/debian/python-txtorcon-doc.install b/debian/python-txtorcon-doc.install
new file mode 100644
index 0000000..66301fa
--- /dev/null
+++ b/debian/python-txtorcon-doc.install
@@ -0,0 +1 @@
+docs/_build/html/* /usr/share/doc/python-txtorcon-doc/html
diff --git a/debian/python-txtorcon.docs b/debian/python-txtorcon.docs
deleted file mode 100644
index e54588b..0000000
--- a/debian/python-txtorcon.docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/_build/text
diff --git a/debian/python-txtorcon.examples b/debian/python-txtorcon.examples
deleted file mode 100644
index e39721e..0000000
--- a/debian/python-txtorcon.examples
+++ /dev/null
@@ -1 +0,0 @@
-examples/*
diff --git a/debian/rules b/debian/rules
index 3a69577..8995a62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,36 @@
#!/usr/bin/make -f
+export PYBUILD_NAME=txtorcon
+
%:
- dh $@ --with=python2 --buildsystem=pybuild
+ dh $@ --with=python2,python3,sphinxdoc --buildsystem=pybuild
-override_dh_installdocs:
- cd docs && make text
- dh_installdocs -O--buildsystem=pybuild
+override_dh_auto_build:
+ PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml docs/ docs/_build/html # HTML generator
+ dh_auto_build -O--buildsystem=pybuild
override_dh_auto_install:
dh_auto_install -O--buildsystem=pybuild
mkdir -p debian/python-txtorcon/usr/share/doc/python-txtorcon
+ mkdir -p debian/python3-txtorcon/usr/share/doc/python3-txtorcon
set -e && \
for data_src in README.rst TODO examples; do \
mv debian/python-txtorcon/usr/share/txtorcon/$$data_src \
debian/python-txtorcon/usr/share/doc/python-txtorcon; \
done
+ set -e && \
+ for data_src in README.rst TODO examples; do \
+ mv debian/python3-txtorcon/usr/share/txtorcon/$$data_src \
+ debian/python3-txtorcon/usr/share/doc/python3-txtorcon; \
+ done
+ chmod 644 debian/python-txtorcon/usr/share/doc/python-txtorcon/examples/*.py
+ chmod 644 debian/python3-txtorcon/usr/share/doc/python3-txtorcon/examples/*.py
rm -r debian/python-txtorcon/usr/share/txtorcon
+ rm -r debian/python3-txtorcon/usr/share/txtorcon
override_dh_compress:
dh_compress -Xlaunch_tor_with_simplehttpd.py -O--buildsystem=pybuild
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
- make test
-endif
+ PYTHONPATH=. trial --reporter=text test
+ PYTHONPATH=. trial3 --reporter=text test
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/txtorcon.git
More information about the Pkg-privacy-commits
mailing list