Skip to content

Commit ac46f64

Browse files
dbantydbanty
authored
Merge branch 'main' into fix_content_type_with_semicolon_separator
2 parents bc32d59 + f79bccb commit ac46f64

File tree

56 files changed

+388
-128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+388
-128
lines changed

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: GitHub Discussions
4+
url: https://github.com/openapi-generators/openapi-python-client/discussions
5+
about: Please ask and answer questions here.
6+
- name: Discord
7+
url: https://discord.gg/JaqVvBgwYw
8+
about: Less structured, more casual chat.

‎.github/workflows/release-dry-run.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
- uses: actions/checkout@v3
1313
with:
1414
fetch-depth: 0
15-
token: ${{ secrets.PAT }}
15+
token: ${{ secrets.GITHUB_TOKEN }}
1616
- name: Install Knope
1717
uses: knope-dev/action@v1
1818
with:
19-
version: 0.7.1
19+
version: 0.7.2
2020
- run: knope release --dry-run

‎.github/workflows/release.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: Release
22

33
on: workflow_dispatch
44

5-
permissions:
6-
contents: write
7-
85
jobs:
96
release:
107
runs-on: ubuntu-latest
@@ -23,11 +20,11 @@ jobs:
2320
- name: Install Knope
2421
uses: knope-dev/action@v1
2522
with:
26-
version: 0.7.1
23+
version: 0.7.2
2724
- name: Bump Version & Create GitHub Release
2825
run: knope release
2926
env:
30-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
GITHUB_TOKEN: ${{ secrets.PAT }}
3128
- name: Install Poetry
3229
run: pip install --upgrade poetry
3330
- name: Push to PyPI

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,17 @@ Programmatic usage of this project (e.g., importing it as a Python module) and t
1313

