From f7c5eabf79fe30868d63d8e0117e5cbd9c2470f7 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Tue, 15 May 2018 11:09:07 -0400
Subject: [PATCH] fix doc build

Apparently pip 10 dropped the options for allowing external and
insecure packages. We shouldn't need those anyway.

Remove the index pages within each series directory, since the specs are
linked using a glob pattern in the main table of contents. This removes
all of the "$series Release" entries from the main table of contents.

Add the rocky directory specs to the master toctree

Change-Id: Ic8714c42f31a98020dfb70e65e9b2d9240fcf41b
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
---
 doc/source/index.rst    |  9 +++++++++
 specs/juno/index.rst    |  9 ---------
 specs/kilo/index.rst    |  6 ------
 specs/liberty/index.rst |  5 -----
 specs/mitaka/index.rst  |  5 -----
 specs/newton/index.rst  |  5 -----
 specs/ocata/index.rst   |  5 -----
 specs/pike/index.rst    |  5 -----
 specs/queens/index.rst  | 10 ----------
 specs/rocky/index.rst   |  8 --------
 tox.ini                 |  2 +-
 11 files changed, 10 insertions(+), 59 deletions(-)
 delete mode 100644 specs/juno/index.rst
 delete mode 100644 specs/kilo/index.rst
 delete mode 100644 specs/liberty/index.rst
 delete mode 100644 specs/mitaka/index.rst
 delete mode 100644 specs/newton/index.rst
 delete mode 100644 specs/ocata/index.rst
 delete mode 100644 specs/pike/index.rst
 delete mode 100644 specs/queens/index.rst
 delete mode 100644 specs/rocky/index.rst

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 992827a..783a84e 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -7,6 +7,15 @@
  Oslo Design Specifications
 ============================
 
+Rocky
+=====
+
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+   specs/rocky/*
+
 Queens
 ======
 
diff --git a/specs/juno/index.rst b/specs/juno/index.rst
deleted file mode 100644
index 885c9ca..0000000
--- a/specs/juno/index.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-=====================
- Juno Specifications
-=====================
-
-.. toctree::
-   :glob:
-   :maxdepth: 2
-
-   *
diff --git a/specs/kilo/index.rst b/specs/kilo/index.rst
deleted file mode 100644
index 29246e9..0000000
--- a/specs/kilo/index.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-==============
- Kilo Release
-==============
-
-* Incubated module dependency analysis: https://etherpad.openstack.org/p/kilo-oslo-library-proposals
-* Summit planning: https://etherpad.openstack.org/p/kilo-oslo-summit-topics
diff --git a/specs/liberty/index.rst b/specs/liberty/index.rst
deleted file mode 100644
index ad86153..0000000
--- a/specs/liberty/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-=================
- Liberty Release
-=================
-
-* Summit planning: https://etherpad.openstack.org/p/liberty-oslo-summit-planning
diff --git a/specs/mitaka/index.rst b/specs/mitaka/index.rst
deleted file mode 100644
index cbec3f8..0000000
--- a/specs/mitaka/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-================
- Mitaka Release
-================
-
-* Summit planning: https://etherpad.openstack.org/p/mitaka-oslo-summit-planning
diff --git a/specs/newton/index.rst b/specs/newton/index.rst
deleted file mode 100644
index 7f4b853..0000000
--- a/specs/newton/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-================
- Newton Release
-================
-
-* Summit planning: https://etherpad.openstack.org/p/newton-oslo-summit-planning
diff --git a/specs/ocata/index.rst b/specs/ocata/index.rst
deleted file mode 100644
index 1b903bd..0000000
--- a/specs/ocata/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-===============
- Ocata Release
-===============
-
-* Summit planning: https://etherpad.openstack.org/p/ocata-oslo-summit-planning
diff --git a/specs/pike/index.rst b/specs/pike/index.rst
deleted file mode 100644
index 84695d9..0000000
--- a/specs/pike/index.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-==============
- Pike Release
-==============
-
-* PTG planning: https://etherpad.openstack.org/p/oslo-ptg-pike
diff --git a/specs/queens/index.rst b/specs/queens/index.rst
deleted file mode 100644
index fdb6afd..0000000
--- a/specs/queens/index.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-================
- Queens Release
-================
-
-* PTG planning: https://etherpad.openstack.org/p/oslo-ptg-queens
-
-.. toctree::
-   :glob:
-
-   *
diff --git a/specs/rocky/index.rst b/specs/rocky/index.rst
deleted file mode 100644
index 3553b8f..0000000
--- a/specs/rocky/index.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-================
- Rocky Release
-================
-
-.. toctree::
-   :glob:
-
-   *
diff --git a/tox.ini b/tox.ini
index a11edf6..1e2f655 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = pip install -U {opts} --allow-external lazr.authentication --allow-insecure lazr.authentication {packages}
+install_command = pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt