jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to Django 1.9 and bumps deps

Browse source
This commit is contained in:
Yohan Boniface 2016-04-24 16:14:47 +02:00
parent bfe26adfad
commit 94d2bbb65e
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
requirements.txt
View file

@ -1,7 +1,7 @@
django-compressor==1.6 django-compressor==2.0
Django==1.8.11 Django==1.9.5
Pillow==3.1.1 Pillow==3.2.0
psycopg2==2.6.1 psycopg2==2.6.1
python-social-auth==0.2.14 python-social-auth==0.2.18
requests==2.9.1 requests==2.9.1
django-leaflet-storage==0.8.0b0 django-leaflet-storage==0.8.0b0

4
umap/settings/base.py
View file

@ -91,10 +91,10 @@ STATICFILES_DIRS = (
os.path.join(PROJECT_DIR, 'static'), os.path.join(PROJECT_DIR, 'static'),
) )
STATICFILES_FINDERS = ( STATICFILES_FINDERS = [
'compressor.finders.CompressorFinder', 'compressor.finders.CompressorFinder',
# 'npm.finders.NpmFinder', # 'npm.finders.NpmFinder',
) + STATICFILES_FINDERS ] + STATICFILES_FINDERS
# ============================================================================= # =============================================================================
# Templates # Templates

18
umap/urls.py
View file

@ -1,7 +1,7 @@
from django.conf import settings from django.conf import settings
from django.conf.urls.static import static from django.conf.urls.static import static
from django.conf.urls.i18n import i18n_patterns 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.staticfiles.urls import staticfiles_urlpatterns
from django.contrib import admin from django.contrib import admin
from django.views.decorators.cache import cache_page from django.views.decorators.cache import cache_page
@ -12,21 +12,21 @@ from . import views
admin.autodiscover() admin.autodiscover()
urlpatterns = patterns( urlpatterns = [
'', url(r'^admin/', include(admin.site.urls)),
(r'^admin/', include(admin.site.urls)),
url('', include('social.apps.django_app.urls', namespace='social')), url('', include('social.apps.django_app.urls', namespace='social')),
url(r'^m/(?P<pk>\d+)/$', MapShortUrl.as_view(), name='umap_short_url'), 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( urlpatterns += i18n_patterns(
'',
url(r'^$', views.home, name="home"), 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'^search/$', views.search, name="search"),
url(r'^about/$', views.about, name="about"), url(r'^about/$', views.about, name="about"),
url(r'^user/(?P<username>[-_\w@]+)/$', views.user_maps, name='user_maps'), 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: if settings.DEBUG and settings.MEDIA_ROOT: