Commit 717e31f4 by chrisndodge

Merge pull request #101 from edx/cdodge/bump-django-version

bump django version
parents 34e36031 7129aac8
...@@ -13,6 +13,7 @@ sudo: false ...@@ -13,6 +13,7 @@ sudo: false
install: install:
- npm install - npm install
- "pip install -r local_requirements.txt"
- "pip install -r requirements.txt" - "pip install -r requirements.txt"
- "pip install -r test_requirements.txt" - "pip install -r test_requirements.txt"
- "pip install coveralls" - "pip install coveralls"
......
...@@ -30,10 +30,8 @@ class TestClient(Client): ...@@ -30,10 +30,8 @@ class TestClient(Client):
# Create a fake request to store login details. # Create a fake request to store login details.
request = HttpRequest() request = HttpRequest()
if self.session:
request.session = self.session request.session = engine.SessionStore()
else:
request.session = engine.SessionStore()
login(request, user) login(request, user)
# Set the cookie to represent the session. # Set the cookie to represent the session.
......
# Django/Framework Packages
django>=1.4.12,<=1.4.22
django-model-utils==1.4.0
South>=0.7.6
djangorestframework>=2.3.5,<=2.3.14
pytz>=2012h
pycrypto>=2.6
# Django/Framework Packages
django>=1.4.12,<=1.4.21
django-model-utils==1.4.0
South>=0.7.6
djangorestframework>=2.3.5,<=2.3.14
pytz>=2012h
pycrypto>=2.6
# Third Party # Third Party
-e git+https://github.com/un33k/django-ipware.git@42cb1bb1dc680a60c6452e8bb2b843c2a0382c90#egg=django-ipware -e git+https://github.com/un33k/django-ipware.git@42cb1bb1dc680a60c6452e8bb2b843c2a0382c90#egg=django-ipware
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment