Update requirements so they at least all install on my computer (quite a few are gone forever, some don't work on 10.10.5).

Author: TimothyFitz

README.txt

@@ -21,7 +21,7 @@ Note: Use of the registered "CANVAS" trademark is not conferred by the LICENSE.
 OS X
 ----
 # MANUALLY: Install XCode via thumb drive or App Store
-# MANUALLY: Install
+xcode-select --install
 java # type this, press enter, will prompt you to install Java
 ruby -e "$(curl -fsSLk https://gist.github.com/raw/323731/install_homebrew.rb)"
 brew install git ack redis nginx pil solr wget memcached # requires installed XCode

requirements/non_aws_dev_requirements.txt

@@ -3,14 +3,14 @@ bleach==1.4.2
 cffi==1.3.0
 Django==1.2.7
 django-bcrypt==0.9.2
-django-cachecow==0.2.7
+# django-cachecow==0.2.7 # only in aehlke's github. Drawquest not canvas
 django-indexer==0.3.0
 django-nose==0.1.3
 django-paging==0.2.4
 django-redis-sessions==0.2.3
 django-sentry==1.8.6.2
 django-templatetag-sugar==0.1
-dnspython==1.9.4
+dnspython==1.12.0
 enum34==1.0.4
 Epsilon==0.6.0
 Fabric==1.10.2
@@ -25,38 +25,38 @@ Jinja2==2.6
 lxml==2.3
 MarkupSafe==0.15
 nose==1.1.2
-PAM==0.4.2
+# PAM==0.4.2 # Latest PAM on pypi is 0.1.x, is this python-pam? Can't find any use of it either way
 paramiko==1.7.6
 pilkit==1.1.7
 Pillow==2.3.0
-py-bcrypt==0.2
+py-bcrypt==0.4
 pyasn1==0.1.9
 pycparser==2.14
 pycrypto==2.0.1
 pydkim==0.3
 PyOpenGL==3.0.2
 pyOpenSSL==0.10
-Pyrex==0.9.8.5
+# Pyrex==0.9.8.5 # Is pyrex dead? No downloads on pypi
 pyserial==2.6
 python-cjson==1.1.0
 python-memcached==1.47
-PyYAML==3.9
+PyYAML==3.11
 rauth==0.4.16
 redis==2.10.5
 requests==2.8.1
 simplejson==2.2.1
 six==1.10.0
 South==0.7.3
-Twisted==10.1.0
-Twisted-Conch==13.2.0
-Twisted-Core==13.2.0
-Twisted-Lore==13.2.0
-Twisted-Mail==13.2.0
-Twisted-Names==13.2.0
-Twisted-News==13.2.0
-Twisted-Runner==13.2.0
-Twisted-Web==13.2.0
-Twisted-Words==13.2.0
+Twisted==15.4.0
+#Twisted-Conch==13.2.0
+#Twisted-Core==13.2.0
+#Twisted-Lore==13.2.0
+#Twisted-Mail==13.2.0
+#Twisted-Names==13.2.0
+#Twisted-News==13.2.0
+#Twisted-Runner==13.2.0
+#Twisted-Web==13.2.0 # This is the only one we might need
+#Twisted-Words==13.2.0
 txAWS==0.0.1
 txredis==2.3
 urbanairship==0.3

requirements/update_sandbox.sh

@@ -1 +1,3 @@
+# Epsilon requires twisted installed to run its setup.py (bad Epsilon, don't do that)
+pip install Twisted==15.4.0
 pip install -r /var/canvas/requirements/non_aws_dev_requirements.txt