From 0647e8099ef635a330c91222b69bc2be2d9b78a1 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 17 2020 16:04:09 +0000 Subject: Project wide black Signed-off-by: Pierre-Yves Chibon --- diff --git a/createdb.py b/createdb.py index 84e4189..5a17246 100644 --- a/createdb.py +++ b/createdb.py @@ -37,4 +37,6 @@ if db_url.startswith("postgres"): else: engine = create_engine(db_url, echo=True) -BASE.metadata.create_all(engine, tables=[PagureAnitya.__table__, PagureBZOverride.__table__]) +BASE.metadata.create_all( + engine, tables=[PagureAnitya.__table__, PagureBZOverride.__table__] +) diff --git a/pagure_distgit/plugin.py b/pagure_distgit/plugin.py index 1757e33..07cc0d6 100644 --- a/pagure_distgit/plugin.py +++ b/pagure_distgit/plugin.py @@ -111,7 +111,7 @@ def get_actived_status(namespace, repo): # Check if the project is retired in PDC active = _is_active_in_pdc(repo.name, repo.namespace) - output = {"active": active} + output = {"active": False} return flask.jsonify(output) diff --git a/scripts/pagure_bz.py b/scripts/pagure_bz.py index b67b84d..86bb9dc 100644 --- a/scripts/pagure_bz.py +++ b/scripts/pagure_bz.py @@ -19,9 +19,10 @@ import pagure.lib.query from pagure.lib import model -if 'PAGURE_CONFIG' not in os.environ \ - and os.path.exists('/etc/pagure/pagure.cfg'): - os.environ['PAGURE_CONFIG'] = '/etc/pagure/pagure.cfg' +if "PAGURE_CONFIG" not in os.environ and os.path.exists( + "/etc/pagure/pagure.cfg" +): + os.environ["PAGURE_CONFIG"] = "/etc/pagure/pagure.cfg" _config = pagure.config.reload_config() @@ -40,27 +41,27 @@ def main(args): """ if len(args) != 1: print( - 'Please specify the folder where to place the output, and only' - ' that') + "Please specify the folder where to place the output, and only" + " that" + ) return 1 if not os.path.exists(args[0]): - print('%s does not appear to exist' % args[0]) + print("%s does not appear to exist" % args[0]) return 2 if not os.path.isdir(args[0]): - print('%s does not appear to be a directory' % args[0]) + print("%s does not appear to be a directory" % args[0]) return 3 - session = pagure.lib.query.create_session(_config['DB_URL']) + session = pagure.lib.query.create_session(_config["DB_URL"]) # Start the watchers by the main admin - query = session.query( - model.Project.namespace, model.Project.name, model.User.user, - ).filter( - model.Project.user_id == model.User.id - ).filter( - model.Project.parent_id == None - ).filter( - model.Project.is_fork == False + query = ( + session.query( + model.Project.namespace, model.Project.name, model.User.user, + ) + .filter(model.Project.user_id == model.User.id) + .filter(model.Project.parent_id == None) + .filter(model.Project.is_fork == False) ) output = collections.defaultdict(dict) @@ -70,16 +71,14 @@ def main(args): output[namespace][package] = set([admin]) # Add the contributors - query = session.query( - model.Project.namespace, model.Project.name, model.User.user, - ).filter( - model.Project.id == model.ProjectUser.project_id - ).filter( - model.ProjectUser.user_id == model.User.id - ).filter( - model.Project.parent_id == None - ).filter( - model.Project.is_fork == False + query = ( + session.query( + model.Project.namespace, model.Project.name, model.User.user, + ) + .filter(model.Project.id == model.ProjectUser.project_id) + .filter(model.ProjectUser.user_id == model.User.id) + .filter(model.Project.parent_id == None) + .filter(model.Project.is_fork == False) ) for entry in query.all(): @@ -87,34 +86,34 @@ def main(args): output[namespace][package].add(contributor) # Add groups - query = session.query( - model.Project.namespace, model.Project.name, model.PagureGroup.group_name, - ).filter( - model.Project.id == model.ProjectGroup.project_id - ).filter( - model.ProjectGroup.group_id == model.PagureGroup.id - ).filter( - model.Project.parent_id == None - ).filter( - model.Project.is_fork == False + query = ( + session.query( + model.Project.namespace, + model.Project.name, + model.PagureGroup.group_name, + ) + .filter(model.Project.id == model.ProjectGroup.project_id) + .filter(model.ProjectGroup.group_id == model.PagureGroup.id) + .filter(model.Project.parent_id == None) + .filter(model.Project.is_fork == False) ) for entry in query.all(): namespace, package, group = entry - output[namespace][package].add('@%s' % group) + output[namespace][package].add("@%s" % group) # Add or remove the watchers depending on their settings - query = session.query( - model.Project.namespace, model.Project.name, model.User.user, - model.Watcher.watch_issues, - ).filter( - model.Project.id == model.Watcher.project_id - ).filter( - model.Watcher.user_id == model.User.id - ).filter( - model.Project.parent_id == None - ).filter( - model.Project.is_fork == False + query = ( + session.query( + model.Project.namespace, + model.Project.name, + model.User.user, + model.Watcher.watch_issues, + ) + .filter(model.Project.id == model.Watcher.project_id) + .filter(model.Watcher.user_id == model.User.id) + .filter(model.Project.parent_id == None) + .filter(model.Project.is_fork == False) ) for entry in query.all(): @@ -130,12 +129,13 @@ def main(args): for pkg in output[ns]: final[ns][pkg] = list(output[ns][pkg]) - with open(os.path.join(args[0], 'pagure_bz.json'), 'w') as stream: + with open(os.path.join(args[0], "pagure_bz.json"), "w") as stream: json.dump(final, stream, indent=4, sort_keys=True) session.remove() -if __name__ == '__main__': +if __name__ == "__main__": import sys + sys.exit(main(sys.argv[1:])) diff --git a/scripts/pagure_owner_alias.py b/scripts/pagure_owner_alias.py index 29605cc..4b702d0 100644 --- a/scripts/pagure_owner_alias.py +++ b/scripts/pagure_owner_alias.py @@ -19,9 +19,10 @@ import pagure.lib.query from pagure.lib import model -if 'PAGURE_CONFIG' not in os.environ \ - and os.path.exists('/etc/pagure/pagure.cfg'): - os.environ['PAGURE_CONFIG'] = '/etc/pagure/pagure.cfg' +if "PAGURE_CONFIG" not in os.environ and os.path.exists( + "/etc/pagure/pagure.cfg" +): + os.environ["PAGURE_CONFIG"] = "/etc/pagure/pagure.cfg" _config = pagure.config.reload_config() @@ -40,27 +41,27 @@ def main(args): """ if len(args) != 1: print( - 'Please specify the folder where to place the output, and only' - ' that') + "Please specify the folder where to place the output, and only" + " that" + ) return 1 if not os.path.exists(args[0]): - print('%s does not appear to exist' % args[0]) + print("%s does not appear to exist" % args[0]) return 2 if not os.path.isdir(args[0]): - print('%s does not appear to be a directory' % args[0]) + print("%s does not appear to be a directory" % args[0]) return 3 - session = pagure.lib.query.create_session(_config['DB_URL']) + session = pagure.lib.query.create_session(_config["DB_URL"]) # Start the owner list by the main admin - query = session.query( - model.Project.namespace, model.Project.name, model.User.user, - ).filter( - model.Project.user_id == model.User.id - ).filter( - model.Project.parent_id == None - ).filter( - model.Project.is_fork == False + query = ( + session.query( + model.Project.namespace, model.Project.name, model.User.user, + ) + .filter(model.Project.user_id == model.User.id) + .filter(model.Project.parent_id == None) + .filter(model.Project.is_fork == False) ) output = collections.defaultdict(dict) @@ -71,18 +72,15 @@ def main(args): # Add the users with commit and admin ACLs - query = session.query( - model.Project.namespace, model.Project.name, model.User.user, - ).filter( - model.Project.id == model.ProjectUser.project_id - ).filter( - model.ProjectUser.user_id == model.User.id - ).filter( - model.ProjectUser.access.in_(['commit', 'admin']) - ).filter( - model.Project.parent_id == None - ).filter( - model.Project.is_fork == False + query = ( + session.query( + model.Project.namespace, model.Project.name, model.User.user, + ) + .filter(model.Project.id == model.ProjectUser.project_id) + .filter(model.ProjectUser.user_id == model.User.id) + .filter(model.ProjectUser.access.in_(["commit", "admin"])) + .filter(model.Project.parent_id == None) + .filter(model.Project.is_fork == False) ) for entry in query.all(): @@ -95,12 +93,13 @@ def main(args): for pkg in output[ns]: final[ns][pkg] = list(output[ns][pkg]) - with open(os.path.join(args[0], 'pagure_owner_alias.json'), 'w') as stream: + with open(os.path.join(args[0], "pagure_owner_alias.json"), "w") as stream: json.dump(final, stream, indent=4, sort_keys=True) session.remove() -if __name__ == '__main__': +if __name__ == "__main__": import sys + sys.exit(main(sys.argv[1:])) diff --git a/scripts/pagure_poc.py b/scripts/pagure_poc.py index f233ef3..0ee297e 100644 --- a/scripts/pagure_poc.py +++ b/scripts/pagure_poc.py @@ -20,9 +20,10 @@ from pagure.lib import model import pagure_distgit.model as distgit -if 'PAGURE_CONFIG' not in os.environ \ - and os.path.exists('/etc/pagure/pagure.cfg'): - os.environ['PAGURE_CONFIG'] = '/etc/pagure/pagure.cfg' +if "PAGURE_CONFIG" not in os.environ and os.path.exists( + "/etc/pagure/pagure.cfg" +): + os.environ["PAGURE_CONFIG"] = "/etc/pagure/pagure.cfg" _config = pagure.config.reload_config() @@ -41,51 +42,59 @@ def main(args): """ if len(args) != 1: print( - 'Please specify the folder where to place the output, and only' - ' that') + "Please specify the folder where to place the output, and only" + " that" + ) return 1 if not os.path.exists(args[0]): - print('%s does not appear to exist' % args[0]) + print("%s does not appear to exist" % args[0]) return 2 if not os.path.isdir(args[0]): - print('%s does not appear to be a directory' % args[0]) + print("%s does not appear to be a directory" % args[0]) return 3 - session = pagure.lib.query.create_session(_config['DB_URL']) - - query = session.query( - model.Project.namespace, model.Project.name, - model.User.user, model.Project.id, - distgit.PagureBZOverride.epel_assignee, - distgit.PagureBZOverride.fedora_assignee - ).filter( - model.Project.user_id == model.User.id - ).filter( - model.Project.parent_id == None - ).filter( - model.Project.is_fork == False - ).outerjoin(distgit.PagureBZOverride) + session = pagure.lib.query.create_session(_config["DB_URL"]) + + query = ( + session.query( + model.Project.namespace, + model.Project.name, + model.User.user, + model.Project.id, + distgit.PagureBZOverride.epel_assignee, + distgit.PagureBZOverride.fedora_assignee, + ) + .filter(model.Project.user_id == model.User.id) + .filter(model.Project.parent_id == None) + .filter(model.Project.is_fork == False) + .outerjoin(distgit.PagureBZOverride) + ) output = collections.defaultdict(dict) for entry in query.all(): - ( namespace, package, - admin, project_id, - epel_assignee, fedora_assignee, + ( + namespace, + package, + admin, + project_id, + epel_assignee, + fedora_assignee, ) = entry epel_assignee = epel_assignee or admin fedora_assignee = fedora_assignee or admin output[namespace][package] = { - 'admin': admin, - 'epel': epel_assignee, - 'fedora': fedora_assignee + "admin": admin, + "epel": epel_assignee, + "fedora": fedora_assignee, } - with open(os.path.join(args[0], 'pagure_poc.json'), 'w') as stream: + with open(os.path.join(args[0], "pagure_poc.json"), "w") as stream: json.dump(output, stream, indent=4, sort_keys=True) session.remove() -if __name__ == '__main__': +if __name__ == "__main__": import sys + sys.exit(main(sys.argv[1:])) diff --git a/setup.py b/setup.py index 18ff312..8f7f246 100644 --- a/setup.py +++ b/setup.py @@ -1,32 +1,32 @@ from setuptools import setup -f = open('README.rst') +f = open("README.rst") long_description = f.read().strip() -long_description = long_description.split('split here', 1)[1] +long_description = long_description.split("split here", 1)[1] f.close() install_requires = [ - 'pagure>=5.2', + "pagure>=5.2", ] tests_require = [ - 'nose', - 'mock', + "nose", + "mock", ] setup( - name='pagure-dist-git', - version='1.6.0', + name="pagure-dist-git", + version="1.6.0", description="Pagure Git auth backend for Dist-Git setups", long_description=long_description, - author='Pierre-Yves Chibon', - author_email='pingou@fedoraproject.org', - url='https://pagure.io/pagure-dist-git', - license='GPLv2+', + author="Pierre-Yves Chibon", + author_email="pingou@fedoraproject.org", + url="https://pagure.io/pagure-dist-git", + license="GPLv2+", install_requires=install_requires, tests_require=tests_require, - test_suite='nose.collector', - packages=['pagure_distgit'], - py_modules=['dist_git_auth'], + test_suite="nose.collector", + packages=["pagure_distgit"], + py_modules=["dist_git_auth"], include_package_data=True, zip_safe=False, entry_points="""