Merge pull request #163 from cartologic/stand_alone

minor bug fixes and improvements

.travis.yml

@@ -0,0 +1,54 @@
+sudo: required
+
+language: python
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+
+before_cache:
+  - rm -f $HOME/.cache/pip/log/debug.log
+
+python:
+  - "2.7"
+
+virtualenv:
+  system_site_packages: true
+
+branches:
+  only:
+    - master
+    - stand_alone
+
+install:
+  - sudo apt-get -qq -y update
+  - sudo apt-get purge postgresql* -y
+  - sudo apt-get install software-properties-common python-software-properties -y
+  - sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
+  - sudo apt-get -qq -y update
+  - sudo apt-get upgrade -y --allow-unauthenticated
+  - sudo apt-get install -y gcc gettext python-pip libpq-dev sqlite3 git gdal-bin lsof psmisc
+  - sudo apt-get install -y python-gdal python-psycopg2 python-imaging python-lxml
+  - sudo apt-get install -y python-dev libgdal-dev libgeoip-dev python-ldap libxml2 libxml2-dev libxslt-dev git default-jdk
+  - sudo apt-get install -y libmemcached-dev libsasl2-dev zlib1g-dev python-pylibmc python-setuptools
+  - sudo apt-get install -y curl build-essential build-essential python-dev libffi-dev libssl-dev
+  - sudo add-apt-repository -y ppa:webupd8team/java
+  - sudo apt-get update
+  - sudo apt-get install -y --force-yes oracle-java8-installer ant maven2 --no-install-recommends
+  - sudo update-java-alternatives --set java-8-oracle
+  - pip install celery
+  - pip install geonode>2.7.5.dev20180125135927
+  - pip install -e . --upgrade
+  - pip install django-autocomplete-light==2.3.3
+  - pip install coveralls
+
+script:
+  - coverage run --source=cartoview --omit="*/migrations/*,*/apps/*" ./manage.py test
+
+after_success:
+  - coveralls
+
+notifications:
+  email:
+    - hisham.karam@cartologic.com
+    - hishamwaleedkaram@gmail.com

README.md

@@ -28,6 +28,7 @@
       ```
   - open your browser and type the following address `10.5.0.4`
   - default user credentials `admin/admin` for cartoview and `admin/geoserver` for geoserver
+  - you need to configure oauth in geonode and geoserver to do this please use this [link](http://docs.geonode.org/en/master/tutorials/admin/geoserver_geonode_security/index.html)
   - you can stop containers with `make down` or `docker-compose down`
   - you can get logs for each service in `docker-compose.yml` unsing the following command:
       - `docker-compose logs --follow --tail=100 <service_name>`
@@ -65,5 +66,6 @@
           INSTALLED_APPS += load_apps()
           ```
       - restart your server
+
 ## Docs:
   - [How to use and install](http://cartologic.github.io)

cartoview/__init__.py

@@ -1,6 +1,6 @@
 from .celery import app
 
-__version__ = (1, 8, 2, 'rc', 0)
+__version__ = (1, 8, 2, 'rc', 1)
 __compatible_with__ = []
 
 

cartoview/app_manager/api.py

@@ -3,18 +3,22 @@
 import warnings
 from builtins import *
 
-from django.conf.urls import include, patterns, url
+from django.conf.urls import include, url
 from django.shortcuts import render
 from future import standard_library
 from tastypie.api import Api as TastypieApi
 from tastypie.utils import trailing_slash
-
 from .serializers import HTMLSerializer
 from cartoview.log_handler import get_logger
 logger = get_logger(__name__)
 standard_library.install_aliases()
 
 
+def home(request):
+    return render(request, 'app_manager/rest_api/home.html',
+                  {'apis': sorted(rest_api.apis.keys())})
+
+
 class BaseApi(TastypieApi):
     """
     A version of the Api that doesn't require a name.
@@ -47,7 +51,8 @@ def urls(self):
         for name in sorted(self._registry.keys()):
             resource = self._registry[name]
             resource.api_name = self.api_name
-            pattern_list.append((r"^%s" % api_pattern, include(resource.urls)))
+            pattern_list.append(
+                url(r"^%s" % api_pattern, include(resource.urls)))
 
         urlpatterns = self.prepend_urls()
         overridden_urls = self.override_urls()
@@ -60,7 +65,7 @@ def urls(self):
 
             urlpatterns += overridden_urls
 
-        urlpatterns += patterns('', *pattern_list)
+        urlpatterns += pattern_list
         return urlpatterns
 
 
@@ -85,13 +90,13 @@ def register(self, resource, app_name=None, canonical=True):
     def urls(self):
         pattern_list = [
             url(r'^$',
-                'cartoview.app_manager.api.home',
+                home,
                 name='cartoview_rest_url'),
         ]
         for name in sorted(self.apis.keys()):
             pattern_list.append(
                 url(r"^%s/" % name, include(self.apis[name].urls)))
-        self.urlpatterns = patterns('', *pattern_list)
+        self.urlpatterns = pattern_list
         return self.urlpatterns
 
     def register_app_urls(self, app_name):
@@ -100,8 +105,3 @@ def register_app_urls(self, app_name):
 
 
 rest_api = Api()
-
-
-def home(request):
-    return render(request, 'app_manager/rest_api/home.html',
-                  {'apis': sorted(rest_api.apis.keys())})

cartoview/app_manager/helpers.py

@@ -1,6 +1,8 @@
 import os
 import stat
 world_permission = 0o777
+from cartoview.log_handler import get_logger
+logger = get_logger(__name__)
 
 
 def create_direcotry(path, mode=0777):
@@ -10,6 +12,8 @@ def create_direcotry(path, mode=0777):
         try:
             previous_mask = os.umask(0)
             os.makedirs(path, mode=mode)
+        except OSError as e:
+            logger.error(e.message)
         finally:
             # set the previous mask back
             os.umask(previous_mask)