Merge branch 'master' into docs/index_verbage

docs/requirements.txt

@@ -1,7 +1,9 @@
 -r ../requirements.txt
 
 alabaster_jupyterhub
-autodoc-traits
+# Temporary fix of #3021. Revert back to released autodoc-traits when
+# 0.1.0 released.
+https://github.com/jupyterhub/autodoc-traits/archive/75885ee24636efbfebfceed1043459715049cd84.zip
 pydata-sphinx-theme
 recommonmark>=0.6
 sphinx-copybutton

docs/source/conf.py

@@ -20,6 +20,7 @@ extensions = [
     'autodoc_traits',
     'sphinx_copybutton',
     'sphinx-jsonschema',
+    'recommonmark',
 ]
 
 templates_path = ['_templates']
@@ -62,12 +63,10 @@ from recommonmark.transform import AutoStructify
 
 def setup(app):
     app.add_config_value('recommonmark_config', {'enable_eval_rst': True}, True)
-    app.add_stylesheet('custom.css')
+    app.add_css_file('custom.css')
     app.add_transform(AutoStructify)
 
 
-source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'}
-
 source_suffix = ['.rst', '.md']
 # source_encoding = 'utf-8-sig'
 

jupyterhub/tests/test_pages.py

@@ -354,7 +354,7 @@ async def test_spawn_pending(app, username, slow_spawn):
     assert page.find('div', {'class': 'progress'})
 
     # validate event source url by consuming it
-    script = page.body.find('script').text
+    script = page.body.find('script').string
     assert 'EventSource' in script
     # find EventSource url in javascript
     # maybe not the most robust way to check this?

share/jupyterhub/templates/admin.html

@@ -96,8 +96,8 @@
           <a role="button" class="delete-server btn btn-xs btn-warning">delete server</a>
         {%- endif -%}
       </td>
-      </tr>
       {% endblock user_row %}
+      </tr>
       {% endfor %}
       {% endfor %}
   </tbody>