6 Commits (36ac9a5209fd6f28fd65ffbf34e9902fc0da9926)

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
11 years ago
Vincent Driessen 1f423436a5 Move mock to test-only dependencies. 11 years ago
Vincent Driessen cb278a9549 Add Python 3.4 to targets. 11 years ago
Alex Morega 2e517001a9 pass on arguments to py.test 12 years ago
Alex Morega 610c26d816 run tests on py33 12 years ago
Vincent Driessen 73e6017896 Add tox tests, for Python 2.6 and PyPy. 12 years ago