Skip to content

Commit 2708f91

Browse files
nejchnejch
authored
Merge pull request #1709 from python-gitlab/docs/sphinx-annotations
docs: only use type annotations for documentation
2 parents 387e59f + 79e785e commit 2708f91

33 files changed

+382
-387
lines changed

‎docs/_templates/breadcrumbs.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<li>{{ title }}</li>
1616
<li class="wy-breadcrumbs-aside">
1717
{% if pagename != "search" %}
18-
<a href="https://github.com/python-gitlab/python-gitlab/blob/master/{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> Edit on GitHub</a>
18+
<a href="https://github.com/python-gitlab/python-gitlab/blob/main/{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> Edit on GitHub</a>
1919
| <a href="https://github.com/python-gitlab/python-gitlab/issues/new?title=Documentation+bug&body=%0A%0A------%0AIn+page:+{{ pagename }}{{ suffix }}">Report a bug</a>
2020
{% endif %}
2121
</li>

‎docs/conf.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
"sphinxcontrib.autoprogram",
4646
]
4747

48+
autodoc_typehints = "both"
49+
4850
# Add any paths that contain templates here, relative to this directory.
4951
templates_path = ["_templates"]
5052

‎gitlab/base.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,7 @@ def __init__(self, gl: Gitlab, parent: Optional[RESTObject] = None) -> None:
328328
"""REST manager constructor.
329329
330330
Args:
331-
gl (Gitlab): :class:`~gitlab.Gitlab` connection to use to make
332-
requests.
331+
gl: :class:`~gitlab.Gitlab` connection to use to make requests.
333332
parent: REST object to which the manager is attached.
334333
"""
335334
self.gitlab = gl

‎gitlab/client.py‎

Lines changed: 59 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@ class Gitlab(object):
3939
"""Represents a GitLab server connection.
4040
4141
Args:
42-
url (str): The URL of the GitLab server (defaults to https://gitlab.com).
43-
private_token (str): The user private token
44-
oauth_token (str): An oauth token
45-
job_token (str): A CI job token
46-
ssl_verify (bool|str): Whether SSL certificates should be validated. If
42+
url: The URL of the GitLab server (defaults to https://gitlab.com).
43+
private_token: The user private token
44+
oauth_token: An oauth token
45+
job_token: A CI job token
46+
ssl_verify: Whether SSL certificates should be validated. If
4747
the value is a string, it is the path to a CA file used for
4848
certificate validation.
49-
timeout (float): Timeout to use for requests to the GitLab server.
50-
http_username (str): Username for HTTP authentication
51-
http_password (str): Password for HTTP authentication
52-
api_version (str): Gitlab API version to use (support for 4 only)
53-
pagination (str): Can be set to 'keyset' to use keyset pagination
54-
order_by (str): Set order_by globally
55-
user_agent (str): A custom user agent to use for making HTTP requests.
56-
retry_transient_errors (bool): Whether to retry after 500, 502, 503, or
49+
timeout: Timeout to use for requests to the GitLab server.
50+
http_username: Username for HTTP authentication
51+
http_password: Password for HTTP authentication
52+
api_version: Gitlab API version to use (support for 4 only)
53+
pagination: Can be set to 'keyset' to use keyset pagination
54+
order_by: Set order_by globally
55+
user_agent: A custom user agent to use for making HTTP requests.
56+
retry_transient_errors: Whether to retry after 500, 502, 503, or
5757
504 responses. Defaults to False.
5858
"""
5959

