From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 30 Dec 2013 16:32:38 +0000 (-0500)
Subject: Disable --pre flag in tox installs to fix environment recreation.
X-Git-Tag: v3.2.0b1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f6caf59e15b5718b9b0960e2bae8a1ed44a5394;p=thirdparty%2Ftornado.git

Disable --pre flag in tox installs to fix environment recreation.

Remove an old hack for monotime package.
---

diff --git a/tox.ini b/tox.ini
index 77918ef08..5c68e8ec9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,6 +23,11 @@ changedir = {toxworkdir}
 # PYTHONPATH)
 #environment = PYTHONPATH=
 
+# tox 1.6 passes --pre to pip by default, which currently has problems
+# installing pycurl and monotime (https://github.com/pypa/pip/issues/1405).
+# Remove it (it's not a part of {opts}) to only install real releases.
+install_command = pip install {opts} {packages}
+
 [testenv:py26]
 basepython = python2.6
 deps = unittest2
@@ -89,9 +94,8 @@ commands = python -m tornado.test.runtests --ioloop=tornado.platform.twisted.Twi
 
 [testenv:py27-monotonic]
 basepython = python2.7
-# TODO: remove this url when the pypi page is updated.
 deps =
-     http://pypi.python.org/packages/source/M/Monotime/Monotime-1.0.tar.gz
+     Monotime
      futures
      mock
      pycurl