From c2941f72693164451eb4add9f7bfc313cf7bf646 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Apr 23 2018 09:45:40 +0000 Subject: [PATCH 1/3] Fix the dist_git_auth backend to the new pagure structure Signed-off-by: Pierre-Yves Chibon --- diff --git a/dist_git_auth.py b/dist_git_auth.py index 71d9607..887147d 100644 --- a/dist_git_auth.py +++ b/dist_git_auth.py @@ -21,7 +21,7 @@ if 'PAGURE_CONFIG' not in os.environ \ os.environ['PAGURE_CONFIG'] = '/etc/pagure/pagure.cfg' import pagure # noqa: E402 -from pagure import APP # noqa: E402 +from pagure.config import config # noqa: E402 from pagure.lib import model # noqa: E402 from pagure.lib.git_auth import Gitolite3Auth, _read_file # noqa: E402 @@ -46,7 +46,7 @@ namespace2pdctype = { def get_supported_branches(namespace, package): default_url = 'https://pdc.fedoraproject.org/rest_api/v1/' - url = pagure.APP.config.get('PDC_URL', default_url) + url = config.get('PDC_URL', default_url) pdc = pdc_client.PDCClient(url, develop=True) _log.info('Querying PDC for %s/%s' % (namespace, package)) kwargs = dict( @@ -67,7 +67,7 @@ class DistGitoliteAuth(Gitolite3Auth): configuration file. """ _log.info('Compiling the gitolite configuration') - gitolite_folder = pagure.APP.config.get('GITOLITE_HOME', None) + gitolite_folder = config.get('GITOLITE_HOME', None) if gitolite_folder: cmd = 'HOME=%s gitolite compile' % (gitolite_folder) _log.debug('Command: %s', cmd) From 8cd6f710938755a057a2c0c3e9020b8193e258e6 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Apr 23 2018 09:46:02 +0000 Subject: [PATCH 2/3] Fix link missing namespace Signed-off-by: Pierre-Yves Chibon --- diff --git a/template/commits.html b/template/commits.html index 079dfcc..e0460b1 100644 --- a/template/commits.html +++ b/template/commits.html @@ -201,7 +201,7 @@ success: function(res) { for (var _c in res.heads) { for (var i=0; i < res.heads[_c].length; i++){ - var _url = '{{ url_for('.view_commits', + var _url = '{{ url_for('ui_ns.view_commits', repo=repo.name, branchname='---', username=username, From d5ca0178b9e80e8c09a09e0ab545d779fb19cc87 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Apr 23 2018 09:54:08 +0000 Subject: [PATCH 3/3] Port the different cron scripts to pagure >= 4.0 Signed-off-by: Pierre-Yves Chibon --- diff --git a/scripts/pagure_bz.py b/scripts/pagure_bz.py index 93f7170..f44b759 100644 --- a/scripts/pagure_bz.py +++ b/scripts/pagure_bz.py @@ -14,14 +14,16 @@ import json import logging import os +import pagure.config +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' -import pagure # noqa: E402 -from pagure.lib import model # noqa: E402 - +_config = pagure.config.reload_config() _log = logging.getLogger(__name__) @@ -47,8 +49,10 @@ def main(args): print('%s does not appear to be a directory' % args[0]) return 3 + session = pagure.lib.create_session(_config['DB_URL']) + # Start the watchers by the main admin - query = pagure.SESSION.query( + query = session.query( model.Project.namespace, model.Project.name, model.User.user, ).filter( model.Project.user_id == model.User.id @@ -66,7 +70,7 @@ def main(args): # Add the explicit watchers - query = pagure.SESSION.query( + query = session.query( model.Project.namespace, model.Project.name, model.User.user, model.Watcher.watch_issues, ).filter( @@ -95,6 +99,8 @@ def main(args): 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__': import sys diff --git a/scripts/pagure_owner_alias.py b/scripts/pagure_owner_alias.py index 26a807f..b8d6cf2 100644 --- a/scripts/pagure_owner_alias.py +++ b/scripts/pagure_owner_alias.py @@ -14,14 +14,16 @@ import json import logging import os +import pagure.config +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' -import pagure # noqa: E402 -from pagure.lib import model # noqa: E402 - +_config = pagure.config.reload_config() _log = logging.getLogger(__name__) @@ -47,8 +49,10 @@ def main(args): print('%s does not appear to be a directory' % args[0]) return 3 + session = pagure.lib.create_session(_config['DB_URL']) + # Start the owner list by the main admin - query = pagure.SESSION.query( + query = session.query( model.Project.namespace, model.Project.name, model.User.user, ).filter( model.Project.user_id == model.User.id @@ -66,7 +70,7 @@ def main(args): # Add the users with commit and admin ACLs - query = pagure.SESSION.query( + query = session.query( model.Project.namespace, model.Project.name, model.User.user, ).filter( model.Project.id == model.ProjectUser.project_id @@ -93,6 +97,8 @@ def main(args): 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__': import sys diff --git a/scripts/pagure_poc.py b/scripts/pagure_poc.py index ca3abf4..9ccb49c 100644 --- a/scripts/pagure_poc.py +++ b/scripts/pagure_poc.py @@ -14,14 +14,15 @@ import json import logging import os +import pagure.config +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' -import pagure # noqa: E402 -from pagure.lib import model # noqa: E402 - +_config = pagure.config.reload_config() _log = logging.getLogger(__name__) @@ -47,7 +48,9 @@ def main(args): print('%s does not appear to be a directory' % args[0]) return 3 - query = pagure.SESSION.query( + session = pagure.lib.create_session(_config['DB_URL']) + + query = session.query( model.Project.namespace, model.Project.name, model.User.user ).filter( model.Project.user_id == model.User.id @@ -66,6 +69,8 @@ def main(args): 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__': import sys