Merge branch 'docs_and_setup'

.mergify.yml

@@ -35,18 +35,18 @@ pull_request_rules:
       comment:
         message: bors r+
 
-  - name: Backport to 1.6 branch
+  - name: Backport to 1.7 branch
     conditions:
       - base=master
       - label=type/backport
     actions:
       backport:
         branches:
-          - '1.6'
+          - '1.7'
 
   - name: remove outdated reviews
     conditions:
-      - base~=^(master|1.6)$
+      - base~=^(master|1.7)$
     actions:
       dismiss_reviews:
         approved: True

.travis.yml

@@ -4,6 +4,7 @@ branches:
     - testing
     - '1.5'
     - '1.6'
+    - '1.7'
     - master
 
 sudo: required

docs/conf.py

@@ -40,6 +40,7 @@ html_context = {
     'versions': [
         ('1.5', '/1.5/'),
         ('1.6', '/1.6/'),
+        ('1.7', '/1.7/'),
         ('master', '/master/')
     ],
     'conf_py_path': '/docs/'