1414
The 0.x prefix used in versions for this project is to indicate that breaking changes are expected frequently (several times a year). Breaking changes will increment the minor number, all other changes will increment the patch number. You can track the progress toward 1.0 [here](https://github.com/openapi-generators/openapi-python-client/projects/2).
1515

16+
## 0.13.2
17+
18+
### Features
19+
20+
- Always generate enums with sorted members (#728)
21+
22+
### Fixes
23+
24+
- Prevent backslashes in descriptions from breaking docstrings [#735]. Thanks @robertschweizer & @bryan-hunt! (#735)
25+
- Respect `required` field in parameters included with `$ref` (#737)
26+
1627
## 0.13.1
1728

1829
### Features

‎end_to_end_tests/custom-templates-golden-record/my_test_api_client/api/tests/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from . import (
66
callback_test,
77
defaults_tests_defaults_post,
8+
description_with_backslash,
89
get_basic_list_of_booleans,
910
get_basic_list_of_floats,
1011
get_basic_list_of_integers,
@@ -158,3 +159,10 @@ def callback_test(cls) -> types.ModuleType:
158159
Try sending a request related to a callback
159160
"""
160161
return callback_test
162+
163+
@classmethod
164+
def description_with_backslash(cls) -> types.ModuleType:
165+
"""
166+
Test description with \
167+
"""
168+
return description_with_backslash

‎end_to_end_tests/golden-record/my_test_api_client/api/default/get_common_parameters.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def _get_kwargs(
2929
"headers": headers,
3030
"cookies": cookies,
3131
"timeout": client.get_timeout(),
32+
"follow_redirects": client.follow_redirects,
3233
"params": params,
3334
}
3435

@@ -37,7 +38,7 @@ def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any
3738
if response.status_code == HTTPStatus.OK:
3839
return None
3940
if client.raise_on_unexpected_status:
40-
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
41+
raise errors.UnexpectedStatus(response.status_code, response.content)
4142
else:
4243
return None
4344

‎end_to_end_tests/golden-record/my_test_api_client/api/default/post_common_parameters.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def _get_kwargs(
2929
"headers": headers,
3030
"cookies": cookies,
3131
"timeout": client.get_timeout(),
32+
"follow_redirects": client.follow_redirects,
3233
"params": params,
3334
}
3435

@@ -37,7 +38,7 @@ def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any
3738
if response.status_code == HTTPStatus.OK:
3839
return None
3940
if client.raise_on_unexpected_status:
40-
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
41+
raise errors.UnexpectedStatus(response.status_code, response.content)
4142
else:
4243
return None
4344

‎end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_header_types.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,15 @@ def _get_kwargs(
4949
"headers": headers,
5050
"cookies": cookies,
5151
"timeout": client.get_timeout(),
52+
"follow_redirects": client.follow_redirects,
5253
}
5354

5455

5556
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
5657
if response.status_code == HTTPStatus.OK:
5758
return None
5859
if client.raise_on_unexpected_status:
59-
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
60+
raise errors.UnexpectedStatus(response.status_code, response.content)
6061
else:
6162
return None
6263

‎end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def _get_kwargs(
5353
"headers": headers,
5454
"cookies": cookies,
5555
"timeout": client.get_timeout(),
56+
"follow_redirects": client.follow_redirects,
5657
"params": params,
5758
}
5859

@@ -61,7 +62,7 @@ def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any
6162
if response.status_code == HTTPStatus.OK:
6263
return None
6364
if client.raise_on_unexpected_status:
64-
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
65+
raise errors.UnexpectedStatus(response.status_code, response.content)
6566
else:
6667
return None
6768

‎end_to_end_tests/golden-record/my_test_api_client/api/parameter_references/get_parameter_references_path_param.py

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional
2+
from typing import Any, Dict, Optional, Union
33

44
import httpx
55

66
from ... import errors
77
from ...client import Client
8-
from ...types import UNSET, Response
8+
from ...types import UNSET, Response, Unset
99

1010

1111
def _get_kwargs(
1212
path_param: str,
1313
*,
1414
client: Client,
15-
string_param: str,
16-
integer_param: int = 0,
17-
header_param: str,
18-
cookie_param: str,
15+
string_param: Union[Unset, None, str] = UNSET,
16+
integer_param: Union[Unset, None, int] = 0,
17+
header_param: Union[Unset, str] = UNSET,
18+
cookie_param: Union[Unset, str] = UNSET,
1919
) -> Dict[str, Any]:
2020
url = "{}/parameter-references/{path_param}".format(client.base_url, path_param=path_param)
2121

2222
headers: Dict[str, str] = client.get_headers()
2323
cookies: Dict[str, Any] = client.get_cookies()
2424

25-
headers["header param"] = header_param
25+
if not isinstance(header_param, Unset):
26+
headers["header param"] = header_param
2627

27-
cookies["cookie param"] = cookie_param
28+
if cookie_param is not UNSET:
29+
cookies["cookie param"] = cookie_param
2830

2931
params: Dict[str, Any] = {}
3032
params["string param"] = string_param
@@ -39,6 +41,7 @@ def _get_kwargs(
3941
"headers": headers,
4042
"cookies": cookies,
4143
"timeout": client.get_timeout(),
44+
"follow_redirects": client.follow_redirects,
4245
"params": params,
4346
}
4447

@@ -47,7 +50,7 @@ def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any
4750
if response.status_code == HTTPStatus.OK:
4851
return None
4952
if client.raise_on_unexpected_status:
50-
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
53+
raise errors.UnexpectedStatus(response.status_code, response.content)
5154
else:
5255
return None
5356

@@ -65,19 +68,19 @@ def sync_detailed(
6568
path_param: str,
6669
*,
6770
client: Client,
68-
string_param: str,
69-
integer_param: int = 0,
70-
header_param: str,
71-
cookie_param: str,
71+
string_param: Union[Unset, None, str] = UNSET,
72+
integer_param: Union[Unset, None, int] = 0,
73+
header_param: Union[Unset, str] = UNSET,
74+
cookie_param: Union[Unset, str] = UNSET,
7275
) -> Response[Any]:
7376
"""Test different types of parameter references
7477
7578
Args:
7679
path_param (str):
77-
string_param (str):
78-
integer_param (int):
79-
header_param (str):
80-
cookie_param (str):
80+
string_param (Union[Unset, None, str]):
81+
integer_param (Union[Unset, None, int]):
82+
header_param (Union[Unset, str]):
83+
cookie_param (Union[Unset, str]):
8184
8285
Raises:
8386
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -108,19 +111,19 @@ async def asyncio_detailed(
108111
path_param: str,
109112
*,
110113
client: Client,
111-
string_param: str,
112-
integer_param: int = 0,
113-
header_param: str,
114-
cookie_param: str,
114+
string_param: Union[Unset, None, str] = UNSET,
115+
integer_param: Union[Unset, None, int] = 0,
116+
header_param: Union[Unset, str] = UNSET,
117+
cookie_param: Union[Unset, str] = UNSET,
115118
) -> Response[Any]:
116119
"""Test different types of parameter references
117120
118121
Args:
119122
path_param (str):
120-
string_param (str):
121-
integer_param (int):
122-
header_param (str):
123-
cookie_param (str):
123+
string_param (Union[Unset, None, str]):
124+
integer_param (Union[Unset, None, int]):
125+
header_param (Union[Unset, str]):
126+
cookie_param (Union[Unset, str]):
124127
125128
Raises:
126129
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.

‎end_to_end_tests/golden-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ def _get_kwargs(
3030
"headers": headers,
3131
"cookies": cookies,
3232
"timeout": client.get_timeout(),
33+
"follow_redirects": client.follow_redirects,
3334
"params": params,
3435
}
3536

@@ -38,7 +39,7 @@ def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any
3839
if response.status_code == HTTPStatus.OK:
3940
return None
4041
if client.raise_on_unexpected_status:
41-
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
42+
raise errors.UnexpectedStatus(response.status_code, response.content)
4243
else:
4344
return None
4445

‎end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ def _get_kwargs(
3030
"headers": headers,
3131
"cookies": cookies,
3232
"timeout": client.get_timeout(),
33+
"follow_redirects": client.follow_redirects,
3334
"params": params,
3435
}
3536

@@ -38,7 +39,7 @@ def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any
3839
if response.status_code == HTTPStatus.OK:
3940
return None
4041
if client.raise_on_unexpected_status:
41-
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
42+
raise errors.UnexpectedStatus(response.status_code, response.content)
4243
else:
4344
return None
4445

‎end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ def _get_kwargs(
3838
"headers": headers,
3939
"cookies": cookies,
4040
"timeout": client.get_timeout(),
41+
"follow_redirects": client.follow_redirects,
4142
"params": params,
4243
}
4344

@@ -46,7 +47,7 @@ def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any
4647
if response.status_code == HTTPStatus.OK:
4748
return None
4849
if client.raise_on_unexpected_status:
49-
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
50+
raise errors.UnexpectedStatus(response.status_code, response.content)
5051
else:
5152
return None
5253

‎end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@ def _get_kwargs(
2929
"headers": headers,
3030
"cookies": cookies,
3131
"timeout": client.get_timeout(),
32+
"follow_redirects": client.follow_redirects,
3233
}
3334

3435

3536
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3637
if response.status_code == HTTPStatus.OK:
3738
return None
3839
if client.raise_on_unexpected_status:
39-
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
40+
raise errors.UnexpectedStatus(response.status_code, response.content)
4041
else:
4142
return None
4243

‎end_to_end_tests/golden-record/my_test_api_client/api/responses/post_responses_unions_simple_before_complex.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def _get_kwargs(
2626
"headers": headers,
2727
"cookies": cookies,
2828
"timeout": client.get_timeout(),
29+
"follow_redirects": client.follow_redirects,
2930
}
3031

3132

@@ -37,7 +38,7 @@ def _parse_response(
3738

3839
return response_200
3940
if client.raise_on_unexpected_status:
40-
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
41+
raise errors.UnexpectedStatus(response.status_code, response.content)
4142
else:
4243
return None
4344

@@ -90,7 +91,7 @@ def sync(
9091
httpx.TimeoutException: If the request takes longer than Client.timeout.
9192
9293
Returns:
93-
Response[PostResponsesUnionsSimpleBeforeComplexResponse200]
94+
PostResponsesUnionsSimpleBeforeComplexResponse200
9495
"""
9596

9697
return sync_detailed(
@@ -133,7 +134,7 @@ async def asyncio(
133134
httpx.TimeoutException: If the request takes longer than Client.timeout.
134135
135136
Returns:
136-
Response[PostResponsesUnionsSimpleBeforeComplexResponse200]
137+
PostResponsesUnionsSimpleBeforeComplexResponse200
137138
"""
138139

139140
return (

‎end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ def _get_kwargs(
2323
"headers": headers,
2424
"cookies": cookies,
2525
"timeout": client.get_timeout(),
26+
"follow_redirects": client.follow_redirects,
2627
}
2728

2829

2930
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Any]:
3031
if response.status_code == HTTPStatus.OK:
3132
return None
3233
if client.raise_on_unexpected_status:
33-
raise errors.UnexpectedStatus(f"Unexpected status code: {response.status_code}")
34+
raise errors.UnexpectedStatus(response.status_code, response.content)
3435
else:
3536
return None
3637

0 commit comments

Comments
 (0)