| |
@@ -136,11 +136,9 @@
|
| |
"rpms": "rpm",
|
| |
"modules": "module",
|
| |
"container": "container",
|
| |
- "flatpaks": "flatpak"
|
| |
+ "flatpaks": "flatpak",
|
| |
}
|
| |
- to_pdc_namespace = (
|
| |
- flask.current_app.config.get("PDC_NAMESPACES") or to_pdc_namespace
|
| |
- )
|
| |
+ to_pdc_namespace = flask.current_app.config.get("PDC_NAMESPACES") or to_pdc_namespace
|
| |
|
| |
try:
|
| |
pdc_namespace = to_pdc_namespace[namespace]
|
| |
@@ -148,8 +146,7 @@
|
| |
raise pagure.exceptions.APIError(
|
| |
500,
|
| |
error_code=APIERROR.ENOCODE,
|
| |
- error="Namespace: %s could not be converted to a PDC namespace"
|
| |
- % namespace,
|
| |
+ error="Namespace: %s could not be converted to a PDC namespace" % namespace,
|
| |
)
|
| |
|
| |
branch = "master"
|
| |
@@ -184,9 +181,7 @@
|
| |
error="The output of %s could not be converted to JSON" % req.url,
|
| |
)
|
| |
|
| |
- _log.info(
|
| |
- "%s/%s is active: %s", namespace, name, data["results"][0]["active"]
|
| |
- )
|
| |
+ _log.info("%s/%s is active: %s", namespace, name, data["results"][0]["active"])
|
| |
return data["results"][0]["active"] is True
|
| |
|
| |
|
| |
@@ -221,7 +216,11 @@
|
| |
output["orphan"] = True
|
| |
if repo.orphan_reason:
|
| |
output["reason"] = repo.orphan_reason.reason
|
| |
- output["reason_info"] = repo.orphan_reason.reason_info
|
| |
+ output["reason_info"] = (
|
| |
+ ""
|
| |
+ if repo.orphan_reason.reason_info is None
|
| |
+ else repo.orphan_reason.reason_info
|
| |
+ )
|
| |
return flask.jsonify(output)
|
| |
|
| |
|
| |
@@ -267,9 +266,7 @@
|
| |
repo = _get_repo(repo, namespace=namespace)
|
| |
_check_token(repo, project_token=False)
|
| |
|
| |
- user_obj = pagure.lib.query.get_user(
|
| |
- flask.g.session, flask.g.fas_user.username
|
| |
- )
|
| |
+ user_obj = pagure.lib.query.get_user(flask.g.session, flask.g.fas_user.username)
|
| |
if not user_obj:
|
| |
raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOUSER)
|
| |
|
| |
@@ -278,8 +275,7 @@
|
| |
401, error_code=APIERROR.EMODIFYPROJECTNOTALLOWED
|
| |
)
|
| |
|
| |
- if repo.user.user != flask.g.fas_user.username \
|
| |
- and not pagure.utils.is_admin():
|
| |
+ if repo.user.user != flask.g.fas_user.username and not pagure.utils.is_admin():
|
| |
raise pagure.exceptions.APIError(
|
| |
401, error_code=APIERROR.EMODIFYPROJECTNOTALLOWED
|
| |
)
|
| |
@@ -299,9 +295,7 @@
|
| |
reason_info=form.orphan_reason_info.data,
|
| |
)
|
| |
flask.g.session.add(reason)
|
| |
- pagure.lib.query.set_project_owner(
|
| |
- flask.g.session, repo, orphan_user_obj
|
| |
- )
|
| |
+ pagure.lib.query.set_project_owner(flask.g.session, repo, orphan_user_obj)
|
| |
if user_obj in repo.users:
|
| |
pagure.lib.query.remove_user_of_project(
|
| |
flask.g.session, user_obj, repo, user_obj.user
|
| |
@@ -343,9 +337,7 @@
|
| |
repo = _get_repo(repo, namespace=namespace)
|
| |
_check_token(repo, project_token=False)
|
| |
|
| |
- user_obj = pagure.lib.query.get_user(
|
| |
- flask.g.session, flask.g.fas_user.username
|
| |
- )
|
| |
+ user_obj = pagure.lib.query.get_user(flask.g.session, flask.g.fas_user.username)
|
| |
if not user_obj:
|
| |
raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOUSER)
|
| |
|
| |
@@ -398,7 +390,8 @@
|
| |
def query_oraculum_versions(package):
|
| |
"""
|
| |
Receives package versions from oraculum
|
| |
- Returns triplet: fedora-releases, updates-for-package, F%number-of-current-rawhide
|
| |
+ Returns triplet: fedora-releases, updates-for-package,
|
| |
+ F%number-of-current-rawhide
|
| |
"""
|
| |
|
| |
oraculum_base_url = "https://packager-dashboard.fedoraproject.org/api/"
|
| |
@@ -412,8 +405,8 @@
|
| |
raise pagure.exceptions.APIError(
|
| |
500,
|
| |
error_code=APIERROR.ENOCODE,
|
| |
- error="This pagure instance has no ORACULUM_URL configured, please "
|
| |
- "inform your pagure administrators",
|
| |
+ error="This pagure instance has no ORACULUM_URL configured,"
|
| |
+ "please inform your pagure administrators",
|
| |
)
|
| |
|
| |
_log.debug("Based ORACULUM url: %s", oraculum_url)
|
| |
@@ -422,17 +415,17 @@
|
| |
|
| |
if not req_releases.ok:
|
| |
raise pagure.exceptions.APIError(
|
| |
- 400,
|
| |
- error_code=APIERROR.EINVALIDREQ,
|
| |
- errors=["Could not call oraculum to query current Fedora Releases."],
|
| |
- )
|
| |
+ 400,
|
| |
+ error_code=APIERROR.EINVALIDREQ,
|
| |
+ errors=["Could not call oraculum to query current Fedora Releases."],
|
| |
+ )
|
| |
|
| |
if not req_versions.ok:
|
| |
raise pagure.exceptions.APIError(
|
| |
- 400,
|
| |
- error_code=APIERROR.EINVALIDREQ,
|
| |
- errors=["Could not call oraculum to query current package versions."],
|
| |
- )
|
| |
+ 400,
|
| |
+ error_code=APIERROR.EINVALIDREQ,
|
| |
+ errors=["Could not call oraculum to query current package versions."],
|
| |
+ )
|
| |
|
| |
versions_resp = req_versions.json()
|
| |
releases_resp = req_releases.json()
|
| |
@@ -466,10 +459,12 @@
|
| |
|
| |
return releases, versions, rawhide
|
| |
|
| |
+
|
| |
def query_bodhi_versions(repo):
|
| |
"""
|
| |
Receives package versions from bodhi
|
| |
- Returns triplet: fedora-releases, updates-for-package, F%number-of-current-rawhide
|
| |
+ Returns triplet: fedora-releases, updates-for-package,
|
| |
+ F%number-of-current-rawhide
|
| |
"""
|
| |
bodhi_base_url = "https://bodhi.fedoraproject.org/"
|
| |
|
| |
@@ -559,6 +554,7 @@
|
| |
|
| |
return releases, updates, rawhide
|
| |
|
| |
+
|
| |
@DISTGIT_NS.route("/bodhi_updates/<namespace>/<repo>", methods=["GET"])
|
| |
@api_method
|
| |
def bodhi_updates_endpoint(namespace, repo):
|
| |
@@ -570,9 +566,7 @@
|
| |
errors=["Namespace not supported"],
|
| |
)
|
| |
|
| |
- _log.info(
|
| |
- "Received request for the bodhi updates of: %s/%s", namespace, repo
|
| |
- )
|
| |
+ _log.info("Received request for the bodhi updates of: %s/%s", namespace, repo)
|
| |
|
| |
repo = _get_repo(repo, namespace=namespace)
|
| |
html = pagure.utils.is_true(flask.request.args.get("html", False))
|
| |
@@ -604,7 +598,8 @@
|
| |
else:
|
| |
# This makes things a little slower but is needed for builds
|
| |
# that do not go through bodhi, for example, via releng-managed
|
| |
- # side tags (like for Fedora mass rebuilds), which bypass bodhi.
|
| |
+ # side tags (like for Fedora mass rebuilds),
|
| |
+ # which bypass bodhi.
|
| |
if release == rawhide:
|
| |
mdapi_release = "rawhide"
|
| |
else:
|
| |
@@ -625,9 +620,7 @@
|
| |
)
|
| |
stable = (
|
| |
"<a href='https://koji.fedoraproject.org/koji/search?"
|
| |
- "terms={0}&type=build&match=exact'>{0}</a>".format(
|
| |
- build
|
| |
- )
|
| |
+ "terms={0}&type=build&match=exact'>{0}</a>".format(build)
|
| |
)
|
| |
testing = ""
|
| |
if updates.get(release, {}).get("testing"):
|
| |
@@ -637,9 +630,7 @@
|
| |
updates[release].get("testing")
|
| |
)
|
| |
)
|
| |
- row = row.format(
|
| |
- release=releases[release], stable=stable, testing=testing
|
| |
- )
|
| |
+ row = row.format(release=releases[release], stable=stable, testing=testing)
|
| |
html_output += row
|
| |
html_output += "</table>"
|
| |
return html_output
|
| |
@@ -673,7 +664,7 @@
|
| |
"""Updates the default assignees of this package."""
|
| |
|
| |
def _validate_input(inputname):
|
| |
- """ Validate if the input is either an username or a group name. """
|
| |
+ """Validate if the input is either an username or a group name."""
|
| |
valid = False
|
| |
if inputname.startswith("@"):
|
| |
group = pagure.lib.query.search_groups(
|
| |
@@ -683,9 +674,7 @@
|
| |
valid = True
|
| |
|
| |
else:
|
| |
- user_obj = pagure.lib.query.search_user(
|
| |
- flask.g.session, username=inputname
|
| |
- )
|
| |
+ user_obj = pagure.lib.query.search_user(flask.g.session, username=inputname)
|
| |
if user_obj:
|
| |
valid = True
|
| |
|
| |
Some tests were failing in master branch.
Now all the tests are passing.