diff --git a/requirements.txt b/requirements.txt index 1a38713e..a84dba4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ Pillow==3.0.0 psycopg2==2.6.1 python-social-auth==0.2.13 requests==2.8.0 -git+https://github.com/umap-project/django-leaflet-storage.git +django-leaflet-storage==0.8.0b0 diff --git a/umap/__init__.py b/umap/__init__.py index 28412995..19ca8cd4 100644 --- a/umap/__init__.py +++ b/umap/__init__.py @@ -1,5 +1,5 @@ "Create maps with OpenStreetMap layers in a minute and embed them in your site." -VERSION = (0, 7, 6) +VERSION = (0, 8, 0, 'beta', 0) __author__ = 'Yohan Boniface' __contact__ = "ybon@openstreetmap.fr" diff --git a/umap/settings/base.py b/umap/settings/base.py index 9c022784..a723c82e 100644 --- a/umap/settings/base.py +++ b/umap/settings/base.py @@ -61,18 +61,18 @@ INSTALLED_APPS = ( 'social.apps.django_app.default', ) -#============================================================================== +# ============================================================================= # Calculation of directories relative to the project module location -#============================================================================== +# ============================================================================= import os import umap as project_module PROJECT_DIR = os.path.dirname(os.path.realpath(project_module.__file__)) -#============================================================================== +# ============================================================================= # Project URLS and media settings -#============================================================================== +# ============================================================================= ROOT_URLCONF = 'umap.urls' @@ -90,13 +90,14 @@ STATICFILES_DIRS = ( os.path.join(PROJECT_DIR, 'static'), ) -STATICFILES_FINDERS += ( +STATICFILES_FINDERS = ( 'compressor.finders.CompressorFinder', -) + # 'npm.finders.NpmFinder', +) + STATICFILES_FINDERS -#============================================================================== +# ============================================================================= # Templates -#============================================================================== +# ============================================================================= TEMPLATE_DIRS = ( os.path.join(PROJECT_DIR, 'templates'), @@ -114,9 +115,9 @@ TEMPLATE_LOADERS = ( ('django.template.loaders.cached.Loader', TEMPLATE_LOADERS), ) -#============================================================================== +# ============================================================================= # Middleware -#============================================================================== +# ============================================================================= MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware',