Commit Graph

29 Commits

Author SHA1 Message Date
Ask Solem d80d4cd587 Merge branch 'master' into 2.0-devel
Conflicts:
	AUTHORS
	kombu/connection.py
	kombu/tests/test_connection.py
	kombu/utils/encoding.py
2011-11-08 17:14:16 +00:00
Ask Solem 25fb0c7e05 Py3k passing 2011-10-29 00:08:49 +01:00
Ask Solem bb87a616f2 Merge branch 'master' into 2.0-devel
Conflicts:
	AUTHORS
	examples/simple_task_queue/client.py
	examples/simple_task_queue/worker.py
	kombu/__init__.py
	kombu/common.py
	kombu/pools.py
	kombu/transport/amqplib.py
	kombu/transport/virtual/__init__.py
	kombu/utils/compat.py
	kombu/utils/encoding.py
	requirements/test-jython.txt
	tox.ini
2011-09-27 13:41:23 +01:00
Ask Solem 5f28693b4b tox: adds jython target 2011-09-16 15:36:53 +01:00
Ask Solem af915d498b Fixes syntax error in django transport 2011-09-14 18:59:09 +01:00
Ask Solem 91916cd287 tox: Missing cover3-html 2011-09-14 12:11:47 +01:00
Ask Solem f6bb91931f tox: Missing cover3-html 2011-09-14 12:11:35 +01:00
Ask Solem 6059d00149 Fixes tox for py32 2011-09-14 11:19:42 +01:00
Ask Solem 4476e9a11f Fixes tox for py32 2011-09-14 11:19:26 +01:00
Ask Solem ca0d18cb06 Tox: Fixes coverage.xml location 2011-09-14 11:04:41 +01:00
Ask Solem fa57ca269b Tox: Fixes coverage.xml location 2011-09-14 11:03:15 +01:00
Ask Solem aee380882e Tox: specify correct xunit location 2011-09-14 08:58:49 +01:00
Ask Solem c04a23057a Tox: specify correct xunit location 2011-09-14 08:58:07 +01:00
Ask Solem 4d107d4a86 tox: Store cover in toplevel directory 2011-09-14 01:03:25 +01:00
Ask Solem a8856c25bc tox: Store cover in toplevel directory 2011-09-14 01:02:56 +01:00
Ask Solem ddae2aa201 Improve removepyc script 2011-09-13 19:25:03 +01:00
Ask Solem 92148ac03c Improve removepyc script 2011-09-13 19:24:55 +01:00
Ask Solem 61b47789f4 Tox: remove pyc files before testing 2011-09-13 18:25:02 +01:00
Ask Solem 281916716c Tox: remove pyc files before testing 2011-09-13 18:24:32 +01:00
Ask Solem d5d89b58eb More tox improvements 2011-09-13 18:15:28 +01:00
Ask Solem 6653a34ea0 More tox improvements 2011-09-13 18:14:20 +01:00
Ask Solem fc524d9178 Improves tox for py3k 2011-09-13 17:03:58 +01:00
Ask Solem 34e53abd24 Improves tox for py3k 2011-09-13 17:03:43 +01:00
Ask Solem b0c69f8e28 Tests passing on Python 3.2 2011-09-13 16:20:26 +01:00
Ask Solem 4dff6f6f6d Tests passing on Python 3.2 2011-09-13 16:14:41 +01:00
Ask Solem c461757a19 Remove py24 env from tox.ini 2011-09-09 14:57:32 +01:00
Christopher Grebs 9f78ae0fed Fixed unittests to run with PyPy, moved some module logic to test utilities 2011-08-28 17:30:44 +02:00
Ask Solem 480112b21f Test requirements specifies PyYAML==3.09 as 3.10 dropped Python 2.4 support 2011-06-28 15:40:21 +01:00
Ask Solem 71a8d2f39f Added tox.ini 2010-07-20 12:41:36 +02:00