Commit Graph

6 Commits

Author SHA1 Message Date
Vincent Driessen c5939479b5 Merge remote-tracking branch 'origin/master' into SanyerMyasoedov-master
Conflicts:
	rq/decorators.py
	tests/__init__.py
	tests/test_decorator.py
2014-05-06 15:52:35 +02:00
Vincent Driessen 1f423436a5 Move mock to test-only dependencies. 2014-05-06 15:51:23 +02:00
Vincent Driessen cb278a9549 Add Python 3.4 to targets. 2014-04-28 08:34:52 +02:00
Alex Morega 2e517001a9 pass on arguments to py.test 2013-08-05 14:11:01 +03:00
Alex Morega 610c26d816 run tests on py33 2013-08-05 13:47:43 +03:00
Vincent Driessen 73e6017896 Add tox tests, for Python 2.6 and PyPy. 2013-01-23 22:57:44 +01:00