Fork dependencies to add Django 1.9 compat. Upgrade others.

requirements/edx/base.txt

@@ -15,7 +15,8 @@ cssselect==0.9.1
 dealer==2.0.4
 defusedxml==0.4.1
 django-babel-underscore==0.4.2
-django-celery==3.1.16
+# DB what????????????????
+django-celery==3.1.17
 django-countries==3.3
 django-extensions==1.5.9
 django-filter==0.11.0
@@ -23,12 +24,14 @@ django-ipware==1.1.0
 django-mako==0.1.5pre
 django-model-utils==2.3.1
 django-mptt==0.7.4
-django-oauth-plus==2.2.8
+# Forked BitBucket repo using Mercurial.
+hg+https://doctoryes@bitbucket.org/doctoryes/django-oauth-plus#egg=django-oauth-plus
 django-oauth-toolkit==0.10.0
 django-pipeline-forgiving==1.0.0
 django-sekizai==0.8.2
 django-ses==0.7.1
-django-simple-history==1.6.3
+# Just upgraded to the most recent version.
+django-simple-history==1.8.1
 django-statici18n==1.1.5
 django-storages==1.4.1
 django-method-override==0.1.0
@@ -41,7 +44,8 @@ djangorestframework-oauth==1.1.0
 edx-ccx-keys==0.1.2
 edx-drf-extensions==0.5.1
 edx-lint==0.4.3
-edx-django-oauth2-provider==1.1.1
+# Added a Django 1.9 compatibility fix.
+git+https://github.com/edx/django-oauth2-provider.git@f0b0b05694320db38a810a357fa7b414320f2f19#egg=edx-django-oauth2-provider==1.1.1
 edx-django-sites-extensions==2.0.1
 edx-oauth2-provider==1.1.1
 edx-opaque-keys==0.2.1
@@ -81,10 +85,8 @@ python-memcached==1.48
 python-openid==2.2.5
 python-dateutil==2.1
 
-# This module gets monkey-patched in third_party_auth.py to fix a Django 1.8 incompatibility.
-# When this dependency gets upgraded, the monkey patch should be removed, if possible.
-# We can also remove the fix to auth_url in third_party_auth/saml.py when that fix is included upstream.
-python-social-auth==0.2.12
+# Use edX fork to add Django 1.9 compatibility and fix a transaction atomic wrapping.
+git+https://github.com/doctoryes/python-social-auth.git@7412864445e056f9ba9d25933c1d6775d7790add#egg=python-social-auth
 
 pytz==2015.2
 pysrt==0.4.7
@@ -137,8 +139,9 @@ ipaddr==2.1.11
 # Used to allow to configure CORS headers for cross-domain requests
 django-cors-headers==1.1.0
 
+# Moved this over to github.txt....
 # Debug toolbar
-django_debug_toolbar==1.3.2
+#django_debug_toolbar==1.3.2
 
 # Used for testing
 before_after==0.1.3

requirements/edx/github.txt

@@ -59,6 +59,7 @@ git+https://github.com/mitocw/django-cas.git@60a5b8e5a62e63e0d5d224a87f0b489201a
 # back to master when and if this fix is merged back.
 # fs==0.4.0
 git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b
+git+https://github.com/django-debug-toolbar/django-debug-toolbar.git#egg=django-debug-toolbar
 # The officially released version of django-debug-toolbar-mongo doesn't support DJDT 1.x. This commit does.
 git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c4aee6e76b9abe61cc808
 
@@ -70,7 +71,7 @@ git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002
 git+https://github.com/edx/pa11ycrawler.git@a963bbb7c4f861b24b5f66bfc5259d3fa207cca8#egg=pa11ycrawler==0.1a
 
 # Our libraries:
-git+https://github.com/edx/XBlock.git@xblock-0.4.10#egg=XBlock==0.4.10
+git+https://github.com/edx/XBlock.git@3760c702629e953b52231077db0ba26a8c244462#egg=XBlock==0.4.10
 -e git+https://github.com/edx/codejail.git@6b17c33a89bef0ac510926b1d7fea2748b73aadd#egg=codejail
 -e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1
 -e git+https://github.com/edx/django-splash.git@v0.2#egg=django-splash==0.2
@@ -93,6 +94,6 @@ git+https://github.com/edx/xblock-lti-consumer.git@v1.0.9#egg=xblock-lti-consume
 git+https://github.com/edx/edx-proctoring.git@0.12.19#egg=edx-proctoring==0.12.19
 
 # Third Party XBlocks
--e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga
+-e git+https://github.com/doctoryes/edx-sga@756e10bae7a731a5600d2cbe26f3710b682233d7#egg=edx-sga
 -e git+https://github.com/open-craft/xblock-poll@v1.1#egg=xblock-poll==1.1
 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.0.7#egg=xblock-drag-and-drop-v2==2.0.7