2.10.0 rc2

GeoNode · Aug 23, 2018 · 699c8e1 · 699c8e1
1 parent ca87059
commit 699c8e1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/geonode/__init__.py b/geonode/__init__.py
@@ -20,7 +20,7 @@
 
 import os
 
-__version__ = (2, 10, 0, 'rc', 1)
+__version__ = (2, 10, 0, 'rc', 2)
 
 
 default_app_config = "geonode.apps.AppConfig"

diff --git a/package/install.sh b/package/install.sh
@@ -42,6 +42,7 @@ function reorganize_configuration() {
     cp -rp $INSTALL_DIR/support/geonode.wsgi $GEONODE_WWW/wsgi/
     cp -rp $INSTALL_DIR/support/geonode.robots $GEONODE_WWW/robots.txt
     cp -rp $INSTALL_DIR/support/geonode.binary $GEONODE_BIN/geonode
+    cp -rp $INSTALL_DIR/support/packages/*.* $GEONODE_SHARE
     cp -rp $INSTALL_DIR/GeoNode*.zip $GEONODE_SHARE
     cp -rp $INSTALL_DIR/support/geonode.updateip $GEONODE_BIN/geonode-updateip
     cp -rp $INSTALL_DIR/support/geonode.admin $GEONODE_SHARE/admin.json
@@ -70,6 +71,7 @@ psql -d geonode_data -c 'CREATE EXTENSION postgis'
 EOF
 su - postgres -c "psql" <<EOF
 CREATE ROLE geonode WITH LOGIN PASSWORD '$psqlpass' SUPERUSER INHERIT;
+ALTER USER geonode WITH PASSWORD '$psqlpass';
 EOF
 }
 
@@ -83,8 +85,11 @@ function setup_django_once() {
 }
 
 function setup_django_every_time() {
-    pip install pip==9.0.3 --quiet
+    pip install pip --upgrade --quiet
     pip install $GEONODE_SHARE/GeoNode-*.zip --no-dependencies --quiet
+    pip install $GEONODE_SHARE/jwcrypto-0.5.0-py2.py3-none-any.whl --no-dependencies --no-cache-dir --quiet
+    pip install $GEONODE_SHARE/xmltodict-0.10.2.tar.gz --no-dependencies --no-cache-dir --quiet
+    pip install $GEONODE_SHARE/lxml-3.6.2.tar.gz --no-dependencies --no-cache-dir --quiet
 
     geonodedir=`python -c "import geonode;import os;print os.path.dirname(geonode.__file__)"`
 

diff --git a/package/support/packages/jwcrypto-0.5.0-py2.py3-none-any.whl b/package/support/packages/jwcrypto-0.5.0-py2.py3-none-any.whl
diff --git a/package/support/packages/lxml-3.6.2.tar.gz b/package/support/packages/lxml-3.6.2.tar.gz
diff --git a/package/support/packages/xmltodict-0.10.2.tar.gz b/package/support/packages/xmltodict-0.10.2.tar.gz