Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions add_to_pydotorg.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ def run_cmd(

tag_cre = re.compile(r"(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:([ab]|rc)(\d+))?$")

headers = {"Authorization": f"ApiKey {auth_info}", "Content-Type": "application/json"}
session = requests.Session()
session.headers.update(
{"Authorization": f"ApiKey {auth_info}", "Content-Type": "application/json"}
)

github_oidc_provider = "https://github.com/login/oauth"
google_oidc_provider = "https://accounts.google.com"
Expand Down Expand Up @@ -297,7 +300,7 @@ def query_object(base_url: str, objtype: str, **params: Any) -> int:
"""Find an API object by query parameters."""
uri = base_url + f"downloads/{objtype}/"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
uri = base_url + f"downloads/{objtype}/"
uri = f"{base_url}downloads/{objtype}/"

uri += "?" + "&".join(f"{k}={v}" for k, v in params.items())
resp = requests.get(uri, headers=headers)
resp = session.get(uri)
if resp.status_code != 200 or not json.loads(resp.text)["objects"]:
raise RuntimeError(f"no object for {objtype} params={params!r}")
obj = json.loads(resp.text)["objects"][0]
Expand All @@ -306,10 +309,9 @@ def query_object(base_url: str, objtype: str, **params: Any) -> int:

def post_object(base_url: str, objtype: str, datadict: dict[str, Any]) -> int:
"""Create a new API object."""
resp = requests.post(
resp = session.post(
base_url + "downloads/" + objtype + "/",
data=json.dumps(datadict),
headers=headers,
)
Comment on lines +312 to 315
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
resp = session.post(
base_url + "downloads/" + objtype + "/",
data=json.dumps(datadict),
headers=headers,
)
resp = session.post(f"{base_url}downloads/{objtype}/", data=json.dumps(datadict))

if resp.status_code != 201:
try:
Expand Down Expand Up @@ -472,9 +474,7 @@ def main() -> None:
raise RuntimeError(f"duplicate slug generated: {key}")
file_dicts[key] = file_dict
print("Deleting previous release files")
resp = requests.delete(
args.base_url + f"downloads/release_file/?release={rel_pk}", headers=headers
)
resp = session.delete(f"{args.base_url}downloads/release_file/?release={rel_pk}")
if resp.status_code != 204:
raise RuntimeError(f"deleting previous releases failed: {resp.status_code}")
for file_dict in file_dicts.values():
Expand Down
Loading