kszucs commented on code in PR #48886:
URL: https://github.com/apache/arrow/pull/48886#discussion_r3395042388
##########
dev/archery/archery/crossbow/core.py:
##########
@@ -448,110 +447,88 @@ def file_contents(self, commit_id, file):
blob = self.repo[entry.id]
return blob.data
- def _github_login(self, github_token):
- """Returns a logged in github3.GitHub instance"""
- if not _have_github3:
- raise ImportError('Must install github3.py')
+ def _github_login(self, github_token=None):
+ """Returns a logged in Github instance using PyGithub"""
+ if not _have_github:
+ raise ImportError('Must install PyGithub')
github_token = github_token or self.github_token
- session = github3.session.GitHubSession(
- default_connect_timeout=10,
- default_read_timeout=30
- )
- github = github3.GitHub(session=session)
- github.login(token=github_token)
- return github
+ return Github(auth=GithubAuth.Token(github_token), timeout=30)
def as_github_repo(self, github_token=None):
"""Converts it to a repository object which wraps the GitHub API"""
if self._github_repo is None:
github = self._github_login(github_token)
username, reponame = _parse_github_user_repo(self.remote_url)
- self._github_repo = github.repository(username, reponame)
+ self._github_repo = github.get_repo(f"{username}/{reponame}")
return self._github_repo
def token_expiration_date(self, github_token=None):
"""Returns the expiration date for the github_token provided"""
github = self._github_login(github_token)
- # github3 hides the headers from us. Use the _get method
- # to access the response headers.
- resp = github._get(github.session.base_url)
- # Response in the form '2023-01-23 10:40:28 UTC'
- date_string = resp.headers.get(
- 'github-authentication-token-expiration')
+ # NOTE: We access the private _Github__requester to get response
+ # headers, as PyGithub doesn't expose the token expiration header
+ # through its public API. This may break with future PyGithub updates.
+ headers, _ = github._Github__requester.requestJsonAndCheck(
+ "GET", "/user"
+ )
+ # Response header in the form '2023-01-23 10:40:28 UTC'
+ date_string = headers.get('github-authentication-token-expiration')
if date_string:
return date.fromisoformat(date_string.split()[0])
+ return None
def github_commit(self, sha):
repo = self.as_github_repo()
- return repo.commit(sha)
+ return repo.get_commit(sha)
def github_release(self, tag):
repo = self.as_github_repo()
try:
- return repo.release_from_tag(tag)
- except github3.exceptions.NotFoundError:
- return None
-
- def github_upload_asset_requests(self, release, path, name, mime,
- max_retries=None, retry_backoff=None):
+ return repo.get_release(tag)
+ except GithubException as e:
+ if e.status == 404:
+ return None
+ raise
+
+ def github_upload_asset(self, release, path, name, mime,
+ max_retries=None, retry_backoff=None):
if max_retries is None:
max_retries = int(os.environ.get('CROSSBOW_MAX_RETRIES', 8))
if retry_backoff is None:
retry_backoff = int(os.environ.get('CROSSBOW_RETRY_BACKOFF', 5))
for i in range(max_retries):
try:
- with open(path, 'rb') as fp:
- result = release.upload_asset(name=name, asset=fp,
- content_type=mime)
- except github3.exceptions.ResponseError as e:
+ result = release.upload_asset(path, label=name,
+ content_type=mime)
+ logger.info(f"Attempt {i + 1} has finished.")
+ return result
Review Comment:
This review comment seems to be off too.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
