diff --git a/provisioning/bootstrap.sh b/provisioning/bootstrap.sh index e7e314b..f0bab20 100644 --- a/provisioning/bootstrap.sh +++ b/provisioning/bootstrap.sh @@ -37,6 +37,7 @@ chown vagrant: ~vagrant/.bash_profile cd /vagrant # Installation des dépendances python +sudo -H pip3 install -U pip sudo -H -u vagrant pip3 install --user -r requirements.txt sudo -H -u vagrant pip3 install --user -r requirements-devel.txt diff --git a/requirements.txt b/requirements.txt index 1a4d834..73d7caa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.10 +Django==1.10.* Pillow==3.3.0 psycopg2==2.6.2 django-bootstrap-form==3.2.1 diff --git a/shared/urls.py b/shared/urls.py index f591c4a..1ffb7e5 100644 --- a/shared/urls.py +++ b/shared/urls.py @@ -3,5 +3,5 @@ from .views import Home app_name = 'shared' urlpatterns = [ - url(r'$', Home.as_view(), name='home'), + url(r'^$', Home.as_view(), name='home'), ] diff --git a/users/models.py b/users/models.py index 4e54d78..85206e0 100644 --- a/users/models.py +++ b/users/models.py @@ -1,3 +1,2 @@ from django.db import models from django.contrib.auth.models import User - diff --git a/users/urls.py b/users/urls.py index 5524ac3..a80c300 100644 --- a/users/urls.py +++ b/users/urls.py @@ -53,11 +53,14 @@ urlpatterns = [ Home.as_view(), name='password_reset_done'), # PASS RESET CONFIRM - url(r'^reset/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', + url('^reset/(?P[0-9A-Za-z_\-]+)/' + '(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_confirm, { - 'template_name': 'users/user_form.html', - 'post_reset_redirect': reverse_lazy('user:password_reset_complete'), + 'template_name': 'user/user_form.html', + 'post_reset_redirect': reverse_lazy( + 'user:password_reset_complete' + ), 'extra_context': { 'page_title': 'Changer de mot de passe', 'button': 'Changer'