Skip to content

Commit

Permalink
- Bump version to 2.10rc5
Browse files Browse the repository at this point in the history
  • Loading branch information
afabiani committed Apr 19, 2019
1 parent 71a331c commit 87799fd
Show file tree
Hide file tree
Showing 19 changed files with 927 additions and 23 deletions.
11 changes: 4 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,10 @@ install:
sudo apt-get install -y libgdal1i python-gdal gdal-bin spatialite-bin;
sudo apt-get install -y python-virtualenv python-imaging python-lxml python-pyproj python-shapely python-httplib2 python-httplib2 gettext;
sudo apt-get install -y python-dev libxml2 libxml2-dev libxslt1-dev zlib1g-dev libjpeg-dev libpq-dev libgdal-dev git default-jdk;
sudo apt-add-repository -y ppa:webupd8team/java; sudo apt update;
echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections;
echo debconf shared/accepted-oracle-license-v1-1 seen true | sudo debconf-set-selections;
sudo apt install -y oracle-java8-set-default ant maven;
sudo update-java-alternatives --set java-8-oracle;
export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
export PATH=$JAVA_HOME'bin/java':$PATH
sudo apt install -y openjdk-8-jre openjdk-8-jdk ant maven;
sudo update-java-alternatives --set java-1.8.0-openjdk-amd64;
export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::");
export PATH=$JAVA_HOME'bin/java':$PATH;
pip install -r requirements.txt --upgrade;
pip install -e . --upgrade;
pip install pygdal==`gdal-config --version`.*;
Expand Down
7 changes: 4 additions & 3 deletions docs/reference/worldmap.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ We are assuming a Ubuntu 16.04.1 LTS development environment, but these instruct
sudo apt-get install python-virtualenv python-dev libxml2 libxml2-dev libxslt1-dev zlib1g-dev libjpeg-dev libpq-dev libgdal-dev git default-jdk postgresql postgis

# Install Java 8 (needed by latest GeoServer 2.14)
sudo apt-add-repository ppa:webupd8team/java
sudo apt-get update
sudo apt-get install oracle-java8-installer
sudo apt install -y openjdk-8-jre openjdk-8-jdk
sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
export PATH=$JAVA_HOME'bin/java':$PATH

Virtual environment creation and installation of Python packages
----------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ packages
$ sudo apt-get install python-virtualenv python-dev libxml2 libxml2-dev libxslt1-dev zlib1g-dev libjpeg-dev libpq-dev git default-jdk
$ sudo apt-get install build-essential openssh-server gettext nano vim unzip zip patch git-core postfix

$ sudo apt-add-repository ppa:webupd8team/java
$ sudo apt-get update
$ sudo apt-get install oracle-java8-installer
$ sudo apt install -y openjdk-8-jre openjdk-8-jdk
$ sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
$ export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
$ export PATH=$JAVA_HOME'bin/java':$PATH

$ sudo apt-add-repository ppa:ubuntugis && sudo apt-get update && sudo apt-get upgrade
$ sudo apt-add-repository ppa:ubuntugis/ppa && sudo apt-get update && sudo apt-get upgrade
Expand Down
7 changes: 4 additions & 3 deletions docs/tutorials/install_and_admin/quick_install.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,10 @@ This option installs geonode in a virtual environment. This option is very usefu
sudo apt-get install python-virtualenv python-dev libxml2 libxml2-dev libxslt1-dev zlib1g-dev libjpeg-dev libpq-dev gdal libgdal-dev git default-jdk

# Install Java 8 (needed by latest GeoServer 2.9)
sudo apt-add-repository ppa:webupd8team/java
sudo apt-get update
sudo apt-get install oracle-java8-installer
sudo apt install -y openjdk-8-jre openjdk-8-jdk
sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
export PATH=$JAVA_HOME'bin/java':$PATH

# Create and activate the virtulenv
virtualenv --no-site-packages env
Expand Down
2 changes: 1 addition & 1 deletion geonode/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import os