@@ -225,11 +225,11 @@ def from_config(
225225
"""Create a Gitlab connection from configuration files.
226226
227227
Args:
228-
gitlab_id (str): ID of the configuration section.
228+
gitlab_id: ID of the configuration section.
229229
config_files list[str]: List of paths to configuration files.
230230
231231
Returns:
232-
(gitlab.Gitlab): A Gitlab connection.
232+
A Gitlab connection.
233233
234234
Raises:
235235
gitlab.config.GitlabDataError: If the configuration is not correct.
@@ -269,9 +269,8 @@ def version(self) -> Tuple[str, str]:
269269
object.
270270
271271
Returns:
272-
tuple (str, str): The server version and server revision.
273-
('unknown', 'unknwown') if the server doesn't
274-
perform as expected.
272+
The server version and server revision.
273+
('unknown', 'unknown') if the server doesn't perform as expected.
275274
"""
276275
if self._server_version is None:
277276
try:
@@ -293,16 +292,15 @@ def lint(self, content: str, **kwargs: Any) -> Tuple[bool, List[str]]:
293292
"""Validate a gitlab CI configuration.
294293
295294
Args:
296-
content (txt): The .gitlab-ci.yml content
295+
content: The .gitlab-ci.yml content
297296
**kwargs: Extra options to send to the server (e.g. sudo)
298297
299298
Raises:
300299
GitlabAuthenticationError: If authentication is not correct
301300
GitlabVerifyError: If the validation could not be done
302301
303302
Returns:
304-
tuple: (True, []) if the file is valid, (False, errors(list))
305-
otherwise
303+
(True, []) if the file is valid, (False, errors(list)) otherwise
306304
"""
307305
post_data = {"content": content}
308306
data = self.http_post("/ci/lint", post_data=post_data, **kwargs)
@@ -317,19 +315,17 @@ def markdown(
317315
"""Render an arbitrary Markdown document.
318316
319317
Args:
320-
text (str): The markdown text to render
321-
gfm (bool): Render text using GitLab Flavored Markdown. Default is
322-
False
323-
project (str): Full path of a project used a context when `gfm` is
324-
True
318+
text: The markdown text to render
319+
gfm: Render text using GitLab Flavored Markdown. Default is False
320+
project: Full path of a project used a context when `gfm` is True
325321
**kwargs: Extra options to send to the server (e.g. sudo)
326322
327323
Raises:
328324
GitlabAuthenticationError: If authentication is not correct
329325
GitlabMarkdownError: If the server cannot perform the request
330326
331327
Returns:
332-
str: The HTML rendering of the markdown text.
328+
The HTML rendering of the markdown text.
333329
"""
334330
post_data = {"text": text, "gfm": gfm}
335331
if project is not None:
@@ -351,7 +347,7 @@ def get_license(self, **kwargs: Any) -> Dict[str, Any]:
351347
GitlabGetError: If the server cannot perform the request
352348
353349
Returns:
354-
dict: The current license information
350+
The current license information
355351
"""
356352
result = self.http_get("/license", **kwargs)
357353
if isinstance(result, dict):
@@ -363,15 +359,15 @@ def set_license(self, license: str, **kwargs: Any) -> Dict[str, Any]:
363359
"""Add a new license.
364360
365361
Args:
366-
license (str): The license string
362+
license: The license string
367363
**kwargs: Extra options to send to the server (e.g. sudo)
368364
369365
Raises:
370366
GitlabAuthenticationError: If authentication is not correct
371367
GitlabPostError: If the server cannot perform the request
372368
373369
Returns:
374-
dict: The new license information
370+
The new license information
375371
"""
376372
data = {"license": license}
377373
result = self.http_post("/license", post_data=data, **kwargs)
@@ -446,7 +442,7 @@ def _get_base_url(self, url: Optional[str] = None) -> str:
446442
"""Return the base URL with the trailing slash stripped.
447443
If the URL is a Falsy value, return the default URL.
448444
Returns:
449-
str: The base URL
445+
The base URL
450446
"""
451447
if not url:
452448
return gitlab.const.DEFAULT_URL
@@ -460,7 +456,7 @@ def _build_url(self, path: str) -> str:
460456
it to the stored url.
461457
462458
Returns:
463-
str: The full URL
459+
The full URL
464460
"""
465461
if path.startswith("http://") or path.startswith("https://"):
466462
return path
@@ -541,20 +537,19 @@ def http_request(
541537
"""Make an HTTP request to the Gitlab server.
542538
543539
Args:
544-
verb (str): The HTTP method to call ('get', 'post', 'put',
545-
'delete')
546-
path (str): Path or full URL to query ('/projects' or
540+
verb: The HTTP method to call ('get', 'post', 'put', 'delete')
541+
path: Path or full URL to query ('/projects' or
547542
'http://whatever/v4/api/projecs')
548-
query_data (dict): Data to send as query parameters
549-
post_data (dict|bytes): Data to send in the body (will be converted to
543+
query_data: Data to send as query parameters
544+
post_data: Data to send in the body (will be converted to
550545
json by default)
551-
raw (bool): If True, do not convert post_data to json
552-
streamed (bool): Whether the data should be streamed
553-
files (dict): The files to send to the server
554-
timeout (float): The timeout, in seconds, for the request
555-
obey_rate_limit (bool): Whether to obey 429 Too Many Request
546+
raw: If True, do not convert post_data to json
547+
streamed: Whether the data should be streamed
548+
files: The files to send to the server
549+
timeout: The timeout, in seconds, for the request
550+
obey_rate_limit: Whether to obey 429 Too Many Request
556551
responses. Defaults to True.
557-
max_retries (int): Max retries after 429 or transient errors,
552+
max_retries: Max retries after 429 or transient errors,
558553
set to -1 to retry forever. Defaults to 10.
559554
**kwargs: Extra options to send to the server (e.g. sudo)
560555
@@ -667,11 +662,11 @@ def http_get(
667662
"""Make a GET request to the Gitlab server.
668663
669664
Args:
670-
path (str): Path or full URL to query ('/projects' or
665+
path: Path or full URL to query ('/projects' or
671666
'http://whatever/v4/api/projecs')
672-
query_data (dict): Data to send as query parameters
673-
streamed (bool): Whether the data should be streamed
674-
raw (bool): If True do not try to parse the output as json
667+
query_data: Data to send as query parameters
668+
streamed: Whether the data should be streamed
669+
raw: If True do not try to parse the output as json
675670
**kwargs: Extra options to send to the server (e.g. sudo)
676671
677672
Returns:
@@ -712,14 +707,14 @@ def http_list(
712707
"""Make a GET request to the Gitlab server for list-oriented queries.
713708
714709
Args:
715-
path (str): Path or full URL to query ('/projects' or
710+
path: Path or full URL to query ('/projects' or
716711
'http://whatever/v4/api/projects')
717-
query_data (dict): Data to send as query parameters
712+
query_data: Data to send as query parameters
718713
**kwargs: Extra options to send to the server (e.g. sudo, page,
719714
per_page)
720715
721716
Returns:
722-
list: A list of the objects returned by the server. If `as_list` is
717+
A list of the objects returned by the server. If `as_list` is
723718
False and no pagination-related arguments (`page`, `per_page`,
724719
`all`) are defined then a GitlabList object (generator) is returned
725720
instead. This object will make API calls when needed to fetch the
@@ -761,13 +756,13 @@ def http_post(
761756
"""Make a POST request to the Gitlab server.
762757
763758
Args:
764-
path (str): Path or full URL to query ('/projects' or
759+
path: Path or full URL to query ('/projects' or
765760
'http://whatever/v4/api/projecs')
766-
query_data (dict): Data to send as query parameters
767-
post_data (dict): Data to send in the body (will be converted to
761+
query_data: Data to send as query parameters
762+
post_data: Data to send in the body (will be converted to
768763
json by default)
769-
raw (bool): If True, do not convert post_data to json
770-
files (dict): The files to send to the server
764+
raw: If True, do not convert post_data to json
765+
files: The files to send to the server
771766
**kwargs: Extra options to send to the server (e.g. sudo)
772767
773768
Returns:
@@ -810,13 +805,13 @@ def http_put(
810805
"""Make a PUT request to the Gitlab server.
811806
812807
Args:
813-
path (str): Path or full URL to query ('/projects' or
808+
path: Path or full URL to query ('/projects' or
814809
'http://whatever/v4/api/projecs')
815-
query_data (dict): Data to send as query parameters
816-
post_data (dict|bytes): Data to send in the body (will be converted to
810+
query_data: Data to send as query parameters
811+
post_data: Data to send in the body (will be converted to
817812
json by default)
818-
raw (bool): If True, do not convert post_data to json
819-
files (dict): The files to send to the server
813+
raw: If True, do not convert post_data to json
814+
files: The files to send to the server
820815
**kwargs: Extra options to send to the server (e.g. sudo)
821816
822817
Returns:
@@ -849,7 +844,7 @@ def http_delete(self, path: str, **kwargs: Any) -> requests.Response:
849844
"""Make a DELETE request to the Gitlab server.
850845
851846
Args:
852-
path (str): Path or full URL to query ('/projects' or
847+
path: Path or full URL to query ('/projects' or
853848
'http://whatever/v4/api/projecs')
854849
**kwargs: Extra options to send to the server (e.g. sudo)
855850
@@ -868,16 +863,16 @@ def search(
868863
"""Search GitLab resources matching the provided string.'
869864
870865
Args:
871-
scope (str): Scope of the search
872-
search (str): Search string
866+
scope: Scope of the search
867+
search: Search string
873868
**kwargs: Extra options to send to the server (e.g. sudo)
874869
875870
Raises:
876871
GitlabAuthenticationError: If authentication is not correct
877872
GitlabSearchError: If the server failed to perform the request
878873
879874
Returns:
880-
GitlabList: A list of dicts describing the resources found.
875+
A list of dicts describing the resources found.
881876
"""
882877
data = {"scope": scope, "search": search}
883878
return self.http_list("/search", query_data=data, **kwargs)

‎gitlab/exceptions.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,7 @@ def on_http_error(error: Type[Exception]) -> Callable[[__F], __F]:
297297
raise specialized exceptions instead.
298298
299299
Args:
300-
error(Exception): The exception type to raise -- must inherit from
301-
GitlabError
300+
The exception type to raise -- must inherit from GitlabError
302301
"""
303302

304303
def wrap(f: __F) -> __F:

0 commit comments

Comments
 (0)