Skip to content

Commit fd77b1a

Browse files
cmlcciecmlccie
committed
Merge branch 'master' into v1.7
- Fix linting and errors from the master branch - Update dependencies (Pipfile, Pipfile.lock, requirements.txt, requirements.lock) - Update Ruff configuration
2 parents f7d0e13 + a539c23 commit fd77b1a

23 files changed

+1539
-457
lines changed

‎.ruff.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
line-length = 79
22

3-
# B: flake8-bugbear
4-
# Q: flake8-quotes
5-
extend-select = [ "B", "Q", "W" ]
6-
7-
ignore-init-module-imports = true
83

94
extend-exclude = [
105
"versioneer.py",
@@ -13,6 +8,11 @@ extend-exclude = [
138
]
149

1510
[lint]
11+
# B: flake8-bugbear
12+
# Q: flake8-quotes
13+
extend-select = [ "B", "Q", "W" ]
14+
15+
ignore-init-module-imports = true
1616
ignore = [
1717
# E402 module level import not at top of file
1818
"E402",

‎Pipfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ pytest = "*"
1414
flake8 = "*"
1515
twine = "*"
1616
ipython = "*"
17+
pyyaml = "*"

‎Pipfile.lock

Lines changed: 459 additions & 335 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎generator/generate.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import sys
21
import os
32
import yaml
43
import argparse
@@ -80,17 +79,16 @@ def render_api_class(
8079

8180
# Render template
8281
tpl = env.get_template(template_name)
83-
out = (
84-
tpl.render(
85-
name=descr["name"],
86-
endpoint=descr["endpoint"],
87-
object_type=descr["object_type"],
88-
query_parameters=descr["query_parameters"],
89-
create_parameters=create_parameters,
90-
update_parameters=update_parameters,
91-
methods=descr["methods"],
92-
additional_code=additional_code,
93-
),
82+
out = tpl.render(
83+
name=descr['name'],
84+
endpoint=descr['endpoint'],
85+
object_type=descr['object_type'],
86+
url_parameters=descr['url_parameters'],
87+
query_parameters=descr['query_parameters'],
88+
create_parameters=create_parameters,
89+
update_parameters=update_parameters,
90+
methods=descr['methods'],
91+
additional_code=additional_code,
9492
)
9593

9694
target_path = os.path.join(path_prefix, f"{base_name}.py")
@@ -153,6 +151,10 @@ def main():
153151
else:
154152
d = d.get(sub_key)
155153

154+
# Add empty url_parameters key if there are no URL parameters defined
155+
if 'url_parameters' not in descr.keys():
156+
descr['url_parameters'] = []
157+
156158
mixin_path = render_prop_mixin(
157159
env=env,
158160
name=descr["name"],

‎generator/models/meeting_registrants.yaml

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
name: MeetingRegistrant
2+
endpoint: meetings/{meetingId}/registrants
3+
object_type: meetingRegistrant
4+
methods:
5+
- list
6+
- get
7+
- create
8+
- delete
9+
url_parameters:
10+
- name: meetingId
11+
description: Unique identifier for the meeting.
12+
type: basestring
13+
query_parameters:
14+
- name: max
15+
description: Limit the maximum number of registrants in the response, up to 100.
16+
optional: True
17+
type: int
18+
- name: hostEmail
19+
description: Email address for the meeting host.
20+
optional: True
21+
type: basestring
22+
- name: current
23+
description: Whether or not to retrieve only the current scheduled meeting of the meeting series, i.e. the meeting ready to join or start or the upcoming meeting of the meeting series.
24+
optional: True
25+
type: bool
26+
- name: email
27+
description: Registrant's email to filter registrants.
28+
optional: True
29+
type: basestring
30+
- name: registrationTimeFrom
31+
description: The time registrants register a meeting starts from the specified date and time (inclusive) in any ISO 8601 compliant format.
32+
optional: True
33+
type: basestring
34+
- name: registrationTimeTo
35+
description: The time registrants register a meeting before the specified date and time (exclusive) in any ISO 8601 compliant format.
36+
optional: True
37+
type: basestring
38+
list:
39+
properties:
40+
- name: registrantId
41+
description: New registrant's ID.
42+
type: basestring
43+
- name: status
44+
description: New registrant's status.
45+
type: basestring
46+
- name: firstName
47+
description: Registrant's first name.
48+
type: basestring
49+
- name: lastName
50+
description: Registrant's last name.
51+
type: basestring
52+
- name: email
53+
description: Registrant's email.
54+
type: basestring
55+
- name: jobTitle
56+
description: Registrant's job title.
57+
type: basestring
58+
- name: companyName
59+
description: Registrant's company.
60+
type: basestring
61+
- name: address1
62+
description: Registrant's first address line.
63+
type: basestring
64+
- name: address2
65+
description: Registrant's second address line.
66+
type: basestring
67+
- name: city
68+
description: Registrant's city name.
69+
type: basestring
70+
- name: state
71+
description: Registrant's state.
72+
type: basestring
73+
- name: zipCode
74+
description: Registrant's postal code.
75+
type: int
76+
- name: countryRegion
77+
description: Registrant's country or region.
78+
type: basestring
79+
- name: workPhone
80+
description: Registrant's work phone number.
81+
type: basestring
82+
- name: fax
83+
description: Registrant's FAX number.
84+
type: basestring
85+
- name: registrationTime
86+
description: Registrant's registration time.
87+
type: basestring
88+
- name: customizedQuestions
89+
description: List of registrant's answers for customized questions,
90+
type: list
91+
- name: sourceId
92+
description: Registrant's source id.
93+
type: basestring
94+
- name: registrationId
95+
description: Registrant's registration ID.
96+
type: basestring
97+
98+
create:
99+
required:
100+
- firstName
101+
- lastName
102+
- email
103+
optional:
104+
- name: sendEmail
105+
description: If true send email to the registrant.
106+
type: bool
107+
- jobTitle
108+
- address1
109+
- address2
110+
- city
111+
- state
112+
- zipCode
113+
- countryRegion
114+
- workPhone
115+
- fax
116+
- customizedQuestions
117+
update:
118+
# required:
119+
optional:
120+
- firstName
121+
- lastName
122+
- email
123+
- name: sendEmail
124+
description: If true send email to the registrant.
125+
type: bool
126+
- jobTitle
127+
- address1
128+
- address2
129+
- city
130+
- state
131+
- zipCode
132+
- countryRegion
133+
- workPhone
134+
- fax
135+
- customizedQuestions

‎generator/requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Jinja2==3.1.3
2+
MarkupSafe==2.1.5
3+
PyYAML==6.0.1

0 commit comments

Comments
 (0)