Merge pull request #437 from edx/clintonb/requirements-updates

Updated requirements

acceptance_tests/config.py

@@ -38,7 +38,7 @@ ENABLE_CYBERSOURCE_TESTS = str2bool(os.environ.get('ENABLE_CYBERSOURCE_TESTS', T
 # MARKETING CONFIGURATION
 ENABLE_MARKETING_SITE = str2bool(os.environ.get('ENABLE_MARKETING_SITE', False))
 
-MARKETING_URL_ROOT = os.environ.get('MARKETING_URL_ROOT').strip('/')
+MARKETING_URL_ROOT = os.environ.get('MARKETING_URL_ROOT').strip('/') if ENABLE_MARKETING_SITE else None
 
 # These must correspond to the course IDs provided for each enrollment mode.
 VERIFIED_COURSE_SLUG = os.environ.get(

requirements/base.txt

@@ -4,9 +4,9 @@ Django==1.8.6
 django-appconf==0.6
 django-compressor==1.5
 django_extensions==1.5.5
-django-libsass==0.3
-django-oscar==1.1
-django_simple_history==1.6.1
+django-libsass==0.5
+django-oscar==1.1.1
+django_simple_history==1.6.3
 django-waffle==0.10.1
 djangorestframework==3.2.3
 djangorestframework-jwt==1.7.2
@@ -15,11 +15,11 @@ edx-auth-backends==0.1.3
 edx-ecommerce-worker==0.2.0
 edx-rest-api-client==1.2.1
 jsonfield==1.0.3
-libsass==0.8.2
-paypalrestsdk==1.9.0
+libsass==0.9.2
+paypalrestsdk==1.11.1
 premailer==2.9.2
-pycountry==1.10
+pycountry==1.18
 python-dateutil==2.4.2
-pytz==2015.4
-requests==2.6.0
+pytz==2015.7
+requests==2.8.1
 suds==0.4

requirements/local.txt

@@ -2,8 +2,8 @@
 -r test.txt
 -r docs.txt
 
-django-debug-toolbar==1.3.2
+django-debug-toolbar==1.4
 
 # i18n
-transifex-client==0.10
+transifex-client==0.11
 git+https://github.com/edx/i18n-tools.git@v0.1.4#egg=i18n_tools==0.1.4

requirements/test.txt

 # Packages required for testing
 -r base.txt
 
-bok-choy==0.4.3
-coverage==3.7.1
+bok-choy==0.4.7
+coverage==4.0.2
 ddt==1.0.0
 django-nose==1.4.2
 edx-ecommerce-api-client==1.1.0
@@ -12,5 +12,5 @@ mock-django==0.6.9
 nose-ignore-docstring==0.2
 pep8==1.6.2
 pylint==1.4.4
-selenium>=2.47.1
-testfixtures==4.2.0
+selenium>=2.48.0
+testfixtures==4.5.0