From 60b6fb65139a143a2b68dc7facb941db2b1265c1 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 20 2018 20:59:44 +0000 Subject: [PATCH 1/2] Adjust the scripts to pagure 5.2+'s internal API Signed-off-by: Pierre-Yves Chibon --- diff --git a/scripts/pagure_bz.py b/scripts/pagure_bz.py index 91ae8ee..b67b84d 100644 --- a/scripts/pagure_bz.py +++ b/scripts/pagure_bz.py @@ -15,6 +15,7 @@ import logging import os import pagure.config +import pagure.lib.query from pagure.lib import model @@ -49,7 +50,7 @@ def main(args): print('%s does not appear to be a directory' % args[0]) return 3 - session = pagure.lib.create_session(_config['DB_URL']) + session = pagure.lib.query.create_session(_config['DB_URL']) # Start the watchers by the main admin query = session.query( diff --git a/scripts/pagure_owner_alias.py b/scripts/pagure_owner_alias.py index b8d6cf2..29605cc 100644 --- a/scripts/pagure_owner_alias.py +++ b/scripts/pagure_owner_alias.py @@ -15,6 +15,7 @@ import logging import os import pagure.config +import pagure.lib.query from pagure.lib import model @@ -49,7 +50,7 @@ def main(args): print('%s does not appear to be a directory' % args[0]) return 3 - session = pagure.lib.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( diff --git a/scripts/pagure_poc.py b/scripts/pagure_poc.py index 9ccb49c..5e8d1bf 100644 --- a/scripts/pagure_poc.py +++ b/scripts/pagure_poc.py @@ -15,6 +15,7 @@ import logging import os import pagure.config +import pagure.lib.query from pagure.lib import model if 'PAGURE_CONFIG' not in os.environ \ @@ -48,7 +49,7 @@ def main(args): print('%s does not appear to be a directory' % args[0]) return 3 - session = pagure.lib.create_session(_config['DB_URL']) + session = pagure.lib.query.create_session(_config['DB_URL']) query = session.query( model.Project.namespace, model.Project.name, model.User.user From 867112a1c42e0bd9e91d9499161aae65f27c90a8 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 20 2018 21:00:05 +0000 Subject: [PATCH 2/2] Bump the requirement to pagure 5.2+ Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure-dist-git.spec b/pagure-dist-git.spec index 1be29ad..34f5ee6 100644 --- a/pagure-dist-git.spec +++ b/pagure-dist-git.spec @@ -48,9 +48,9 @@ BuildRequires: %{py_prefix}-setuptools BuildRequires: %{py_prefix}-mock BuildRequires: %{py_prefix}-pdc-client BuildRequires: %{py_prefix}-nose -BuildRequires: pagure >= 5.1 +BuildRequires: pagure >= 5.2 -Requires: pagure >= 5.1 +Requires: pagure >= 5.2 %description -n %{py_prefix}-%{modname} This implements access control list checks for Fedora and CentOS dist-git.