diff --git a/doc/requirements-doc.txt b/doc/requirements-doc.txt index 199e1121..af696f53 100644 --- a/doc/requirements-doc.txt +++ b/doc/requirements-doc.txt @@ -1,5 +1,6 @@ -sphinx_rtd_theme==1.2.0 -pylibyaml==0.1.0 -oslo.versionedobjects==3.1.0 +sphinx_rtd_theme +pylibyaml +oslo.versionedobjects falcon -keystoneauth1<=5.1.1 \ No newline at end of file +keystoneauth1 +sphinx \ No newline at end of file diff --git a/doc/source/conf.py b/doc/source/conf.py index 38fe85f9..ab15aa19 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -19,7 +19,7 @@ # import os # import sys # sys.path.insert(0, os.path.abspath('.')) -import sphinx_rtd_theme +# import sphinx_rtd_theme # -- General configuration ------------------------------------------------ @@ -97,7 +97,7 @@ todo_include_todos = False # a list of builtin themes. # html_theme = "sphinx_rtd_theme" -html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] +# html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the diff --git a/python/drydock_provisioner/drivers/node/maasdriver/api_client.py b/python/drydock_provisioner/drivers/node/maasdriver/api_client.py index 8c6eaeba..e9c6030f 100644 --- a/python/drydock_provisioner/drivers/node/maasdriver/api_client.py +++ b/python/drydock_provisioner/drivers/node/maasdriver/api_client.py @@ -65,7 +65,7 @@ class MaasRequestFactory(object): # Adapter for maas for request retries retry_strategy = Retry(total=3, status_forcelist=[429, 500, 502, 503, 504], - method_whitelist=[ + allowed_methods=[ "HEAD", "GET", "POST", "PUT", "DELETE", "OPTIONS", "TRACE" ]) diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml index f9752920..84115eaf 100644 --- a/tools/gate/playbooks/docker-image-build.yaml +++ b/tools/gate/playbooks/docker-image-build.yaml @@ -51,7 +51,6 @@ block: - pip: name: docker - version: 4.4.4 executable: pip3 become: True @@ -59,7 +58,6 @@ block: - pip: name: tox - version: 3.28.0 executable: pip3 become: True @@ -99,6 +97,7 @@ username: "{{ airship_drydock_quay_creds.username }}" password: "{{ airship_drydock_quay_creds.password }}" registry_url: "https://quay.io/api/v1/" + api_version: "1.43" - make: chdir: "{{ zuul.project.src_dir }}"