Django 1.9 upgrade: update some requirements for compatibility

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 242d8dec0a029af6ea7a87d7387d5cf8abbbd2b1..d98f86cd3135a5e075fb3a58009d0f20de1a89af 100644 (file)
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -18,7 +18,7 @@ uid='www-data'
 gid='www-data'
 
 # stating apps
-pip install -U django==1.8.17
+pip install -U django==1.9.12
 pip uninstall -y south
 
 # waiting for other network services

diff --git a/requirements-dev.txt b/requirements-dev.txt
index cbd042677ded5544654eacd2f830b5bf8825e45a..832121778edb2bc36a9692480abe166c33b34953 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,6 @@
 
--e git+https://github.com/mariocesar/sorl-thumbnail.git@v12.2#egg=sorl-thumbnail-12.2
+-e git+https://github.com/mariocesar/sorl-thumbnail.git@7ce76bc1ef798a63cbf89b5df83de4da4b12e98d#egg=sorl-thumbnail-master
 -e git+https://github.com/Parisson/ebooklib.git#egg=ebooklib-0.16
 -e git+https://github.com/Parisson/saved_searches.git#egg=saved_searches-2.0.0-beta
--e git+https://github.com/maths28/django-haystack.git@v2.4.1.dev0#egg=django-haystack-2.4.1.dev0
+-e git+https://github.com/django-haystack/django-haystack.git@v2.5.1#egg=django-haystack-2.5.1
 -e git+https://github.com/yomguy/django-ipauth.git#egg=django-ipauth-0.4.1-dev

diff --git a/setup.py b/setup.py
index 15c150a4e905fecebc6feb077ff4709df17f054d..815d3c2e669d03f2c08097ef7b13c25451853e92 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -49,15 +49,15 @@ setup(
   author_email = "yomguy@parisson.com",
   version = '1.6.3',
   install_requires = [
-        'django==1.8.17',
+        'django==1.9.*',
         'django-registration-redux',
         'django-extensions',
         'django-timezones',
         'django-jqchat',
-        'django-debug-toolbar==1.3.2',
+        'django-debug-toolbar==1.6',
         'django-extra-views',
         'django-breadcrumbs',
-        'django-bootstrap3==6.2.1',
+        'django-bootstrap3==8.1.0',
         'django-bootstrap-pagination',
         'django-json-rpc',
         'django-suit',
@@ -77,7 +77,7 @@ setup(
         'redis',
         'Werkzeug',
         'django-dirtyfields',
-        'sqlparse==0.1.19'
+        'sqlparse==0.2.2'
     ],
   tests_require=['pytest-django', 'pytest-cov', 'factory-boy'],
   # Provide a test command through django-setuptest