airship/drydock
Code Issues Proposed changes

Bump up docker Pypi module version

Browse Source 
Also updated docs generation code caused by
deprecated properties in recent version of Sphinx.

Fixed deprecated method_whitelist in class
urllib3.util.Retry.

Change-Id: I8e35e127cf5c55a51bfc04972d967521bd5b55df
This commit is contained in:
Sergiy Markin 2024-10-08 16:07:09 +00:00
parent 5e4994c9ff
commit c4d60b8527
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/requirements-doc.txt
View File

@ -1,5 +1,6 @@
sphinx_rtd_theme==1.2.0 sphinx_rtd_theme
pylibyaml==0.1.0 pylibyaml
oslo.versionedobjects==3.1.0 oslo.versionedobjects
falcon falcon
keystoneauth1<=5.1.1 keystoneauth1
sphinx

4
doc/source/conf.py
View File

@ -19,7 +19,7 @@
# import os # import os
# import sys # import sys
# sys.path.insert(0, os.path.abspath('.')) # sys.path.insert(0, os.path.abspath('.'))
import sphinx_rtd_theme # import sphinx_rtd_theme
# -- General configuration ------------------------------------------------ # -- General configuration ------------------------------------------------
@ -97,7 +97,7 @@ todo_include_todos = False
# a list of builtin themes. # a list of builtin themes.
# #
html_theme = "sphinx_rtd_theme" 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 # 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 # further. For a list of options available for each theme, see the

2
python/drydock_provisioner/drivers/node/maasdriver/api_client.py
View File

@ -65,7 +65,7 @@ class MaasRequestFactory(object):
# Adapter for maas for request retries # Adapter for maas for request retries
retry_strategy = Retry(total=3, retry_strategy = Retry(total=3,
status_forcelist=[429, 500, 502, 503, 504], status_forcelist=[429, 500, 502, 503, 504],
method_whitelist=[ allowed_methods=[
"HEAD", "GET", "POST", "PUT", "DELETE", "HEAD", "GET", "POST", "PUT", "DELETE",
"OPTIONS", "TRACE" "OPTIONS", "TRACE"
]) ])

3
tools/gate/playbooks/docker-image-build.yaml
View File

@ -51,7 +51,6 @@
block: block:
- pip: - pip:
name: docker name: docker
version: 4.4.4
executable: pip3 executable: pip3
become: True become: True
@ -59,7 +58,6 @@
block: block:
- pip: - pip:
name: tox name: tox
version: 3.28.0
executable: pip3 executable: pip3
become: True become: True
@ -99,6 +97,7 @@
username: "{{ airship_drydock_quay_creds.username }}" username: "{{ airship_drydock_quay_creds.username }}"
password: "{{ airship_drydock_quay_creds.password }}" password: "{{ airship_drydock_quay_creds.password }}"
registry_url: "https://quay.io/api/v1/" registry_url: "https://quay.io/api/v1/"
api_version: "1.43"
- make: - make:
chdir: "{{ zuul.project.src_dir }}" chdir: "{{ zuul.project.src_dir }}"