Merge a324479 into ec6f6f0

.travis.yml

@@ -1,6 +1,7 @@
 language: python
+dist: trusty
 addons:
-  postgresql: "9.4"
+  postgresql: "9.5"
 services:
   - postgresql
 python:
@@ -9,9 +10,10 @@ python:
 install:
   - pip install -r dev-requirements.txt
   - pip install coveralls
+  - sudo curl --output /usr/local/bin/phantomjs https://s3.amazonaws.com/circle-downloads/phantomjs-2.1.1
 script:
   - cd pets
-  - coverage run --rcfile=../.coveragerc manage.py test -v 3
+  - coverage run --rcfile=../.coveragerc manage.py test -v 2
 before_script:
   - psql -U postgres -c 'create database pets;'
 after_success:

contrib/sample-env

@@ -1,11 +1,13 @@
-SECRET_KEY=secret_dummy_key
 ALLOWED_HOSTS=127.0.0.1,.localhost
-DJANGO_SETTINGS_MODULE=pets.settings.dev
 DATABASE_URL=sqlite:///db.sqlite3
 DB_CONN_MAX_AGE=0
+DEBUG=False
+DJANGO_SETTINGS_MODULE=pets.settings.dev
+INTERNAL_IPS=127.0.0.1,localhost
+SECRET_KEY=secret_dummy_key
 
 EMAIL_BACKEND=django.core.mail.backends.console.EmailBackend
-EMAIL_PORT=0
 EMAIL_HOST=example.com
 EMAIL_HOST_PASSWORD=example
-EMAIL_HOST_USER=dummy@example.com
+EMAIL_HOST_USER=dummy@example.com
+EMAIL_PORT=0

dev-requirements.txt

@@ -1,6 +1,6 @@
 -r requirements.txt
 
-selenium==3.0.2
-django-debug-toolbar==1.5
-django-test-without-migrations==0.4
+selenium==3.4.3
+django-debug-toolbar==1.8
+django-test-without-migrations==0.6
 model_mommy==1.3.0

pets/common/urls.py

@@ -1,18 +1,17 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.contrib.sitemaps.views import sitemap
 
-from .sitemaps import PetEntrySitemap, PageSitemap
 from . import views
+from .sitemaps import PetEntrySitemap, PageSitemap
 
 sitemaps = {
     'pages': PageSitemap,
     'pets': PetEntrySitemap,
 }
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^$', views.home, name='homepage'),
     url(r'^sobre/$', views.AboutPageView.as_view(), name='about'),
     url(r'^sitemap\.xml$', sitemap, {'sitemaps': sitemaps},
         name='django.contrib.sitemaps.views.sitemap'),
-)
+]

pets/meupet/urls.py

@@ -1,10 +1,9 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from . import views
 
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     # I'll keep this here for compatibility with links shared
     # on Facebook.
     url(r'^new/$', views.RegisterPetView.as_view()),
@@ -27,4 +26,4 @@
 
     url(r'^(?P<pk_or_slug>[-\w]*)/$', views.pet_detail_view, name='detail'),
     url(r'^(?P<pk>[0-9]+)/$', views.pet_detail_view, name='detail_by_pk'),
-)
+]

pets/pets/settings/dev.py

@@ -2,10 +2,10 @@
 
 from .prod import *
 
-DEBUG = True
-
 INSTALLED_APPS += ('debug_toolbar', 'test_without_migrations')
 
