From 7f3a7b6755821c4fa67f3c45a448960a1bbe9c8e Mon Sep 17 00:00:00 2001 From: jacky06 Date: Tue, 18 Jun 2019 21:58:42 +0800 Subject: [PATCH] Sync Sphinx requirement 1. Sync sphinx dependency with global requirements. It caps python 2 since sphinx 2.0 no longer supports Python 2.7. 2. Remove unncessary "==" Change-Id: I86e633512de5e35384f8dc7aa0b29a1fc07aef97 --- doc/source/configuration.rst | 2 +- doc/source/development.rst | 6 +++--- doc/source/devstack-guide.rst | 4 ++-- test-requirements.txt | 8 ++++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index c6702f6..17ad9f2 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -1,5 +1,5 @@ Configuring Adjutant -==================================== +==================== .. highlight:: yaml diff --git a/doc/source/development.rst b/doc/source/development.rst index bc6ca3d..e669474 100644 --- a/doc/source/development.rst +++ b/doc/source/development.rst @@ -72,7 +72,7 @@ page. What is an Action? -==================== +================== Actions are a generic database model which knows what 'type' of action it is. On pulling the actions related to a Task from the database we wrap it into the @@ -87,14 +87,14 @@ Each action class has the functions "pre_approve", "post_approve", and can be executed in those functions. What is a Task? -================ +=============== A task is a top level model representation of the request. It wraps the request metadata, and based on the TaskView, will have actions associated with it. What is a Token? -================== +================ A token is a unique identifier linking to a task, so that anyone submitting the token will submit to the actions related to the task. diff --git a/doc/source/devstack-guide.rst b/doc/source/devstack-guide.rst index d844db4..af866cf 100644 --- a/doc/source/devstack-guide.rst +++ b/doc/source/devstack-guide.rst @@ -88,9 +88,9 @@ Migrating between the two states hasn't yet been handled entirely, so once you pick a value for `USERNAME_IS_EMAIL` stick with it, or clear the database inbetween. -****************** +**************** Running Adjutant -****************** +**************** Still in the Adjutant repo directory, you will now need to run the migrations to build a basic database. By default this will use sqlite3.:: diff --git a/test-requirements.txt b/test-requirements.txt index bf22d76..3fc4e4f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,12 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + coverage>=4.5.3 doc8>=0.8.0 flake8>=3.7.7 mock>=3.0.5 os-api-ref>=1.6.1 # Apache-2.0 sphinx-rtd-theme>=0.4.3 -sphinx<1.9;python_version=="2.7" -sphinx>=1.8.5;python_version>"3.6" +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD