2.10.0 rc1

GeoNode · Aug 23, 2018 · 9b16b98 · 9b16b98
1 parent 51e6253
commit 9b16b98
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include README README.rst LICENSE
+include README README.rst LICENSE requirements.txt
 recursive-exclude geonode/static/.components
 recursive-include geonode *.css *.eot *.gif *.html *.ico *.ini *.jpg *.js *.json *.less *.md *.mo *.po *.otf *.png *.rst *.sample *.svg *.swf *.ttf *.txt *.woff *.woff2 *.xml *.xsl README
 recursive-include geonode/contrib/geosites gunicorn nginx
diff --git a/geonode/__init__.py b/geonode/__init__.py
@@ -20,7 +20,7 @@
 
 import os
 
-__version__ = (2, 10, 0, 'rc', 0)
+__version__ = (2, 10, 0, 'rc', 1)
 
 
 default_app_config = "geonode.apps.AppConfig"

diff --git a/package/debian/changelog b/package/debian/changelog
@@ -1,5 +1,4 @@
-geonode (2.10.0+rc0) bionic; urgency=high 
-  * [aad19ab96] 2018-07-31 - (Alessio Fabiani  )  Merge pull request #3865 from geosolutions-it/master
+geonode (2.10.0+rc1) bionic; urgency=high   * [aad19ab96] 2018-07-31 - (Alessio Fabiani  )  Merge pull request #3865 from geosolutions-it/master
   * [dfa999fdb] 2018-07-31 - (afabiani         )   - #3180 restoring angular 1.4.0
   * [573a6a9c3] 2018-07-31 - (afabiani         )  Merge branch 'master' of https://github.com/GeoNode/geonode
   * [0403b8f32] 2018-07-31 - (Alessio Fabiani  )  Merge pull request #3866 from t-book/master

diff --git a/package/support/geonode.local_settings b/package/support/geonode.local_settings
@@ -137,10 +137,10 @@ OGC_SERVER = {
 
 # If you want to enable Mosaics use the following configuration
 UPLOADER = {
-    # 'BACKEND': 'geonode.rest',
-    'BACKEND': 'geonode.importer',
+    'BACKEND': 'geonode.rest',
+    # 'BACKEND': 'geonode.importer',
     'OPTIONS': {
-        'TIME_ENABLED': True,
+        'TIME_ENABLED': False,
         'MOSAIC_ENABLED': False,
         'GEOGIG_ENABLED': False,
     },
@@ -252,7 +252,7 @@ PYCSW = {
     }
 }
 
-GEONODE_ROOT = os.path.dirname(geonode.__file__)
+GEONODE_ROOT = os.path.abspath(os.path.dirname(__file__))
 
 TEMPLATE_DIRS = (
     '/etc/geonode/templates',

diff --git a/setup.py b/setup.py
@@ -46,6 +46,13 @@
       url='http://geonode.org',
       license='GPL',
       packages=find_packages(),
+      package_data = {
+        '': ['*.*'],
+        '': ['static/*.*'],
+        'static': ['*.*'],
+        '': ['templates/*.*'],
+        'templates': ['*.*'],
+      },
       include_package_data=True,
       install_requires=REQUIREMENTS,
       zip_safe=False