- align with master branch

geonode/local_settings.py.psql_test

@@ -17,7 +17,7 @@ SITENAME = 'GeoNode'
 SITEURL = 'http://localhost:8000/'
 
 DATABASE_ENGINE = 'postgresql_psycopg2'
-DATABASE_NAME = 'geonode_afg'
+DATABASE_NAME = 'geonodes'
 DATABASE_USER = 'geonode'
 DATABASE_PASSWORD = 'geonode'
 DATABASE_HOST = 'localhost'

geonode/messaging/tests.py

@@ -29,6 +29,8 @@ class MessagingTest(GeoNodeBaseTestSupport):
     Tests geonode.messaging
     """
 
+    type = 'layer'
+
     def setUp(self):
         super(MessagingTest, self).setUp()
 

geonode/services/serviceprocessors/arcgis.py

@@ -68,6 +68,8 @@ def __init__(self, url):
         self.proxy_base = None
         self.url = url
         self.parsed_service = ArcMapService(self.url)
+        print(self.parsed_service)
+        print(self.parsed_service.layers)
         extent, srs = utils.get_esri_extent(self.parsed_service)
         _title = self.parsed_service.mapName
         if len(_title) == 0:
@@ -116,6 +118,7 @@ def get_keywords(self):
     def get_resource(self, resource_id):
         ll = None
         try:
+            print(" ****************** %s " % resource_id)
             ll = self.parsed_service.layers[int(resource_id)]
         except BaseException:
             traceback.print_exc()
@@ -306,5 +309,4 @@ def __init__(self, url):
         # ])
 
         self.indexing_method = INDEXED
-        self.name = slugify(
-            _title if _title else urlsplit(self.url).netloc)[:40]
+        self.name = slugify(urlsplit(self.url).netloc)[:40]

geonode/services/serviceprocessors/wms.py

@@ -165,9 +165,11 @@ def get_resources(self):
         of metadata and do not return those.
 
         """