+MIDDLEWARE_CLASSES = ('debug_toolbar.middleware.DebugToolbarMiddleware',) + MIDDLEWARE_CLASSES
+
 TEMPLATES[0]['OPTIONS']['loaders'] = PROJECT_TEMPLATE_LOADERS
 
 MOMMY_CUSTOM_FIELDS_GEN = {

pets/pets/settings/prod.py

@@ -1,5 +1,6 @@
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
+
 from decouple import config, Csv
 from dj_database_url import parse as db_url
 
@@ -12,12 +13,9 @@
 SECRET_KEY = config('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = config('DEBUG', default=False, cast=bool)
 
-INTERNAL_IPS = (
-    '0.0.0.0',
-    '127.0.0.1',
-)
+INTERNAL_IPS = config('INTERNAL_IPS', default='', cast=Csv())
 
 ALLOWED_HOSTS = config('ALLOWED_HOSTS', default='', cast=Csv())
 
@@ -35,22 +33,22 @@
 )
 
 THIRD_PARTS_APPS = (
-    'easy_thumbnails',
     'braces',
+    'compressor',
+    'corsheaders',
     'crispy_forms',
-    'social.apps.django_app.default',
+    'easy_thumbnails',
     'opbeat.contrib.django',
-    'compressor',
     'password_reset',
     'rest_framework',
-    'corsheaders',
+    'social.apps.django_app.default',
 )
 
 PROJECT_APPS = (
-    'users',
-    'meupet',
-    'common',
     'cities',
+    'common',
+    'meupet',
+    'users',
 )
 
 INSTALLED_APPS = DJANGO_APPS + PROJECT_APPS + THIRD_PARTS_APPS

pets/pets/urls.py

@@ -1,16 +1,18 @@
-from django.conf.urls import patterns, include, url, static
-from django.contrib import admin
 from django.conf import settings
+from django.conf.urls import include, url, static
+from django.contrib import admin
+
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^pets/', include('meupet.urls', namespace='meupet')),
     url(r'^social/', include('social.apps.django_app.urls', namespace='social')),
     url(r'^user/', include('users.urls', namespace='users')),
     url(r'^api/', include('api.urls', namespace='api')),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^', include('common.urls', namespace='common')),
-)
+]
 
 if settings.DEBUG:
+    import debug_toolbar
+    urlpatterns += [url(r'^__debug__/', include(debug_toolbar.urls))]
     urlpatterns += static.static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

pets/users/migrations/0007_auto_20170719_2138.py

@@ -0,0 +1,17 @@
+import django.contrib.auth.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0006_ownerprofile_phone'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ownerprofile',
+            name='username',
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username'),
+        ),
+    ]

pets/users/urls.py

@@ -1,10 +1,8 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from . import views
 
-
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^$', views.CreateUserView.as_view(), name='create'),
     url(r'^profile/(?P<pk>[0-9]+)/$', views.ProfileDetailView.as_view(), name='user_profile'),
     url(r'^profile/$', views.UserProfileView.as_view(), name='profile'),
@@ -16,4 +14,4 @@
     url(r'^recover/reset/done/$', views.RecoverResetDoneView.as_view(), name='recover_password_done'),
     url(r'^recover/reset/(?P<token>.+)/$', views.RecoverResetView.as_view(), name='recover_password_reset'),
     url(r'^recover/(?P<signature>.+)/$', views.RecoverDoneView.as_view(), name='recover_password_sent'),
-)
+]

pets/users/views.py

@@ -2,7 +2,7 @@
 from django.contrib.auth import authenticate, login, logout
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.http.response import HttpResponseRedirect
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.template.context import RequestContext
 from django.utils.http import is_safe_url
 from django.views.generic import CreateView, TemplateView, UpdateView, DetailView
@@ -94,7 +94,7 @@ def user_login(request):
                 return HttpResponseRedirect(reverse('meupet:index'))
     else:
         form = LoginForm()
-    return render_to_response('users/login.html', {'form': form}, context)
+    return render(request, 'users/login.html', {'form': form}, context)
 
 
 def user_logout(request):

requirements.txt

@@ -1,17 +1,17 @@
-Django>=1.8,<1.9
+Django==1.11.3
 django-autoslug==1.9.3
 django-braces==1.11.0
 django-crispy-forms==1.6.1
 django-compressor==2.1.1
 django-cors-middleware==1.3.1
-django-extensions==1.7.8
-django-password-reset==0.9
-djangorestframework==3.6.2
+django-extensions==1.8.1
+django-password-reset==1.0
+djangorestframework==3.6.3
 dj-database-url==0.4.2
-easy-thumbnails==2.3
+easy-thumbnails==2.4.1
 facebook-sdk==2.0.0
-Pillow==4.0.0
+Pillow==4.2.1
 python-social-auth==0.2.21
 opbeat==3.5.2
-psycopg2==2.7.1
+psycopg2==2.7.2
 python-decouple==3.0