From 5ed5dcfa4aaf21aa0d60b50e37732c47af7d9c25 Mon Sep 17 00:00:00 2001 From: Jatin Dhankhar Date: Tue, 25 Jul 2017 19:36:21 +0530 Subject: [PATCH 1/2] Bump to Fedora 26 --- activity-build-docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activity-build-docker/Dockerfile b/activity-build-docker/Dockerfile index ca77912..198bd6b 100644 --- a/activity-build-docker/Dockerfile +++ b/activity-build-docker/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:22 +FROM fedora:26 RUN dnf install -y git gettext sugar-toolkit-gtk3 sugar-toolkit From 0801228c8685dd1e68e3c6a32111e2c1fca96a62 Mon Sep 17 00:00:00 2001 From: Jatin Dhankhar Date: Tue, 25 Jul 2017 22:05:56 +0530 Subject: [PATCH 2/2] Fix Url split issue with urlparse. Always pass repo_name supplied by github instead of using passing full url --- aslo/api/gh.py | 6 +----- aslo/api/release.py | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/aslo/api/gh.py b/aslo/api/gh.py index 4ec0d91..79155e6 100644 --- a/aslo/api/gh.py +++ b/aslo/api/gh.py @@ -1,7 +1,6 @@ import hmac import hashlib from flask import current_app as app -from urllib.parse import urlparse from github import Github @@ -16,11 +15,8 @@ def auth(): def get_developers(repo_url): - o = urlparse(repo_url) - repo = o.path[1:].strip('.git') - g = auth() - repository = g.get_repo(repo) + repository = g.get_repo(repo_url) contributors = repository.get_contributors() developers = [] for c in contributors: diff --git a/aslo/api/release.py b/aslo/api/release.py index c8603a2..0b536ea 100644 --- a/aslo/api/release.py +++ b/aslo/api/release.py @@ -316,7 +316,7 @@ def handle_release(gh_json): metadata['i18n_summary'] = {'en': metadata.get('summary', '')} metadata['repository'] = repo_url - metadata['developers'] = gh.get_developers(metadata['repository']) + metadata['developers'] = gh.get_developers(gh_json['repository']['full_name']) metadata['icon_bin'] = img.get_icon(repo_path, metadata['icon']) try: