mirror of
https://github.com/quay/quay.git
synced 2025-12-04 08:42:43 +03:00
Python 3 (#153)
* Convert all Python2 to Python3 syntax. * Removes oauth2lib dependency * Replace mockredis with fakeredis * byte/str conversions * Removes nonexisting __nonzero__ in Python3 * Python3 Dockerfile and related * [PROJQUAY-98] Replace resumablehashlib with rehash * PROJQUAY-123 - replace gpgme with python3-gpg * [PROJQUAY-135] Fix unhashable class error * Update external dependencies for Python 3 - Move github.com/app-registry/appr to github.com/quay/appr - github.com/coderanger/supervisor-stdout - github.com/DevTable/container-cloud-config - Update to latest mockldap with changes applied from coreos/mockldap - Update dependencies in requirements.txt and requirements-dev.txt * Default FLOAT_REPR function to str in json encoder and removes keyword assignment True, False, and str were not keywords in Python2... * [PROJQUAY-165] Replace package `bencode` with `bencode.py` - Bencode is not compatible with Python 3.x and is no longer maintained. Bencode.py appears to be a drop-in replacement/fork that is compatible with Python 3. * Make sure monkey.patch is called before anything else ( * Removes anunidecode dependency and replaces it with text_unidecode * Base64 encode/decode pickle dumps/loads when storing value in DB Base64 encodes/decodes the serialized values when storing them in the DB. Also make sure to return a Python3 string instead of a Bytes when coercing for db, otherwise, Postgres' TEXT field will convert it into a hex representation when storing the value. * Implement __hash__ on Digest class In Python 3, if a class defines __eq__() but not __hash__(), its instances will not be usable as items in hashable collections (e.g sets). * Remove basestring check * Fix expected message in credentials tests * Fix usage of Cryptography.Fernet for Python3 (#219) - Specifically, this addresses the issue where Byte<->String conversions weren't being applied correctly. * Fix utils - tar+stream layer format utils - filelike util * Fix storage tests * Fix endpoint tests * Fix workers tests * Fix docker's empty layer bytes * Fix registry tests * Appr * Enable CI for Python 3.6 * Skip buildman tests Skip buildman tests while it's being rewritten to allow ci to pass. * Install swig for CI * Update expected exception type in redis validation test * Fix gpg signing calls Fix gpg calls for updated gpg wrapper, and add signing tests. * Convert / to // for Python3 integer division * WIP: Update buildman to use asyncio instead of trollius. This dependency is considered deprecated/abandoned and was only used as an implementation/backport of asyncio on Python 2.x This is a work in progress, and is included in the PR just to get the rest of the tests passing. The builder is actually being rewritten. * Target Python 3.8 * Removes unused files - Removes unused files that were added accidentally while rebasing - Small fixes/cleanup - TODO tasks comments * Add TODO to verify rehash backward compat with resumablehashlib * Revert "[PROJQUAY-135] Fix unhashable class error" and implements __hash__ instead. This reverts commit 735e38e3c1d072bf50ea864bc7e119a55d3a8976. Instead, defines __hash__ for encryped fields class, using the parent field's implementation. * Remove some unused files ad imports Co-authored-by: Kenny Lee Sin Cheong <kenny.lee@redhat.com> Co-authored-by: Tom McKay <thomasmckay@redhat.com>
This commit is contained in:
@@ -3,7 +3,7 @@ Create, list and manage build triggers.
|
||||
"""
|
||||
|
||||
import logging
|
||||
from urlparse import urlunparse
|
||||
from urllib.parse import urlunparse
|
||||
|
||||
from flask import request, url_for
|
||||
|
||||
@@ -223,7 +223,7 @@ class BuildTriggerSubdirs(RepositoryParamResource):
|
||||
except TriggerException as exc:
|
||||
return {
|
||||
"status": "error",
|
||||
"message": exc.message,
|
||||
"message": str(exc),
|
||||
}
|
||||
else:
|
||||
raise Unauthorized()
|
||||
@@ -313,7 +313,7 @@ class BuildTriggerActivate(RepositoryParamResource):
|
||||
|
||||
except TriggerException as exc:
|
||||
write_token.delete_instance()
|
||||
raise request_error(message=exc.message)
|
||||
raise request_error(message=str(exc))
|
||||
|
||||
# Save the updated config.
|
||||
update_build_trigger(trigger, final_config, write_token=write_token)
|
||||
@@ -389,7 +389,7 @@ class BuildTriggerAnalyze(RepositoryParamResource):
|
||||
except TriggerException as rre:
|
||||
return {
|
||||
"status": "error",
|
||||
"message": "Could not analyze the repository: %s" % rre.message,
|
||||
"message": "Could not analyze the repository: %s" % rre,
|
||||
}
|
||||
except NotImplementedError:
|
||||
return {
|
||||
@@ -452,7 +452,7 @@ class ActivateBuildTrigger(RepositoryParamResource):
|
||||
prepared = handler.manual_start(run_parameters=run_parameters)
|
||||
build_request = start_build(repo, prepared, pull_robot_name=pull_robot_name)
|
||||
except TriggerException as tse:
|
||||
raise InvalidRequest(tse.message)
|
||||
raise InvalidRequest(str(tse)) from tse
|
||||
except MaximumBuildsQueuedException:
|
||||
abort(429, message="Maximum queued build rate exceeded.")
|
||||
except BuildTriggerDisabledException:
|
||||
@@ -567,7 +567,7 @@ class BuildTriggerSources(RepositoryParamResource):
|
||||
try:
|
||||
return {"sources": handler.list_build_sources_for_namespace(namespace)}
|
||||
except TriggerException as rre:
|
||||
raise InvalidRequest(rre.message)
|
||||
raise InvalidRequest(str(rre)) from rre
|
||||
else:
|
||||
raise Unauthorized()
|
||||
|
||||
@@ -597,6 +597,6 @@ class BuildTriggerSourceNamespaces(RepositoryParamResource):
|
||||
try:
|
||||
return {"namespaces": handler.list_build_source_namespaces()}
|
||||
except TriggerException as rre:
|
||||
raise InvalidRequest(rre.message)
|
||||
raise InvalidRequest(str(rre)) from rre
|
||||
else:
|
||||
raise Unauthorized()
|
||||
|
||||
Reference in New Issue
Block a user