Upgrade to Django 1.9 and bumps deps
This commit is contained in:
parent
bfe26adfad
commit
94d2bbb65e
3 changed files with 15 additions and 15 deletions
|
@ -1,7 +1,7 @@
|
|||
django-compressor==1.6
|
||||
Django==1.8.11
|
||||
Pillow==3.1.1
|
||||
django-compressor==2.0
|
||||
Django==1.9.5
|
||||
Pillow==3.2.0
|
||||
psycopg2==2.6.1
|
||||
python-social-auth==0.2.14
|
||||
python-social-auth==0.2.18
|
||||
requests==2.9.1
|
||||
django-leaflet-storage==0.8.0b0
|
||||
|
|
|
@ -91,10 +91,10 @@ STATICFILES_DIRS = (
|
|||
os.path.join(PROJECT_DIR, 'static'),
|
||||
)
|
||||
|
||||
STATICFILES_FINDERS = (
|
||||
STATICFILES_FINDERS = [
|
||||
'compressor.finders.CompressorFinder',
|
||||
# 'npm.finders.NpmFinder',
|
||||
) + STATICFILES_FINDERS
|
||||
] + STATICFILES_FINDERS
|
||||
|
||||
# =============================================================================
|
||||
# Templates
|
||||
|
|
18
umap/urls.py
18
umap/urls.py
|
@ -1,7 +1,7 @@
|
|||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.conf.urls.i18n import i18n_patterns
|
||||
from django.conf.urls import patterns, url, include
|
||||
from django.conf.urls import url, include
|
||||
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
||||
from django.contrib import admin
|
||||
from django.views.decorators.cache import cache_page
|
||||
|
@ -12,21 +12,21 @@ from . import views
|
|||
|
||||
admin.autodiscover()
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
(r'^admin/', include(admin.site.urls)),
|
||||
urlpatterns = [
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
url('', include('social.apps.django_app.urls', namespace='social')),
|
||||
url(r'^m/(?P<pk>\d+)/$', MapShortUrl.as_view(), name='umap_short_url'),
|
||||
url(r'^ajax-proxy/$', cache_page(180)(views.ajax_proxy), name='ajax-proxy'), # noqa
|
||||
)
|
||||
url(r'^ajax-proxy/$', cache_page(180)(views.ajax_proxy),
|
||||
name='ajax-proxy'),
|
||||
]
|
||||
urlpatterns += i18n_patterns(
|
||||
'',
|
||||
url(r'^$', views.home, name="home"),
|
||||
url(r'^showcase/$', cache_page(24 * 60 * 60)(views.showcase), name='maps_showcase'), # noqa
|
||||
url(r'^showcase/$', cache_page(24 * 60 * 60)(views.showcase),
|
||||
name='maps_showcase'),
|
||||
url(r'^search/$', views.search, name="search"),
|
||||
url(r'^about/$', views.about, name="about"),
|
||||
url(r'^user/(?P<username>[-_\w@]+)/$', views.user_maps, name='user_maps'),
|
||||
(r'', include('leaflet_storage.urls')),
|
||||
url(r'', include('leaflet_storage.urls')),
|
||||
)
|
||||
|
||||
if settings.DEBUG and settings.MEDIA_ROOT:
|
||||
|
|
Loading…
Reference in a new issue