chore(all): upgrade mkdocs past 1.0

* break absolutely everything ...and fix one thing * follow-up squashed from 9fc541b: seems to be fixed at least mostly? squash b8ba25a squash 9fc541b
teamhephy · Oct 18, 2018 · 069dddc · 069dddc
1 parent b92b7f3
commit 069dddc
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -115,7 +115,9 @@ pages:
     - v2.2.0: changelogs/v2.2.0.md
     - v2.1.0: changelogs/v2.1.0.md
     - v2.0.0: changelogs/v2.0.0.md
-theme_dir: themes/deis
+theme:
+  name: null
+  custom_dir: 'themes/deis'
 docs_dir: src
 markdown_extensions:
   - markdown_checklist.extension

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-mkdocs==0.15.3
+mkdocs==1.0.3
 markdown-checklist==0.4.1
 markdown-include==0.5.1
diff --git a/src/index.md b/src/index.md
@@ -9,8 +9,8 @@ application configuration, creating and rolling back releases, managing domain n
 certificates, providing seamless edge routing, aggregating logs, and sharing applications with
 teams. All of this is exposed through a simple REST API and command line interface.
 
-Please note that this documentation is for Deis Workflow (v2). For v1 documentation visit
-<http://docs.deis.io/en/latest/>.
+Please note that this documentation is for Hephy Workflow (v2.19.4).  Older versions of Deis and
+Hephy Workflow are not supported.
 
 ## Getting Started
 
@@ -24,8 +24,7 @@ Feel like contibuting some code or want to get started as a maintainer? Pick an
 
 ## Service and Support
 
-If you are interested in commercial service and support for Deis Workflow, check out the various
-[services offerings on deis.com](https://deis.com/services).
+Coming soon.
 
 
 [arch]: understanding-workflow/architecture.md

diff --git a/src/roadmap/releases.md b/src/roadmap/releases.md
@@ -254,7 +254,7 @@ and then verify `stable` artifacts are available and appropriately updated after
 ```
 $ curl -sSL https://raw.githubusercontent.com/teamhephy/workflow-cli/master/install-v2.sh | bash -s v2.18.0
 $ ./deis version
-# (Should show $WORKFLOW_RELEASE) # FIXME: builds of CLI should match the current Workflow release.) 
+# (Should show $WORKFLOW_RELEASE)
 ```
 
 ### Step 10: Let Everyone Know

diff --git a/themes/deis/base.html → themes/deis/main.html b/themes/deis/base.html → themes/deis/main.html
@@ -7,15 +7,15 @@
 <head>
   <meta charset="utf-8" />
   <meta http-equiv="x-ua-compatible" content="ie=edge">
-  <meta name="keywords" content="{{ meta['keywords'] if meta }}" />
+  <meta name="keywords" content="{{ page.meta['keywords'] if page.meta }}" />
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="description" content="{{ page_description if page_description }}" />
-  {% if canonical_url %}<link rel="canonical" href="{{ canonical_url }}">{% endif %}
+  <meta name="description" content="{{ config.site_description if config.site_description }}" />
+  {% if page.canonical_url %}<link rel="canonical" href="{{ page.canonical_url }}">{% endif %}
 
   <meta name="msvalidate.01" content="079E754911917142D42AB2A3694F9267" />
   <meta name="msvalidate.01" content="08598E7D936D9217891AE6C1665A645D" />
 
-  <title>{% if page_title %}{{ page_title }} - {% endif %}{{ site_name }}</title>
+  <title>{% if page.title %}{{ page.title }} - {% endif %}{{ config.site_name }}</title>
 
   <script type="text/javascript">var documentationBaseURL = "{{ base_url}}"</script>
   <link rel="icon" href="{{ base_url }}/static/img/favicon/favicon.png" type="image/png">
@@ -42,7 +42,7 @@
           <div class="container">
             <div class="row">
               <div class="small-12">
-                {{ content }}
+                {{ page.content }}
               </div>
             </div>
           </div>
@@ -62,7 +62,7 @@
     <script src="{{ path }}" async></script>
   {% endfor %}
 
-  {% if google_analytics %}
+  {% if config.google_analytics %}
   <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

diff --git a/themes/deis/nav.html b/themes/deis/nav.html
@@ -1,11 +1,11 @@
 {% for nav_item in nav %}
     <li class="toctree-l1{% if nav_item.active %} current{% endif %}">
-        <a class="reference internal{% if nav_item.active %} current{% endif %}"{% if nav_item.active %} state="open"{% endif %} href="{{ nav_item.url }}">{{ nav_item.title }}</a>
+        <a class="reference internal{% if nav_item.active %} current{% endif %}"{% if nav_item.active %} state="open"{% endif %} href="{{ nav_item.url | url }}">{{ nav_item.title }}</a>
         {% if nav_item.children %}
             <ul style="display: none;"{% if nav_item.active %} class="current"{% endif %}>
             {% for child in nav_item.children %}
                 <li class="toctree-l2{% if child.active %} current{% endif %}">
-                <a class="reference internal{% if nav_item.active %} current{% endif %}" id="{{ child.title }}" href="{{ child.url }}">{{ child.title }}</a>
+                <a class="reference internal{% if nav_item.active %} current{% endif %}" id="{{ child.title }}" href="{{ child.url | url }}">{{ child.title }}</a>
                 </li>
             {% endfor %}
             </ul>