Merge pull request #238 from hacklab-fi/revert-232-pyup_merged

Revert "Merge pyupbot updates"

Author: rambo

project/requirements/base.txt

@@ -1,40 +1,40 @@
 # Bleeding edge Django
 django==1.8.5
-Jinja2==2.9.6
-django-jinja==2.3.0
-markupsafe==1.0
+Jinja2==2.8.1
+django-jinja==2.2.2
+markupsafe==0.23
 
 # Configuration
-django-environ==0.4.3
+django-environ==0.4.1
 django-secure==1.0.1
-whitenoise==3.3.0
+whitenoise==3.2.2
 
 # Forms
-django-braces==1.11.0
+django-braces==1.10.0
 django-crispy-forms==1.6.1
 django-floppyforms==1.7.0
 
 # Models
-django-model-utils==3.0.0
+django-model-utils==2.6
 
 # Images
-Pillow==4.1.0
+Pillow==3.4.2
 
 # Python-PostgreSQL Database Adapter
-psycopg2==2.7.1
+psycopg2==2.6.2
 
 # Unicode slugification
 git+git://github.com/mozilla/unicode-slugify#egg=unicode-slugify==0.1.3-HEAD
 django-autoslug==1.9.3
 
 # Time zones support
-pytz==2017.2
+pytz==2016.10
 
 # Your custom requirements go here
-django-bootstrap3==8.2.2
+django-bootstrap3==7.1.0
 django-reversion==1.9.3
-djangorestframework==3.6.2
-Markdown==2.6.8
+djangorestframework==3.5.3
+Markdown==2.6.7
 django-filter==0.15.3
 djangorestframework-filters==0.9.1
 django-markdown==0.8.4

project/requirements/local.txt

@@ -1,12 +1,12 @@
 # Local development dependencies go here
 -r base.txt
 
-django-extensions==1.7.8
+django-extensions==1.7.5
 # django-debug-toolbar that works with Django 1.5+
-django-debug-toolbar==1.7
+django-debug-toolbar==1.6
 
 # improved REPL
-ipdb==0.10.3
+ipdb==0.10.1
 
 # the "python3 compatible" package is broken ATM
 # Required by maildump. Need to pin dependency to gevent beta to be Python 3-compatible.
@@ -15,14 +15,14 @@ ipdb==0.10.3
 #maildump==0.5.1
 
 # Code quality
-flake8==3.3.0
+flake8==3.2.1
 pep8==1.7.0
 pep8-naming==0.4.1
 autopep8==1.3.1
 isort==4.2.5
 
 factory-boy==2.8.1
-pytest==3.0.7
+pytest==3.0.5
 pytest-django==3.1.2
 
 loremipsum==1.0.5

project/requirements/test.txt

@@ -1,13 +1,13 @@
 # Test dependencies go here.
 -r base.txt
 
-coverage==4.3.4
-flake8==3.3.0
+coverage==4.3.1
+flake8==3.2.1
 pep8==1.7.0
 pep8-naming==0.4.1
 
 factory-boy==2.8.1
-pytest==3.0.7
+pytest==3.0.5
 pytest-django==3.1.2
 
 loremipsum==1.0.5