diff options
| -rw-r--r-- | barbicanclient/tests/test_client.py | 3 | ||||
| -rw-r--r-- | barbicanclient/tests/v1/test_containers.py | 3 | ||||
| -rw-r--r-- | doc/requirements.txt | 5 | ||||
| -rwxr-xr-x | doc/source/conf.py | 9 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
5 files changed, 12 insertions, 9 deletions
diff --git a/barbicanclient/tests/test_client.py b/barbicanclient/tests/test_client.py index c4a2033..87c7296 100644 --- a/barbicanclient/tests/test_client.py +++ b/barbicanclient/tests/test_client.py @@ -13,8 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from unittest import mock + from keystoneauth1 import session -import mock from requests_mock.contrib import fixture import testtools diff --git a/barbicanclient/tests/v1/test_containers.py b/barbicanclient/tests/v1/test_containers.py index 8255274..67eaa26 100644 --- a/barbicanclient/tests/v1/test_containers.py +++ b/barbicanclient/tests/v1/test_containers.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + from oslo_serialization import jsonutils from oslo_utils import timeutils import six diff --git a/doc/requirements.txt b/doc/requirements.txt index 72f239e..7d57dad 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,6 +1,7 @@ # 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. -sphinx>=1.8.0,!=2.1.0 # BSD + +sphinx>=2.0.0,!=2.1.0 # BSD sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD -openstackdocstheme>=1.20.0 # Apache-2.0 +openstackdocstheme>=2.2.1 # Apache-2.0 diff --git a/doc/source/conf.py b/doc/source/conf.py index 0547331..7579242 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -48,7 +48,7 @@ add_function_parentheses = True add_module_names = True # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # -- Options for HTML output -------------------------------------------------- @@ -79,6 +79,7 @@ latex_use_xindy = False #intersphinx_mapping = {'http://docs.python.org/': None} # -- Options for openstackdocstheme ------------------------------------------- -repository_name = 'openstack/python-barbicanclient' -bug_project = 'python-barbicanclient' -bug_tag = '' +openstackdocs_repo_name = 'openstack/python-barbicanclient' +openstackdocs_pdf_link = True +openstackdocs_bug_project = 'python-barbicanclient' +openstackdocs_bug_tag = '' diff --git a/test-requirements.txt b/test-requirements.txt index fdc1bc4..d0c96f1 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,6 @@ hacking>=3.1.0,<3.2.0 # Apache-2.0 coverage!=4.4,>=4.1 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD requests-mock>=1.2.0 # Apache-2.0 -mock>=2.0.0 # BSD stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT oslotest>=3.2.0 # Apache-2.0 |