__version__ = (2, 10, 0, 'rc', 4)
__version__ = (2, 10, 0, 'rc', 5)


default_app_config = "geonode.apps.AppConfig"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-04-04 08:29
from __future__ import unicode_literals

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

replaces = [(b'base', '0027_auto_20170801_1228'), (b'base', '0028_resourcebase_is_approved'), (b'base', '0029_auto_20171114_0341'), (b'base', '0030_auto_20180309_0833'), (b'base', '0031_auto_20180309_0837'), (b'base', '0032_auto_20180329_1844'), (b'base', '0033_auto_20180330_0951'), (b'base', '0034_auto_20180606_1543'), (b'base', '0035_resourcebase_dirty_state'), (b'base', '0036_auto_20190129_1433'), (b'base', '0037_auto_20190222_1347')]

dependencies = [
('base', '26_to_27'),
]

operations = [
migrations.AlterField(
model_name='resourcebase',
name='abstract',
field=models.TextField(blank=True, help_text='brief narrative summary of the content of the resource(s)', max_length=2000, verbose_name='abstract'),
),
migrations.AlterField(
model_name='resourcebase',
name='data_quality_statement',
field=models.TextField(blank=True, help_text="general explanation of the data producer's knowledge about the lineage of a dataset", max_length=2000, null=True, verbose_name='data quality statement'),
),
migrations.AlterField(
model_name='resourcebase',
name='purpose',
field=models.TextField(blank=True, help_text='summary of the intentions with which the resource(s) was developed', max_length=500, null=True, verbose_name='purpose'),
),
migrations.AlterField(
model_name='resourcebase',
name='supplemental_information',
field=models.TextField(default='No information provided', help_text='any other descriptive information about the dataset', max_length=2000, verbose_name='supplemental information'),
),
migrations.AddField(
model_name='resourcebase',
name='is_approved',
field=models.BooleanField(default=True, help_text='Is this resource validated from a publisher or editor?', verbose_name='Approved'),
),
migrations.AlterField(
model_name='resourcebase',
name='language',
field=models.CharField(choices=[(b'abk', b'Abkhazian'), (b'aar', b'Afar'), (b'afr', b'Afrikaans'), (b'amh', b'Amharic'), (b'ara', b'Arabic'), (b'asm', b'Assamese'), (b'aym', b'Aymara'), (b'aze', b'Azerbaijani'), (b'bak', b'Bashkir'), (b'ben', b'Bengali'), (b'bih', b'Bihari'), (b'bis', b'Bislama'), (b'bre', b'Breton'), (b'bul', b'Bulgarian'), (b'bel', b'Byelorussian'), (b'cat', b'Catalan'), (b'cos', b'Corsican'), (b'dan', b'Danish'), (b'dzo', b'Dzongkha'), (b'eng', b'English'), (b'fra', b'French'), (b'epo', b'Esperanto'), (b'est', b'Estonian'), (b'fao', b'Faroese'), (b'fij', b'Fijian'), (b'fin', b'Finnish'), (b'fry', b'Frisian'), (b'glg', b'Gallegan'), (b'ger', b'German'), (b'gre', b'Greek'), (b'kal', b'Greenlandic'), (b'grn', b'Guarani'), (b'guj', b'Gujarati'), (b'hau', b'Hausa'), (b'heb', b'Hebrew'), (b'hin', b'Hindi'), (b'hun', b'Hungarian'), (b'ind', b'Indonesian'), (b'ina', b'Interlingua (International Auxiliary language Association)'), (b'iku', b'Inuktitut'), (b'ipk', b'Inupiak'), (b'ita', b'Italian'), (b'jpn', b'Japanese'), (b'kan', b'Kannada'), (b'kas', b'Kashmiri'), (b'kaz', b'Kazakh'), (b'khm', b'Khmer'), (b'kin', b'Kinyarwanda'), (b'kir', b'Kirghiz'), (b'kor', b'Korean'), (b'kur', b'Kurdish'), (b'oci', b"Langue d 'Oc (post 1500)"), (b'lao', b'Lao'), (b'lat', b'Latin'), (b'lav', b'Latvian'), (b'lin', b'Lingala'), (b'lit', b'Lithuanian'), (b'mlg', b'Malagasy'), (b'mlt', b'Maltese'), (b'mar', b'Marathi'), (b'mol', b'Moldavian'), (b'mon', b'Mongolian'), (b'nau', b'Nauru'), (b'nep', b'Nepali'), (b'nor', b'Norwegian'), (b'ori', b'Oriya'), (b'orm', b'Oromo'), (b'pan', b'Panjabi'), (b'pol', b'Polish'), (b'por', b'Portuguese'), (b'pus', b'Pushto'), (b'que', b'Quechua'), (b'roh', b'Rhaeto-Romance'), (b'run', b'Rundi'), (b'rus', b'Russian'), (b'smo', b'Samoan'), (b'sag', b'Sango'), (b'san', b'Sanskrit'), (b'scr', b'Serbo-Croatian'), (b'sna', b'Shona'), (b'snd', b'Sindhi'), (b'sin', b'Singhalese'), (b'ssw', b'Siswant'), (b'slv', b'Slovenian'), (b'som', b'Somali'), (b'sot', b'Sotho'), (b'spa', b'Spanish'), (b'sun', b'Sudanese'), (b'swa', b'Swahili'), (b'tgl', b'Tagalog'), (b'tgk', b'Tajik'), (b'tam', b'Tamil'), (b'tat', b'Tatar'), (b'tel', b'Telugu'), (b'tha', b'Thai'), (b'tir', b'Tigrinya'), (b'tog', b'Tonga (Nyasa)'), (b'tso', b'Tsonga'), (b'tsn', b'Tswana'), (b'tur', b'Turkish'), (b'tuk', b'Turkmen'), (b'twi', b'Twi'), (b'uig', b'Uighur'), (b'ukr', b'Ukrainian'), (b'urd', b'Urdu'), (b'uzb', b'Uzbek'), (b'vie', b'Vietnamese'), (b'vol', b'Volap\xc3\xbck'), (b'wol', b'Wolof'), (b'xho', b'Xhosa'), (b'yid', b'Yiddish'), (b'yor', b'Yoruba'), (b'zha', b'Zhuang'), (b'zul', b'Zulu')], default=b'eng', help_text='language used within the dataset', max_length=3, verbose_name='language'),
),
migrations.AlterField(
model_name='region',
name='bbox_x0',
field=models.DecimalField(blank=True, decimal_places=10, max_digits=30, null=True),
),
migrations.AlterField(
model_name='region',
name='bbox_x1',
field=models.DecimalField(blank=True, decimal_places=10, max_digits=30, null=True),
),
migrations.AlterField(
model_name='region',
name='bbox_y0',
field=models.DecimalField(blank=True, decimal_places=10, max_digits=30, null=True),
),
migrations.AlterField(
model_name='region',
name='bbox_y1',
field=models.DecimalField(blank=True, decimal_places=10, max_digits=30, null=True),
),
migrations.AlterField(
model_name='region',
name='bbox_x0',
field=models.DecimalField(blank=True, decimal_places=15, max_digits=30, null=True),
),
migrations.AlterField(
model_name='region',
name='bbox_x1',
field=models.DecimalField(blank=True, decimal_places=15, max_digits=30, null=True),
),
migrations.AlterField(
model_name='region',
name='bbox_y0',
field=models.DecimalField(blank=True, decimal_places=15, max_digits=30, null=True),
),
migrations.AlterField(
model_name='region',
name='bbox_y1',
field=models.DecimalField(blank=True, decimal_places=15, max_digits=30, null=True),
),
migrations.AlterField(
model_name='resourcebase',
name='bbox_x0',
field=models.DecimalField(blank=True, decimal_places=15, max_digits=30, null=True),
),
migrations.AlterField(
model_name='resourcebase',
name='bbox_x1',
field=models.DecimalField(blank=True, decimal_places=15, max_digits=30, null=True),
),
migrations.AlterField(
model_name='resourcebase',
name='bbox_y0',
field=models.DecimalField(blank=True, decimal_places=15, max_digits=30, null=True),
),
migrations.AlterField(
model_name='resourcebase',
name='bbox_y1',
field=models.DecimalField(blank=True, decimal_places=15, max_digits=30, null=True),
),
migrations.AlterField(
model_name='region',
name='srid',
field=models.CharField(default=b'EPSG:4326', max_length=30),
),
migrations.AlterField(
model_name='resourcebase',
name='srid',
field=models.CharField(default=b'EPSG:4326', max_length=30),
),
migrations.AlterField(
model_name='resourcebase',
name='metadata_uploaded_preserve',
field=models.BooleanField(default=False, verbose_name='Metadata uploaded preserve'),
),
migrations.AlterField(
model_name='resourcebase',
name='thumbnail_url',
field=models.TextField(blank=True, null=True, verbose_name='Thumbnail url'),
),
migrations.AlterField(
model_name='resourcebase',
name='tkeywords',
field=models.ManyToManyField(blank=True, help_text='formalised word(s) or phrase(s) from a fixed thesaurus used to describe the subject (space or comma-separated', to=b'base.ThesaurusKeyword', verbose_name='keywords'),
),
migrations.AddField(
model_name='resourcebase',
name='dirty_state',
field=models.BooleanField(default=False, help_text='Security Rules Are Not Synched with GeoServer!', verbose_name='Dirty State'),
),
migrations.CreateModel(
name='Menu',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255)),
('order', models.IntegerField()),
],
options={
'ordering': ['order'],
},
),
migrations.CreateModel(
name='MenuItem',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255)),
('order', models.IntegerField()),
('blank_target', models.BooleanField()),
('url', models.CharField(max_length=2000)),
('menu', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='base.Menu')),
],
options={
'ordering': ['order'],
},
),
migrations.CreateModel(
name='MenuPlaceholder',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255, unique=True)),
],
),
migrations.AddField(
model_name='menu',
name='placeholder',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='base.MenuPlaceholder'),
),
migrations.AlterUniqueTogether(
name='menuitem',
unique_together=set([('menu', 'order'), ('menu', 'title')]),
),
migrations.AlterUniqueTogether(
name='menu',
unique_together=set([('placeholder', 'order'), ('placeholder', 'title')]),
),
migrations.AlterField(
model_name='resourcebase',
name='language',
field=models.CharField(choices=[(b'abk', b'Abkhazian'), (b'aar', b'Afar'), (b'afr', b'Afrikaans'), (b'amh', b'Amharic'), (b'ara', b'Arabic'), (b'asm', b'Assamese'), (b'aym', b'Aymara'), (b'aze', b'Azerbaijani'), (b'bak', b'Bashkir'), (b'ben', b'Bengali'), (b'bih', b'Bihari'), (b'bis', b'Bislama'), (b'bre', b'Breton'), (b'bul', b'Bulgarian'), (b'bel', b'Byelorussian'), (b'cat', b'Catalan'), (b'chi', b'Chinese'), (b'cos', b'Corsican'), (b'dan', b'Danish'), (b'dzo', b'Dzongkha'), (b'eng', b'English'), (b'fra', b'French'), (b'epo', b'Esperanto'), (b'est', b'Estonian'), (b'fao', b'Faroese'), (b'fij', b'Fijian'), (b'fin', b'Finnish'), (b'fry', b'Frisian'), (b'glg', b'Gallegan'), (b'ger', b'German'), (b'gre', b'Greek'), (b'kal', b'Greenlandic'), (b'grn', b'Guarani'), (b'guj', b'Gujarati'), (b'hau', b'Hausa'), (b'heb', b'Hebrew'), (b'hin', b'Hindi'), (b'hun', b'Hungarian'), (b'ind', b'Indonesian'), (b'ina', b'Interlingua (International Auxiliary language Association)'), (b'iku', b'Inuktitut'), (b'ipk', b'Inupiak'), (b'ita', b'Italian'), (b'jpn', b'Japanese'), (b'kan', b'Kannada'), (b'kas', b'Kashmiri'), (b'kaz', b'Kazakh'), (b'khm', b'Khmer'), (b'kin', b'Kinyarwanda'), (b'kir', b'Kirghiz'), (b'kor', b'Korean'), (b'kur', b'Kurdish'), (b'oci', b"Langue d 'Oc (post 1500)"), (b'lao', b'Lao'), (b'lat', b'Latin'), (b'lav', b'Latvian'), (b'lin', b'Lingala'), (b'lit', b'Lithuanian'), (b'mlg', b'Malagasy'), (b'mlt', b'Maltese'), (b'mar', b'Marathi'), (b'mol', b'Moldavian'), (b'mon', b'Mongolian'), (b'nau', b'Nauru'), (b'nep', b'Nepali'), (b'nor', b'Norwegian'), (b'ori', b'Oriya'), (b'orm', b'Oromo'), (b'pan', b'Panjabi'), (b'pol', b'Polish'), (b'por', b'Portuguese'), (b'pus', b'Pushto'), (b'que', b'Quechua'), (b'roh', b'Rhaeto-Romance'), (b'run', b'Rundi'), (b'rus', b'Russian'), (b'smo', b'Samoan'), (b'sag', b'Sango'), (b'san', b'Sanskrit'), (b'scr', b'Serbo-Croatian'), (b'sna', b'Shona'), (b'snd', b'Sindhi'), (b'sin', b'Singhalese'), (b'ssw', b'Siswant'), (b'slv', b'Slovenian'), (b'som', b'Somali'), (b'sot', b'Sotho'), (b'spa', b'Spanish'), (b'sun', b'Sudanese'), (b'swa', b'Swahili'), (b'tgl', b'Tagalog'), (b'tgk', b'Tajik'), (b'tam', b'Tamil'), (b'tat', b'Tatar'), (b'tel', b'Telugu'), (b'tha', b'Thai'), (b'tir', b'Tigrinya'), (b'tog', b'Tonga (Nyasa)'), (b'tso', b'Tsonga'), (b'tsn', b'Tswana'), (b'tur', b'Turkish'), (b'tuk', b'Turkmen'), (b'twi', b'Twi'), (b'uig', b'Uighur'), (b'ukr', b'Ukrainian'), (b'urd', b'Urdu'), (b'uzb', b'Uzbek'), (b'vie', b'Vietnamese'), (b'vol', b'Volap\xc3\xbck'), (b'wol', b'Wolof'), (b'xho', b'Xhosa'), (b'yid', b'Yiddish'), (b'yor', b'Yoruba'), (b'zha', b'Zhuang'), (b'zul', b'Zulu')], default=b'eng', help_text='language used within the dataset', max_length=3, verbose_name='language'),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-04-04 08:32
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

replaces = [(b'geonode_client', '0002_auto_20180412_1039'), (b'geonode_client', '0003_geonodethemecustomization_jumbotron_welcome_hide'), (b'geonode_client', '0004_auto_20180416_1319'), (b'geonode_client', '0005_auto_20181015_1201')]

dependencies = [
('geonode_client', '0001_initial'),
]

operations = [
migrations.AddField(
model_name='geonodethemecustomization',
name='partners_title',
field=models.CharField(blank=True, default=b'Our Partners', max_length=100, null=True),
),
migrations.AddField(
model_name='geonodethemecustomization',
name='jumbotron_welcome_hide',
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name='geonodethemecustomization',
name='jumbotron_site_description',
field=models.TextField(blank=True, null=True),
),
migrations.AddField(
model_name='geonodethemecustomization',
name='jumbotron_welcome_content',
field=models.TextField(blank=True, null=True),
),
migrations.AddField(
model_name='geonodethemecustomization',
name='jumbotron_welcome_title',
field=models.CharField(blank=True, max_length=255, null=True),
),
migrations.DeleteModel(
name='GeoNodeThemeCustomization',
),
]

0 comments on commit 87799fd

Please sign in to comment.