-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Django to the latest LTS and a few more packages
- Loading branch information
1 parent
ec6f6f0
commit a324479
Showing
12 changed files
with
68 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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'), | ||
) | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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'), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |