Merge branch 'release/1.9.3'

.travis.yml

@@ -1,13 +1,17 @@
 language: python
 python:
   - "2.7"
+sudo: false
+cache:
+  directories:
+    - $HOME/.cache/pip
 services:
   - elasticsearch
 install:
-  - pip install --upgrade pip
-  - pip install -r requirements-dev.txt --use-wheel
-  - pip install -r requirements.txt --use-wheel
-  - pip install -e . --use-wheel
+  - pip install --upgrade pip --download-cache $HOME/.cache/pip
+  - pip install -r requirements-dev.txt --download-cache $HOME/.cache/pip
+  - pip install -r requirements.txt --download-cache $HOME/.cache/pip
+  - pip install -e . --download-cache $HOME/.cache/pip
 script:
   - find ./cms -name '*.py' | xargs pep8
   - find ./cms -name '*.py' | xargs pyflakes

CHANGES.rst

@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+1.9.3
+-----
+- Add uswgi to dependencies
+
 1.9.0
 -----
 - Support remote repos via unicore.distribute.

VERSION

@@ -1 +1 @@
-1.9.1
+1.9.3

cms/__init__.py

@@ -136,6 +136,7 @@ def includeme(config):
     config.add_route('logout', '/logout/')
     config.add_route('redirect_to_login', '/login/hub/')
     config.add_route('api_notify', '/api/notify/', request_method='POST')
+    config.add_route('health', '/health/')
     # NB: this must be last
     config.add_route('flatpage', '/{slug}/')
     config.add_route('flatpage_jinja', '/spice/{slug}/')

cms/tests/test_views.py

@@ -584,3 +584,6 @@ def test_404_page(self):
         resp = self.app.get('/;jsdafjahs;dfjas;', expect_errors=True)
         self.assertTrue('class="page-not-found"'in resp.body)
         self.assertEqual(resp.status_int, 404)
+
+    def test_health(self):
+        self.app.get('/health/', status=200)

cms/views/cms_views.py

@@ -248,6 +248,10 @@ def _get_top_nav(self, locale, order_by):
             language=locale,
             featured_in_navbar=True).order_by(*order_by))
 
+    @view_config(route_name='health', renderer='json')
+    def health(self):
+        return {}
+
     @ga_context(lambda context: {'dt': 'Home', })
     @view_config(route_name='home', renderer='cms:templates/home.pt')
     @view_config(route_name='home_jinja', renderer='cms:templates/home.jinja2')

requirements.txt

@@ -24,3 +24,4 @@ unicore.content>=1.0.4
 unicore.google
 unicore.hub.client>=0.1.1
 pycountry==1.10
+uwsgi==2.0.8