Requirements after py3 first pass.

- Legacy-Id: 16308

requirements.txt

@@ -34,13 +34,13 @@ jwcrypto>=0.4.0			# for signed notifications
 #lxml>=3.4.0                    # from PyQuery; 
 mimeparse>=0.1.3		# from TastyPie
 mock>=2.0.0
-MySQL-python>=1.2.5
+mysqlclient>=1.3.13
 oauth2client>=4.0.0		# required by google-api-python-client, but not always pulled in
 patch>=1.16,<2.0
 pathlib>=1.0
 pathlib2>=2.3.0
 Pillow>=3.0
-pip==9.0.1			# Earlier pip has issues, 9.0.2 and 9.0.3, 10.0.0b1 leaves dross when down- and up-grading packages
+#pip==9.0.1			# Earlier pip has issues, 9.0.2 and 9.0.3, 10.0.0b1 leaves dross when down- and up-grading packages
 pyang>=1.7.2,<2.0
 pyflakes>=0.9.2
 pyopenssl>=17.5.0		# Used by urllib3.contrib, which is used by PyQuery but not marked as a dependency
@@ -49,15 +49,15 @@ python-dateutil>=2.2
 python-magic>=0.4.6
 python-memcached>=1.48		# for django.core.cache.backends.memcached
 pytz>=2014.7
-pyzmail>=1.0.3
+#pyzmail>=1.0.3
 requests!=2.12.*
-rfc2html>=2.0.0
+rfc2html>=2.0.1
 selenium>=2.42,<3.8.1
 six>=1.9.0
 sqlparse>=0.2.2
 tblib>=1.3.0
 tqdm>=3.7.0
-Trac>=1.0.10,<1.2
+#Trac>=1.2.3
 Unidecode>=0.4.18
 #wsgiref>=0.1.2
 xml2rfc>=2.9.3,!=2.6.0