-
-        contents_gen = self.parsed_service.contents.itervalues()
-        return (r for r in contents_gen if not any(r.children))
+        try:
+            contents_gen = self.parsed_service.contents.itervalues()
+            return (r for r in contents_gen if not any(r.children))
+        except:
+            return None
 
     def harvest_resource(self, resource_id, geonode_service):
         """Harvest a single resource from the service

geonode/services/utils.py

@@ -111,7 +111,7 @@ def get_esri_extent(esriobj):
 
     try:
         srs = extent['spatialReference']['wkid']
-    except KeyError, err:
+    except Exception, err:
         logger.error(err, exc_info=True)
 
     return [extent, srs]

geonode/services/views.py

@@ -146,7 +146,7 @@ def harvest_resources(request, service_id):
                 r for r in available_resources if str(r.id) not in already_harvested]
             not_yet_harvested.sort(key=lambda resource: resource.id)
         else:
-            not_yet_harvested = ['Cannot parse resources at this time!']
+            not_yet_harvested = ['Cannot parse any resource at this time!']
             errored_state = True
         paginator = Paginator(
             not_yet_harvested, getattr(settings, "CLIENT_RESULTS_LIMIT", 100))

geonode/settings.py

@@ -457,12 +457,14 @@
             "handlers": ["console"], "level": "ERROR", },
         "geonode": {
             "handlers": ["console"], "level": "INFO", },
+        # "geonode.qgis_server": {
+        #     "handlers": ["console"], "level": "ERROR", },
         "gsconfig.catalog": {
             "handlers": ["console"], "level": "ERROR", },
-        "owslib": {
-            "handlers": ["console"], "level": "ERROR", },
-        "pycsw": {
-            "handlers": ["console"], "level": "ERROR", },
+        # "owslib": {
+        #     "handlers": ["console"], "level": "ERROR", },
+        # "pycsw": {
+        #     "handlers": ["console"], "level": "ERROR", },
         "celery": {
             'handlers': ['celery', 'console'], 'level': 'ERROR', },
     },
@@ -640,8 +642,8 @@
 
 # Django 1.11 ParallelTestSuite
 TEST_RUNNER = 'geonode.tests.suite.runner.GeoNodeBaseSuiteDiscoverRunner'
-TEST_RUNNER_KEEPDB = 0
-TEST_RUNNER_PARALLEL = 4
+TEST_RUNNER_KEEPDB = 1
+TEST_RUNNER_PARALLEL = 1
 
 # GeoNode test suite
 # TEST_RUNNER = 'geonode.tests.suite.runner.DjangoParallelTestSuiteRunner'

package/debian/control

@@ -10,7 +10,7 @@ Vcs-git: git://github.com/GeoNode/geonode.git
 
 Package: geonode
 Architecture: all
-Depends: geoserver-geonode | geoserver, python-django (>=1.8.0), python-virtualenv, python-lxml, python-psycopg2, python-amqp, python-anyjson, python-bs4, python-billiard, python-shapely, python-pil, python-nose, python-httplib2, gdal-bin, libgeos-dev, gettext, postgresql-contrib, postgis, libpq-dev, zip, unzip, libjpeg-dev, libpng12-dev, libxslt1-dev, zlib1g-dev, python-shapely, python-yaml, python-gdal, python-pyproj, libproj-dev, apache2, libapache2-mod-wsgi, python-dev, python-unidecode, python-paver, python-django-nose, python-gsconfig, python-gn-gsimporter, python-owslib, python-pycsw, python-chardet, python-decorator, python-six, python-diff-match-patch, python-django-extensions, python-django-jsonfield, python-django-jsonfield-compat, python-django-leaflet, python-django-taggit, python-django-treebeard, python-django-mptt, python-django-guardian, python-django-suit, python-django-tastypie, python-dj-database-url, python-pinax-notifications, python-pinax-theme-bootstrap, python-django-bootstrap-form, python-django-forms-bootstrap, python-django-friendly-tag-loader, python-django-activity-stream, python-django-geoexplorer, python-django-appconf, python-django-autocomplete-light, python-django-autofixture, python-django-autoslug, python-django-geonode-client, python-django-braces, python-django-modeltranslation, python-geonode-user-messages, python-geonode-avatar, python-geonode-announcements, python-geonode-agon-ratings, python-geonode-arcrest, python-geonode-dialogos, python-django-downloadview, python-geonode-notification, python-geolinks, python-multipartposthandler, python-dateutil, python-django-polymorphic, language-pack-en, python-django-storages, python-celery, python-awesome-slugify, python-pip, python-django-oauth-toolkit, python-oauthlib, python-django-floppyforms, python-django-invitations, python-et-xmlfile, python-unicodecsv, python-urllib3, python-vine, python-django-cors-headers, python-django-multi-email-field, python-psutil, python-user-agents, python-xmljson, python-kombu, python-odfpy, python-sqlalchemy, python-arrow, python-backports.functools-lru-cache, python-certifi, python-click, python-dj-pagination, python-django-allauth, python-django-apptemplates, python-django-basic-authentication-decorator, python-django-bootstrap3-datetimepicker-2, python-django-celery-beat, python-django-celery-results, python-django-cuser, python-django-haystack, python-django-import-export, python-django-js-asset, python-django-model-utils, python-django-rest-swagger, python-django-reversion, python-django-simple-history, python-djangorestframework, python-djangorestframework-gis, python-drf-nested-routers, python-drf-openapi, python-inflection, python-itypes, python-oauthlib, python-openapi-codec, python-openpyxl, python-pep8, python-pinax-notifications, python-poster, python-pyshp, python-python-memcached, python-requests-oauthlib, python-simplejson, python-typing, python-uritemplate, python-tablib, python-ua-parser, python-xlrd, python-xlwt, ${misc:Depends}, ${python:Depends}
+Depends: geoserver-geonode | geoserver, python-django (>=1.8.0), python-virtualenv, python-lxml, python-psycopg2, python-amqp, python-anyjson, python-bs4, python-billiard, python-shapely, python-pil, python-nose, python-httplib2, gdal-bin, libgeos-dev, gettext, postgresql-contrib, postgis, libpq-dev, zip, unzip, libjpeg-dev, libpng12-dev, libxslt1-dev, zlib1g-dev, python-shapely, python-yaml, python-gdal, python-pyproj, libproj-dev, apache2, libapache2-mod-wsgi, python-dev, python-unidecode, python-paver, python-django-nose, python-gsconfig, python-gn-gsimporter, python-owslib, python-pycsw, python-chardet, python-decorator, python-six, python-diff-match-patch, python-django-extensions, python-django-jsonfield, python-django-jsonfield-compat, python-django-leaflet, python-django-taggit, python-django-treebeard, python-django-mptt, python-django-guardian, python-django-suit, python-django-tastypie, python-dj-database-url, python-pinax-notifications, python-pinax-theme-bootstrap, python-django-bootstrap-form, python-django-forms-bootstrap, python-django-friendly-tag-loader, python-django-activity-stream, python-django-geoexplorer, python-django-appconf, python-django-autocomplete-light, python-django-autofixture, python-django-autoslug, python-django-geonode-client, python-django-braces, python-django-modeltranslation, python-geonode-user-messages, python-geonode-avatar, python-geonode-announcements, python-geonode-agon-ratings, python-geonode-dialogos, python-django-downloadview, python-geonode-notification, python-geolinks, python-multipartposthandler, python-dateutil, python-django-polymorphic, language-pack-en, python-django-storages, python-celery, python-awesome-slugify, python-pip, python-django-oauth-toolkit, python-oauthlib, python-django-floppyforms, python-django-invitations, python-et-xmlfile, python-unicodecsv, python-urllib3, python-vine, python-django-cors-headers, python-django-multi-email-field, python-psutil, python-user-agents, python-xmljson, python-kombu, python-odfpy, python-sqlalchemy, python-arrow, python-backports.functools-lru-cache, python-certifi, python-click, python-dj-pagination, python-django-allauth, python-django-apptemplates, python-django-basic-authentication-decorator, python-django-bootstrap3-datetimepicker-2, python-django-celery-beat, python-django-celery-results, python-django-cuser, python-django-haystack, python-django-import-export, python-django-js-asset, python-django-model-utils, python-django-rest-swagger, python-django-reversion, python-django-simple-history, python-djangorestframework, python-djangorestframework-gis, python-drf-nested-routers, python-drf-openapi, python-inflection, python-itypes, python-oauthlib, python-openapi-codec, python-openpyxl, python-pep8, python-pinax-notifications, python-poster, python-pyshp, python-python-memcached, python-requests-oauthlib, python-simplejson, python-typing, python-uritemplate, python-tablib, python-ua-parser, python-xlrd, python-xlwt, ${misc:Depends}, ${python:Depends}
 Recommends: python-gisdata, transifex-client
 Description: Allows the creation, sharing, and collaborative use of geospatial data.
  At its core, the GeoNode has a stack based on GeoServer, pycsw,

pavement.py

@@ -854,7 +854,7 @@ def run_tests(options):
     Executes the entire test suite.
     """
     if options.get('coverage'):
