Merge pull request #898 from mitodl/release-candidate

Release 0.16.0 - will merge in spite of the bug that @amir-qayyum-khan reported.  That bug occurs in a use case unlikely to occur in production.

.env.example

@@ -0,0 +1 @@
+STATUS_TOKEN=

README.rst

@@ -70,7 +70,7 @@ asset compression, along with `django-compressor-requirejs
 creating requirejs packages.  What this means to you is that you need
 to do static asset additions in your templates with something like:
 
-.. code-block:: html
+.. code-block:: django
 
   {% load compress %}
 
@@ -147,4 +147,4 @@ RESTful API Documentation
 =========================
 
 LORE has a RESTful API that is documented on Apiary
-`http://docs.lore.apiary.io <http://docs.lore.apiary.io>`_ .
+`http://docs.lore.apiary.io <http://docs.lore.apiary.io>`_ .

RELEASE.rst

@@ -1,6 +1,15 @@
 Release Notes
 -------------
 
+Version 0.16.0
+==============
+
+- Sorted vocabularies in api as well as taxonomy panel
+- Replaced the status app with django-server-status
+- Added warning message when user try to close learning resource panel without saving
+- Updated Django requirement to latest security release
+- ISSUE #876 Fixed doc build failure
+
 Version 0.15.1
 ==============
 

docker-compose.yml

@@ -2,20 +2,24 @@ db:
   image: postgres
   ports:
     - "5432"
+
 redis:
   image: redis
   ports:
     - "6379"
+
 elastic:
   image: elasticsearch
   command: elasticsearch -Des.network.host=0.0.0.0
   ports:
     - "9200"
+
 stats:
   image: kamon/grafana_graphite
   ports:
     - "8125/udp:8125/udp"
     - "8071:80"
+
 web:
   build: .
   mem_limit: 384m
@@ -45,13 +49,15 @@ web:
     CELERY_RESULT_BACKEND: redis://redis:6379/4
     BROKER_URL: redis://redis:6379/4
     HAYSTACK_URL: elastic:9200
+  env_file: .env
   ports:
     - "8070:8070"
   links:
     - db
     - redis
     - elastic
     - stats
+
 celery:
   image: lore_web
   mem_limit: 384m

lore/settings.py

@@ -15,7 +15,7 @@
 from django.core.exceptions import ImproperlyConfigured
 import yaml
 
-VERSION = '0.15.1'
+VERSION = "0.16.0"
 
 CONFIG_PATHS = [
     os.environ.get('LORE_CONFIG', ''),
@@ -98,6 +98,7 @@ def get_var(name, default):
     'search',
     'roles',
     'xanalytics',
+    'server_status',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -374,6 +375,7 @@ def get_var(name, default):
 }
 
 # Celery
+USE_CELERY = True
 BROKER_URL = get_var("BROKER_URL", get_var("REDISCLOUD_URL", None))
 CELERY_RESULT_BACKEND = get_var(
     "CELERY_RESULT_BACKEND", get_var("REDISCLOUD_URL", None)
@@ -396,7 +398,8 @@ def get_var(name, default):
 
 XANALYTICS_URL = get_var('XANALYTICS_URL', "")
 
-# Token required to access the status page.
+# server-status
+HEALTH_CHECK = ['CELERY', 'REDIS', 'POSTGRES', 'ELASTIC_SEARCH']
 STATUS_TOKEN = get_var(
     "STATUS_TOKEN",
     "7E17C32A63B2810F0053DE454FC8395CA3262CCB8392D2307887C5E67F132550"

requirements.txt

@@ -1,6 +1,6 @@
 # Core project/common requirements
 celery==3.1.19
-Django==1.8.7
+Django==1.8.11
 django-appconf==1.0.1
 django-bootstrap3==6.2.2
 
@@ -42,3 +42,4 @@ beautifulsoup4==4.4.1
 
 # Application monitoring requirements
 newrelic==2.58.1.44
+django-server-status==0.3

rest/tests/test_vocabulary.py

@@ -482,7 +482,7 @@ def test_vocabulary_pagination(self):
                 weight=1000,
             )).data for i in range(40)]
 
-        expected.sort(key=lambda x: x["id"])
+        expected.sort(key=lambda x: x["name"])
 
         resp = self.client.get(
             '{repo_base}{repo_slug}/vocabularies/'.format(
@@ -494,8 +494,8 @@ def test_vocabulary_pagination(self):
         self.assertEqual(40, vocabularies['count'])
 
         # Sort both lists in preparation for comparisons.
-        expected.sort(key=lambda x: x["id"])
-        from_api = sorted(vocabularies['results'], key=lambda x: x["id"])
+        expected.sort(key=lambda x: x["name"])
+        from_api = sorted(vocabularies['results'], key=lambda x: x["name"])
 
         expected_count = 20
         self.assertEqual(expected_count, len(from_api))
@@ -511,7 +511,7 @@ def test_vocabulary_pagination(self):
             ))
         self.assertEqual(HTTP_200_OK, resp.status_code)
         vocabularies = as_json(resp)
-        from_api = sorted(vocabularies['results'], key=lambda x: x["id"])
+        from_api = sorted(vocabularies['results'], key=lambda x: x["name"])
         self.assertEqual(expected_count, len(from_api))
         self.assertEqual(40, vocabularies['count'])
         self.assertEqual(

rest/views.py

@@ -8,6 +8,7 @@
 from django.contrib.auth.models import User
 from django.core.exceptions import PermissionDenied as DjangoPermissionDenied
 from django.db import transaction
+from django.db.models.functions import Lower
 from rest_framework import status
 from rest_framework.exceptions import ValidationError
 from rest_framework.generics import (
@@ -194,7 +195,7 @@ def get_queryset(self):
         if learning_resource_type is not None:
             queryset = queryset.filter(
                 learning_resource_types__name=learning_resource_type)
-        return queryset.order_by('id')
+        return queryset.order_by(Lower('name'))
 
     def get_success_headers(self, data):
         """Add Location header for model create."""