[Python-modules-commits] r30650 - in packages/python-eventlet/trunk/debian (9 files)
zigo at users.alioth.debian.org
zigo at users.alioth.debian.org
Tue Sep 16 06:30:28 UTC 2014
Date: Tuesday, September 16, 2014 @ 06:30:27
Author: zigo
Revision: 30650
* Team upload.
* Added myself as uploader.
* New upstream release (Closes: #718036).
* Uploading to experimental just before the freeze.
* Simplified sphinx-build doc building process.
* Refreshed patches.
* Using a quilt patch to "unvendorize" mock.py, instead of using
debian/rules hacks.
* Using extend-diff-ignore to ignore egg-info changes instead of debian/rules
hacks. This makes it easier to produce quilt patches.
* Ran wrap-and-sort.
* Removed now useless X-Python-Version: >= 2.6.
* Standards-Version is now 3.9.5.
Added:
packages/python-eventlet/trunk/debian/patches/use-packaged-python-mock-rather-than-embedded.patch
packages/python-eventlet/trunk/debian/source/options
Modified:
packages/python-eventlet/trunk/debian/changelog
packages/python-eventlet/trunk/debian/control
packages/python-eventlet/trunk/debian/docs
packages/python-eventlet/trunk/debian/patches/remove-self.assert-in-tests.patcher_test.py.patch
packages/python-eventlet/trunk/debian/patches/series
packages/python-eventlet/trunk/debian/patches/skip-failing-tests.patch
packages/python-eventlet/trunk/debian/rules
Modified: packages/python-eventlet/trunk/debian/changelog
===================================================================
--- packages/python-eventlet/trunk/debian/changelog 2014-09-16 06:23:10 UTC (rev 30649)
+++ packages/python-eventlet/trunk/debian/changelog 2014-09-16 06:30:27 UTC (rev 30650)
@@ -1,3 +1,21 @@
+python-eventlet (0.15.2-1) experimental; urgency=medium
+
+ * Team upload.
+ * Added myself as uploader.
+ * New upstream release (Closes: #718036).
+ * Uploading to experimental just before the freeze.
+ * Simplified sphinx-build doc building process.
+ * Refreshed patches.
+ * Using a quilt patch to "unvendorize" mock.py, instead of using
+ debian/rules hacks.
+ * Using extend-diff-ignore to ignore egg-info changes instead of debian/rules
+ hacks. This makes it easier to produce quilt patches.
+ * Ran wrap-and-sort.
+ * Removed now useless X-Python-Version: >= 2.6.
+ * Standards-Version is now 3.9.5.
+
+ -- Thomas Goirand <zigo at debian.org> Sun, 07 Sep 2014 14:53:19 +0000
+
python-eventlet (0.13.0-1) unstable; urgency=low
[ Stefano Rivera ]
Modified: packages/python-eventlet/trunk/debian/control
===================================================================
--- packages/python-eventlet/trunk/debian/control 2014-09-16 06:23:10 UTC (rev 30649)
+++ packages/python-eventlet/trunk/debian/control 2014-09-16 06:30:27 UTC (rev 30650)
@@ -2,20 +2,26 @@
Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Laszlo Boszormenyi (GCS) <gcs at debian.hu>
-Build-Depends:
- debhelper (>= 9),
- python-all (>= 2.6.6-3~),
- python-greenlet (>= 0.3.1-2.1),
- python-httplib2,
- python-mock,
- python-nose,
- python-openssl,
- python-setuptools,
- python-sphinx (>= 1.0.7+dfsg),
- python-zmq
-X-Python-Version: >= 2.6
-Standards-Version: 3.9.4
+Uploaders: Laszlo Boszormenyi (GCS) <gcs at debian.hu>, Thomas Goirand <zigo at debian.org>
+Build-Depends: debhelper (>= 9),
+ python-all (>= 2.6.6-3~),
+ python-setuptools,
+ python-sphinx (>= 1.0.7+dfsg),
+# python3-all (>= 3.2),
+# python3-setuptools
+Build-Depends-Indep: python-greenlet (>= 0.3.1-2.1),
+ python-httplib2,
+ python-mock,
+ python-nose,
+ python-openssl,
+ python-zmq,
+# python3-greenlet (>= 0.3.1-2.1),
+# python3-httplib2,
+# python3-mock,
+# python3-nose,
+# python3-openssl,
+# python3-zmq
+Standards-Version: 3.9.5
Homepage: http://eventlet.net
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-eventlet/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-eventlet/trunk/
@@ -23,7 +29,7 @@
Package: python-eventlet
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, ${sphinxdoc:Depends}
-Description: concurrent networking library for Python
+Description: concurrent networking library - Python 2.x
Eventlet allows you to change how you run your code, not how you write it.
.
It uses epoll or libevent for highly scalable non-blocking I/O.
@@ -35,3 +41,42 @@
It's easy to get started using Eventlet, and easy to convert existing
applications to use it. Start off by looking at examples, common design
patterns, and the list of the basic API primitives.
+ .
+ This package provides the Python 2.x module.
+
+#Package: python3-eventlet
+#Architecture: all
+#Depends: ${misc:Depends}, ${python3:Depends}, ${sphinxdoc:Depends}
+#Description: concurrent networking library - Python 3.x
+# Eventlet allows you to change how you run your code, not how you write it.
+# .
+# It uses epoll or libevent for highly scalable non-blocking I/O.
+# Coroutines ensure that the developer uses a blocking style of programming
+# that is similar to threading, but provide the benefits of non-blocking I/O.
+# The event dispatch is implicit, which means you can easily use Eventlet from
+# the Python interpreter, or as a small part of a larger application.
+# .
+# It's easy to get started using Eventlet, and easy to convert existing
+# applications to use it. Start off by looking at examples, common design
+# patterns, and the list of the basic API primitives.
+# .
+# This package provides the Python 3.x module.
+#
+#Package: python-eventlet-doc
+#Architecture: all
+#Section: doc
+#Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+#Description: concurrent networking library - doc
+# Eventlet allows you to change how you run your code, not how you write it.
+# .
+# It uses epoll or libevent for highly scalable non-blocking I/O.
+# Coroutines ensure that the developer uses a blocking style of programming
+# that is similar to threading, but provide the benefits of non-blocking I/O.
+# The event dispatch is implicit, which means you can easily use Eventlet from
+# the Python interpreter, or as a small part of a larger application.
+# .
+# It's easy to get started using Eventlet, and easy to convert existing
+# applications to use it. Start off by looking at examples, common design
+# patterns, and the list of the basic API primitives.
+# .
+# This package provides the documentation.
Modified: packages/python-eventlet/trunk/debian/docs
===================================================================
--- packages/python-eventlet/trunk/debian/docs 2014-09-16 06:23:10 UTC (rev 30649)
+++ packages/python-eventlet/trunk/debian/docs 2014-09-16 06:30:27 UTC (rev 30650)
@@ -1,3 +1,2 @@
-README
+README.rst
README.twisted
-doc/_build/html
Modified: packages/python-eventlet/trunk/debian/patches/remove-self.assert-in-tests.patcher_test.py.patch
===================================================================
--- packages/python-eventlet/trunk/debian/patches/remove-self.assert-in-tests.patcher_test.py.patch 2014-09-16 06:23:10 UTC (rev 30649)
+++ packages/python-eventlet/trunk/debian/patches/remove-self.assert-in-tests.patcher_test.py.patch 2014-09-16 06:30:27 UTC (rev 30650)
@@ -1,25 +1,25 @@
Description: Fixes tests in tests.patcher_test.Threading
Author: Thomas Goirand <zigo at debian.org>
Forwarded: no
-Last-Update: 2013-05-11
+Last-Update: 2014-09-07
---- python-eventlet-0.12.0.orig/tests/patcher_test.py
-+++ python-eventlet-0.12.0/tests/patcher_test.py
-@@ -313,7 +313,7 @@ print len(_threading._active)
+--- python-eventlet-0.15.2.orig/tests/patcher_test.py
++++ python-eventlet-0.15.2/tests/patcher_test.py
+@@ -310,7 +310,7 @@ print(len(_threading._active))
self.assertEqual(len(lines), 4, "\n".join(lines))
- self.assert_(lines[0].startswith('<Thread'), lines[0])
+ assert lines[0].startswith('<Thread'), lines[0]
self.assertEqual(lines[1], "1", lines[1])
- self.assertEqual(lines[2], "1", lines[2])
+ #self.assertEqual(lines[2], "1", lines[2])
def test_threading(self):
new_mod = """import eventlet
-@@ -344,7 +344,7 @@ print len(threading._active)
+@@ -341,7 +341,7 @@ print(len(threading._active))
"""
self.write_to_tempfile("newmod", new_mod)
output, lines = self.launch_subprocess('newmod')
- self.assertEqual(len(lines), 3, "\n".join(lines))
+ #self.assertEqual(len(lines), 3, "\n".join(lines))
- self.assert_(lines[0].startswith('<Thread'), lines[0])
+ assert lines[0].startswith('<Thread'), lines[0]
self.assertEqual(lines[1], "1", lines[1])
Modified: packages/python-eventlet/trunk/debian/patches/series
===================================================================
--- packages/python-eventlet/trunk/debian/patches/series 2014-09-16 06:23:10 UTC (rev 30649)
+++ packages/python-eventlet/trunk/debian/patches/series 2014-09-16 06:30:27 UTC (rev 30650)
@@ -1,3 +1,4 @@
skip-failing-tests.patch
remove-self.assert-in-tests.patcher_test.py.patch
fix-FTBFS-on-sphinx-build.patch
+use-packaged-python-mock-rather-than-embedded.patch
Modified: packages/python-eventlet/trunk/debian/patches/skip-failing-tests.patch
===================================================================
--- packages/python-eventlet/trunk/debian/patches/skip-failing-tests.patch 2014-09-16 06:23:10 UTC (rev 30649)
+++ packages/python-eventlet/trunk/debian/patches/skip-failing-tests.patch 2014-09-16 06:30:27 UTC (rev 30650)
@@ -1,7 +1,8 @@
-diff -Naupr eventlet-0.12.1.orig/tests/greenio_test.py eventlet-0.12.1/tests/greenio_test.py
---- eventlet-0.12.1.orig/tests/greenio_test.py 2013-01-24 04:18:17.000000000 -0600
-+++ eventlet-0.12.1/tests/greenio_test.py 2013-02-11 07:58:19.380602680 -0600
-@@ -697,6 +697,7 @@ class TestGreenPipe(LimitedTestCase):
+Index: python-eventlet-0.15.2/tests/greenio_test.py
+===================================================================
+--- python-eventlet-0.15.2.orig/tests/greenio_test.py
++++ python-eventlet-0.15.2/tests/greenio_test.py
+@@ -727,6 +727,7 @@ class TestGreenPipe(LimitedTestCase):
class TestGreenIoLong(LimitedTestCase):
TEST_TIMEOUT = 10 # the test here might take a while depending on the OS
Added: packages/python-eventlet/trunk/debian/patches/use-packaged-python-mock-rather-than-embedded.patch
===================================================================
--- packages/python-eventlet/trunk/debian/patches/use-packaged-python-mock-rather-than-embedded.patch (rev 0)
+++ packages/python-eventlet/trunk/debian/patches/use-packaged-python-mock-rather-than-embedded.patch 2014-09-16 06:30:27 UTC (rev 30650)
@@ -0,0 +1,30 @@
+Description: Use the packaged python-mock package
+ Upstream is "vendorizing" mock. This sux...
+Author: Thomas Goirand <zigo at debian.org>
+Forwarded: no
+Last-Update: 2014-09-07
+
+--- python-eventlet-0.15.2.orig/tests/db_pool_test.py
++++ python-eventlet-0.15.2/tests/db_pool_test.py
+@@ -7,7 +7,8 @@ import os
+ import traceback
+ from unittest import TestCase, main
+
+-from tests import mock, skipped, skip_unless, skip_with_pyevent, get_database_auth
++import mock
++from tests import skipped, skip_unless, skip_with_pyevent, get_database_auth
+ from eventlet import event
+ from eventlet import db_pool
+ from eventlet.support import six
+--- python-eventlet-0.15.2.orig/tests/websocket_test.py
++++ python-eventlet-0.15.2/tests/websocket_test.py
+@@ -9,7 +9,8 @@ from eventlet.green import httplib
+ from eventlet.green import urllib2
+ from eventlet.websocket import WebSocket, WebSocketWSGI
+
+-from tests import mock, LimitedTestCase, certificate_file, private_key_file
++import mock
++from tests import LimitedTestCase, certificate_file, private_key_file
+ from tests import skip_if_no_ssl
+ from tests.wsgi_test import _TestBase
+
Modified: packages/python-eventlet/trunk/debian/rules
===================================================================
--- packages/python-eventlet/trunk/debian/rules 2014-09-16 06:23:10 UTC (rev 30649)
+++ packages/python-eventlet/trunk/debian/rules 2014-09-16 06:30:27 UTC (rev 30650)
@@ -1,23 +1,32 @@
#!/usr/bin/make -f
+PYTHONS:=$(shell pyversions -vr)
+#PYTHON3S:=$(shell py3versions -vr)
+
%:
- dh $@ --with python2,sphinxdoc
+ dh $@ -O--buildsystem=python_distutils --with python2,sphinxdoc
+# dh $@ -O--buildsystem=python_distutils --with python2,python3,sphinxdoc
-override_dh_auto_build:
- /bin/echo -e '# On Debian, we use the packaged mock\n'\
- 'from __future__ import absolute_import\n'\
- 'from mock import *' > tests/mock.py
+override_dh_install:
+ set -e && for pyvers in $(PYTHONS); do \
+ python$$pyvers setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/python-eventlet; \
+ done
+# set -e && for pyvers in $(PYTHON3S); do \
+# python$$pyvers setup.py install --install-layout=deb \
+# --root $(CURDIR)/debian/python3-eventlet; \
+# done
- dh_auto_build
+override_dh_sphinxdoc:
+ #PYTHONPATH=. sphinx-build -N -b html doc/ debian/python-eventlet-doc/usr/share/doc/python-eventlet-doc/html
+ PYTHONPATH=. sphinx-build -N -b html doc/ debian/python-eventlet/usr/share/doc/python-eventlet/html
+ dh_sphinxdoc -O--buildsystem=python_distutils
- rm -rf doc/_build/html
- PYTHONPATH=. sphinx-build -N -bhtml doc/ doc/_build/html
-
override_dh_auto_test:
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
set -e; \
- for python in $(shell pyversions -r); do \
- $$python setup.py test || true; \
+ for i in $(PYTHONS) $(PYTHON3S) ; do \
+ python$$i setup.py test || true; \
done
endif
@@ -25,8 +34,5 @@
dh_compress -X.inv -X.txt
override_dh_clean:
- dh_clean
- rm -rf *.egg-info
- rm -rf doc/_build/html
- rm -f tests/mock.py
+ dh_clean -O--buildsystem=python_distutils
rm -rf build
Added: packages/python-eventlet/trunk/debian/source/options
===================================================================
--- packages/python-eventlet/trunk/debian/source/options (rev 0)
+++ packages/python-eventlet/trunk/debian/source/options 2014-09-16 06:30:27 UTC (rev 30650)
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"
More information about the Python-modules-commits
mailing list