-        prefix = 'coverage run --branch --source=geonode'
+        prefix = 'coverage run --branch --source=geonode --omit="*/management/*,geonode/contrib/*,test*"'
     else:
         prefix = 'python'
     local = options.get('local', 'false')  # travis uses default to false

requirements.txt

@@ -81,7 +81,6 @@ funcsigs==1.0.2
 geolinks==0.2.0
 geonode-agon-ratings==0.3.8
 geonode-announcements==1.0.13
-geonode-arcrest==10.2
 geonode-avatar==2.1.7
 geonode-dialogos==0.9
 geonode-user-messages==0.1.14

requirements_docs.txt

@@ -81,7 +81,6 @@ funcsigs==1.0.2
 geolinks==0.2.0
 geonode-agon-ratings==0.3.8
 geonode-announcements==1.0.13
-geonode-arcrest==10.2
 geonode-avatar==2.1.7
 geonode-dialogos==0.9
 geonode-user-messages==0.1.14

setup.py

@@ -154,7 +154,7 @@
             "geonode-avatar<=2.1.7",  # python-geonode-avatar (2.1.7 in our ppa)
             "geonode-announcements<=1.0.13",  # python-geonode-announcements (1.0.13 in our ppa)
             "geonode-agon-ratings<=0.3.8",  # python-geonode-agon-ratings (0.3.8 in our ppa)
-            "geonode-arcrest>=10.0",  # python-geonode-arcrest (10.2 in our ppa)
+            "arcrest>=10.0",  # TODO
             "geonode-dialogos<=0.9",  # python-geonode-dialogos (0.9 in our ppa)
             "gsconfig<2.0.0",  # python-gsconfig (1.0.8 in our ppa)
             "gn-gsimporter<2.0.0",  # python-gn-gsimporter (1.0.2 in our ppa)