Merge pull request #865 from uktrade/release

Prod release

.circleci/config.yml

@@ -28,7 +28,7 @@ jobs:
             mkdir test-reports
             TESTFILES=$(circleci tests glob "tests/**/*.py")
             ENV_FILES=test,dev pytest ${TESTFILES} --cov=. --cov-config=.coveragerc --cov-report html --cov-report term --junitxml=test-reports/junit.xml
-            COVERALLS_PARALLEL=true coveralls
+            codecov
       - run: mkdir -p workspace
       - run: echo "export TARGET_CIRCLE_BUILD_NUM=$CIRCLE_BUILD_NUM" >> workspace/new-env-vars
       - store_test_results:

.gitignore

@@ -8,6 +8,9 @@ staticfiles
 BrowserStackLocal
 node_modules/
 
+.env
+ENV/
+
 # C extensions
 *.so
 

CHANGELOG.md

@@ -1,7 +1,12 @@
 # Changelog
 
 ## Pre-release
+
 ### Implemented enhancements
+- GAA-31 - Upgrading wagtail to 2.10
+- no-ticket - migrate to codecov remove coveralls
+- GAA-31 - Upgrading Wagtail to 2.9
+
 ### Fixed bugs
 
 ### Hotfix

README.md

@@ -1,7 +1,7 @@
 # directory-cms
 
 [![circle-ci-image]][circle-ci]
-[![coverage-image]][coverage]
+[![codecov-image]][codecov]
 [![gitflow-image]][gitflow]
 [![calver-image]][calver]
 
@@ -124,8 +124,8 @@ https://github.com/uktrade?q=great
 [circle-ci-image]: https://circleci.com/gh/uktrade/directory-cms/tree/develop.svg?style=svg
 [circle-ci]: https://circleci.com/gh/uktrade/directory-cms/tree/develop
 
-[coverage-image]: https://coveralls.io/repos/github/uktrade/directory-cms/badge.svg
-[coverage]: https://coveralls.io/github/uktrade/directory-cms
+[codecov-image]: https://codecov.io/gh/uktrade/directory-cms/branch/master/graph/badge.svg
+[codecov]: https://codecov.io/gh/uktrade/directory-cms
 
 [gitflow-image]: https://img.shields.io/badge/Branching%20strategy-gitflow-5FBB1C.svg
 [gitflow]: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

core/views.py

@@ -5,7 +5,7 @@
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from wagtail.admin.api.endpoints import PagesAdminAPIEndpoint
+from wagtail.admin.api.views import PagesAdminAPIViewSet
 from wagtail.core.models import Orderable, Page, Site
 
 from django.conf import settings
@@ -27,7 +27,7 @@
 logger = getLogger(__name__)
 
 
-class APIEndpointBase(PagesAdminAPIEndpoint):
+class APIEndpointBase(PagesAdminAPIViewSet):
     """At the very deep core this is a DRF GenericViewSet, with a few wagtail
     layers on top.
 
@@ -37,7 +37,7 @@ class APIEndpointBase(PagesAdminAPIEndpoint):
     queryset = Page.objects.all()
     meta_fields = []
     known_query_parameters = (
-        PagesAdminAPIEndpoint.known_query_parameters.union(
+        PagesAdminAPIViewSet.known_query_parameters.union(
             ['lang', 'draft_token', 'service_name']
         )
     )