Skip to content

Commit

Permalink
[6.13.z] Bump sphinx-autoapi from 3.0.0 to 3.1.0 (SatelliteQE#15122)
Browse files Browse the repository at this point in the history
Bump sphinx-autoapi from 3.0.0 to 3.1.0 (SatelliteQE#15114)

(cherry picked from commit 7702a84)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
ogajduse and dependabot[bot] authored May 22, 2024
1 parent 75d1a9d commit 28f6ac5
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 23 deletions.
2 changes: 1 addition & 1 deletion pytest_fixtures/component/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class constructor arguments. It can create multiple repos with distro.
]
Then the fixtures loop over it to create multiple repositories.
:returns: The tuple of distro of repositories(if given) and simplified repos
:return: The tuple of distro of repositories(if given) and simplified repos
"""
_repos = []
repo_distro = None
Expand Down
4 changes: 2 additions & 2 deletions requirements-optional.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ redis==5.0.4
pre-commit==3.7.1

# For generating documentation.
sphinx==7.3.6
sphinx-autoapi==3.0.0
sphinx==7.3.7
sphinx-autoapi==3.1.0

# For 'manage' interactive shell
manage==0.1.15
2 changes: 1 addition & 1 deletion robottelo/cli/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def _handle_response(cls, response, ignore_stderr=None):
:param response: a result object, returned by :mod:`robottelo.utils.ssh.command`.
:param ignore_stderr: indicates whether to throw a warning in logs if
``stderr`` is not empty.
:returns: contents of ``stdout``.
:return: contents of ``stdout``.
:raises robottelo.exceptions.CLIReturnCodeError: If return code is
different from zero.
"""
Expand Down
2 changes: 1 addition & 1 deletion robottelo/host_helpers/api_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def one_to_one_names(self, name):
True
:param name: A field name.
:returns: A set including both ``name`` and variations on ``name``.
:return: A set including both ``name`` and variations on ``name``.
"""
return {f'{name}_name', f'{name}_id'}
Expand Down
4 changes: 2 additions & 2 deletions robottelo/host_helpers/repository_mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ def add_item(self, item) -> None:
Add repository to collection
:param BaseRepository item: Item to add
:returns: None
:return: None
"""
if self._repos_info:
raise RepositoryAlreadyCreated('Repositories already created can not add more')
Expand All @@ -599,7 +599,7 @@ def add_items(self, items):
Add multiple repositories to collection
:param List[BaseRepository] items: Items to add
:returns: None
:return: None
"""
for item in items:
self.add_item(item)
Expand Down
6 changes: 3 additions & 3 deletions robottelo/host_helpers/satellite_mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def upload_manifest(self, org_id, manifest=None, interface='API', timeout=None):
:type interface: str
:type timeout: int
:returns: the manifest upload result
:return: the manifest upload result
"""
if not isinstance(manifest, bytes | io.BytesIO) and (
Expand Down Expand Up @@ -175,7 +175,7 @@ def is_sca_mode_enabled(self, org_id):
given organization.
:param str org_id: The unique identifier of the organization to check for SCA mode.
:returns: A boolean value indicating whether SCA mode is enabled or not.
:return: A boolean value indicating whether SCA mode is enabled or not.
:rtype: bool
"""
return self.api.Organization(id=org_id).read().simple_content_access
Expand All @@ -186,7 +186,7 @@ def publish_content_view(self, org, repo_list):
:param str org: The name of the organization to which the content view belongs
:param list or str repo_list: A list of repositories or a single repository
:returns: A dictionary containing the details of the published content view.
:return: A dictionary containing the details of the published content view.
"""
repo = repo_list if isinstance(repo_list, list) else [repo_list]
content_view = self.api.ContentView(organization=org, repository=repo).create()
Expand Down
6 changes: 3 additions & 3 deletions robottelo/hosts.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ def os_distro(self):
def os_version(self):
"""Get host's OS version information
:returns: A ``packaging.version.Version`` instance
:return: A ``packaging.version.Version`` instance
"""
return Version(self._os_release['VERSION_ID'])

Expand Down Expand Up @@ -439,7 +439,7 @@ def download_file(self, file_url, local_path=None, file_name=None):
provided file will be saved in /tmp/ directory.
:param str file_name: New name of the Downloaded file else its given from file_url
:returns: Returns list containing complete file path and name of downloaded file.
:return: Returns list containing complete file path and name of downloaded file.
"""
file_name = PurePath(file_name or file_url).name
local_path = PurePath(local_path or '/tmp') / file_name
Expand Down Expand Up @@ -1459,7 +1459,7 @@ def ping_host(self, host):
"""Check the provisioned host status by pinging the ip of host
:param host: IP address or hostname of the provisioned host
:returns: None
:return: None
:raises: : `HostPingFailed` if the host is not pingable
"""
result = self.execute(
Expand Down
2 changes: 1 addition & 1 deletion robottelo/utils/datafactory.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def generate_strings_list(length=None, exclude_types=None, min_length=3, max_len
generated list. example: exclude_types=['html', 'cjk']
:param int min_length: Minimum length to be used in integer generator
:param int max_length: Maximum length to be used in integer generator
:returns: A list of various string types.
:return: A list of various string types.
"""
if length is None:
Expand Down
8 changes: 2 additions & 6 deletions robottelo/utils/report_portal/portal.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,12 @@ def __init__(self, rp_url=None, rp_api_key=None, rp_project=None):

@property
def api_url(self):
"""Super url of report portal
:returns: Base url for API request
"""
"""Super url of report portal API."""
return f'{self.rp_url}/api/v1/{self.rp_project}'

@property
def headers(self):
"""The headers for Report Portal Requests.
:returns: header for API request
"""
"""The headers for Report Portal Requests."""
return {'Authorization': f'Bearer {self.rp_api_key}'}

def get_launches(
Expand Down
2 changes: 1 addition & 1 deletion tests/foreman/api/test_permission.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def give_user_permission(self, perm_name, target_sat):
searching for the permission with name ``perm_name``.
:raises: ``requests.exceptions.HTTPError`` if an error occurs when
updating ``self.user``'s roles.
:returns: Nothing.
:return: Nothing.
"""
role = target_sat.api.Role().create()
permissions = target_sat.api.Permission().search(query={'search': f'name="{perm_name}"'})
Expand Down
2 changes: 1 addition & 1 deletion tests/foreman/cli/test_oscap.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def fetch_scap_and_profile_id(cls, scap_name, sat):
:param scap_name: Scap title
:returns: scap_id and scap_profile_id
:return: scap_id and scap_profile_id
"""
default_content = sat.cli.Scapcontent.info({'title': scap_name}, output_format='json')
scap_id = default_content['id']
Expand Down
2 changes: 1 addition & 1 deletion tests/foreman/longrun/test_oscap.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def fetch_scap_and_profile_id(sat, scap_name, scap_profile):
:param scap_name: Scap title
:param scap_profile: Scap profile you want to select
:returns: scap_id and scap_profile_id
:return: scap_id and scap_profile_id
"""

default_content = sat.cli.Scapcontent.info({'title': scap_name}, output_format='json')
Expand Down

0 comments on commit 28f6ac5

Please sign in to comment.