Commit graph

13 commits

Author SHA1 Message Date
Daniel Neuhäuser
c02c23ee30 Merge branch '0.10-maintenance'
Conflicts:
	tox.ini
2013-06-27 16:52:34 +02:00
Daniel Neuhäuser
f88cc2d2f9 Fix broken test_appcontext_signals test case
This fixes #781 and ensures that Flask is tested with blinker installed.
2013-06-27 16:49:27 +02:00
Daniel Neuhäuser
88b74b376e Don't use werkzeug dev version in tox anymore
We don't need the dev version anymore since the lastest werkzeug release
supports 3.3.
2013-06-19 17:24:02 +02:00
Armin Ronacher
6bd5dfad0c Test Flask against werkzeug master 2013-05-30 21:39:54 +01:00
Daniel Neuhäuser
bb2e20f53f Depends on itsdangerous>=0.12 now 2013-05-26 15:37:52 +02:00
Daniel Neuhäuser
884aad8ece Test using itsdangerous with 3.x support 2013-05-22 16:33:05 +02:00
Daniel Neuhäuser
da5edad23a Use werkzeug@sprint-branch in tox 2013-05-22 16:19:57 +02:00
Daniel Neuhäuser
323a840c5a Add tox.ini 2013-05-18 18:27:49 +02:00
Armin Ronacher
6e4015d624 Removed tox file 2012-10-07 16:08:13 +02:00
Simon Sapin
ee6ed491d3 Have tox install simplejson for python 2.5 2012-03-19 00:52:33 +01:00
Ron DuPlain
96d7f20787 Fix tox warning, test "not installed in testenv". 2012-02-04 10:44:16 -05:00
Ron DuPlain
84b96ac9d3 Add pypy to tox.ini. 2012-02-04 10:37:58 -05:00
Armin Ronacher
c18f032a82 Added a tox-test command that runs Flask tests with tox 2010-07-27 01:29:21 +02:00