Differential D187

Updating blockerbugs to work with python-bugzilla >= 1.1.0. Fixes T280
ClosedPublic
Actions

Authored by tflink on Jul 9 2014, 7:03 PM.

Details

Reviewers
roshi
mkrizek
Maniphest Tasks
T280: blocker proposal not working for f21 alpha
Commits
rBLKR15a283d17432: Updating blockerbugs to work with python-bugzilla >= 1.1.0. Fixes T280
rBLKRf6256811215d: Merge branch 'develop' into 'master' for release
Summary

Fixes issue where blocker proposal was no longer working due to python-bugzilla errors

Test Plan

unit tests pass, works locally but the real test will be deployment to stg and this particular bug is difficult to really test until that deployment

Diff Detail

Repository
rBLKR blockerbugs
Lint
Lint Skipped
Unit
Unit Tests Skipped
tflink retitled this revision from to Updating blockerbugs to work with python-bugzilla >= 1.1.0. Fixes T280.Jul 9 2014, 7:03 PM
tflink updated this object.
tflink edited the test plan for this revision. (Show Details)
tflink added reviewers: mkrizek, roshi.
roshi added a comment.Jul 9 2014, 7:48 PM

Still getting an instance setup for a full test - but my initial once-over looked good. Had one question that's inline.

blockerbugs/__init__.py
12

Why does the version go down here? Shouldn't it be 0.4.3.3 as it is in the spec changelog?

tflink updated this revision to Diff 545.Jul 9 2014, 8:07 PM
  • version number go up, not down
tflink closed this revision.Jul 9 2014, 9:36 PM
tflink updated this revision to Diff 546.

Closed by commit rBLKR15a283d17432 (authored by @tflink).

roshi added a comment.Jul 9 2014, 10:19 PM

After it was pointed out where the bz creds are supposed to go - it worked fine. Evidence is here: https://partner-bugzilla.redhat.com/show_bug.cgi?id=679156#c10

Revision Contents

Diff 546

View Options

blockerbugs.spec

1# sitelib for noarch packages, sitearch for others (remove the unneeded one) 1​# sitelib for noarch packages, sitearch for others (remove the unneeded one)
2%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} 2​%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
3%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} 3​%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
4 4​
5Name: blockerbugs 5​Name: blockerbugs
6Version: 0.4.3.2 6​Version: 0.4.3.3
7Release: 1%{?dist} 7​Release: 1%{?dist}
8Summary: Fedora QA Blocker Tracking Application 8​Summary: Fedora QA Blocker Tracking Application
9 9​
10License: GPLv2+ 10​License: GPLv2+
11URL: https://fedorahosted.org/fedora-qa 11​URL: https://fedorahosted.org/fedora-qa
12Source0: http://git.fedorahosted.org/cgit/blockerbugs.git/snapshot/blockerbugs-%{version}.tar.gz 12​Source0: http://git.fedorahosted.org/cgit/blockerbugs.git/snapshot/blockerbugs-%{version}.tar.gz
13 13​
14BuildArch: noarch 14​BuildArch: noarch
15 15​
16Requires: python-flask 16​Requires: python-flask
17Requires: python-flask-sqlalchemy 17​Requires: python-flask-sqlalchemy
18Requires: python-flask-wtf 18​Requires: python-flask-wtf
19Requires: python-flask-assets 19​Requires: python-flask-assets
20Requires: python-fedora 20​Requires: python-fedora
21Requires: python-fedora-flask 21​Requires: python-fedora-flask
22Requires: python-alembic 22​Requires: python-alembic
23Requires: python-psycopg2 23​Requires: python-psycopg2
24Requires: python-bugzilla >= 0.8 24​Requires: python-bugzilla >= 1.1.0
25Requires: python-flask-admin 25​Requires: python-flask-admin
26Requires: python-iso8601 26​Requires: python-iso8601
27Requires: python-openid 27​Requires: python-openid
28Requires: python-openid-cla 28​Requires: python-openid-cla
29Requires: python-openid-teams 29​Requires: python-openid-teams
30Requires: python-cssmin 30​Requires: python-cssmin
31Requires: uglify-js 31​Requires: uglify-js
32Requires: koji 32​Requires: koji
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Line(s)
123%attr(755,root,root) %{_bindir}/blockerbugs 123​%attr(755,root,root) %{_bindir}/blockerbugs
124%dir %{_sysconfdir}/blockerbugs 124​%dir %{_sysconfdir}/blockerbugs
125%{_sysconfdir}/blockerbugs/* 125​%{_sysconfdir}/blockerbugs/*
126%dir %{_datadir}/blockerbugs 126​%dir %{_datadir}/blockerbugs
127%{_datadir}/blockerbugs/* 127​%{_datadir}/blockerbugs/*
128 128​
129 129​
130%changelog 130​%changelog
131​* Wed Jul 9 2014 Tim Flink <tflink@fedoraproject.org> - 0.4.3.3-1
132​- updating for use with python-bugzilla 1.1.0
133​
131* Thu Feb 27 2014 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.3.2-1 134​* Thu Feb 27 2014 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.3.2-1
132- update to 0.4.3.2 135​- update to 0.4.3.2
133 136​
134* Thu Feb 13 2014 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.3.1-1 137​* Thu Feb 13 2014 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.3.1-1
135- remove bugzilla cookie code 138​- remove bugzilla cookie code
136 139​
137* Wed Nov 20 2013 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.3-1 140​* Wed Nov 20 2013 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.3-1
138- fix for #435 141​- fix for #435
▲ Show 20 Lines • Show All 123 Lines • Show Last 20 Lines
View Options

blockerbugs/__init__.py

1from flask import Flask, render_template 1​from flask import Flask, render_template
2from flask_fas_openid import FAS 2​from flask_fas_openid import FAS
3from flask.ext.sqlalchemy import SQLAlchemy 3​from flask.ext.sqlalchemy import SQLAlchemy
4from flask.ext.assets import Environment, Bundle 4​from flask.ext.assets import Environment, Bundle
5import logging 5​import logging
6import logging.handlers 6​import logging.handlers
7import os 7​import os
8 8​
9from util.login import FakeFas 9​from util.login import FakeFas
10 10​
11# the version as used in setup.py and docs 11​# the version as used in setup.py and docs
12__version__ = "0.4.3.2" 12​__version__ = "0.4.3.3"
roshiUnsubmitted
Not Done

Why does the version go down here? Shouldn't it be 0.4.3.3 as it is in the spec changelog?

13 13​
14 14​
15# Flask App 15​# Flask App
16app = Flask(__name__) 16​app = Flask(__name__)
17 17​
18fas = None 18​fas = None
19 19​
20# Flask-Assets 20​# Flask-Assets
▲ Show 20 Lines • Show All 166 Lines • Show Last 20 Lines
View Options

blockerbugs/controllers/main.py

Show First 20 Lines • Show All 304 Lines • ▼ Show 20 Line(s)303def get_bugzilla():
305 if not app.testing: 305​ if not app.testing:
306 if 'FAS_USER' in app.config: 306​ if 'FAS_USER' in app.config:
307 307​
308 app.logger.debug('logging into bugzilla (%s) as %s' % (app.config['BUGZILLA_XMLRPC'], app.config['FAS_USER'])) 308​ app.logger.debug('logging into bugzilla (%s) as %s' % (app.config['BUGZILLA_XMLRPC'], app.config['FAS_USER']))
309 309​
310 return bugzilla.RHBugzilla4(url=app.config['BUGZILLA_XMLRPC'], 310​ return bugzilla.RHBugzilla4(url=app.config['BUGZILLA_XMLRPC'],
311 user=app.config['FAS_USER'], 311​ user=app.config['FAS_USER'],
312 password=app.config['FAS_PASSWORD'], 312​ password=app.config['FAS_PASSWORD'],
313 cookiefile=None) 313​ cookiefile=None,
314​ tokenfile=None)
314 else: 315​ else:
315 app.logger.warning('No FAS_USER configured. bugzilla modifications will NOT work!') 316​ app.logger.warning('No FAS_USER configured. bugzilla modifications will NOT work!')
316 return bugzilla.RHBugzilla4(url=app.config['BUGZILLA_XMLRPC'], cookiefile=None) 317​ return bugzilla.RHBugzilla4(url=app.config['BUGZILLA_XMLRPC'], cookiefile=None, tokenfile=None)
317 else: 318​ else:
318 app.logger.error('Bugzilla connections with test configuration is not supported!') 319​ app.logger.error('Bugzilla connections with test configuration is not supported!')
319 return None 320​ return None
320 321​
321 322​
322def check_bz_user(user, password): 323​def check_bz_user(user, password):
323 bz = bugzilla.RHBugzilla4(url=app.config['BUGZILLA_XMLRPC'], cookiefile=None) 324​ bz = bugzilla.RHBugzilla4(url=app.config['BUGZILLA_XMLRPC'], cookiefile=None, tokenfile=None)
324 if not bz or not bz.login(user, password): 325​ if not bz or not bz.login(user, password):
325 return False 326​ return False
326 bz.logout() 327​ bz.logout()
327 return True 328​ return True
328 329​
329 330​
330@main.route('/fas_bugzilla', methods=['GET', 'POST']) 331​@main.route('/fas_bugzilla', methods=['GET', 'POST'])
331@fas_login_required 332​@fas_login_required
▲ Show 20 Lines • Show All 95 Lines • Show Last 20 Lines
View Options

blockerbugs/util/bz_interface.py

Show All 40 Lines
41 41​
42class BlockerBugs(): 42​class BlockerBugs():
43 def __init__(self, user=None, password=None, url=None, bz=None, logger=None): 43​ def __init__(self, user=None, password=None, url=None, bz=None, logger=None):
44 self.logger = logger if logger else logging.getLogger('bz_interface') 44​ self.logger = logger if logger else logging.getLogger('bz_interface')
45 if not bz: 45​ if not bz:
46 if not url: 46​ if not url:
47 url = 'https://bugzilla.redhat.com/xmlrpc.cgi' 47​ url = 'https://bugzilla.redhat.com/xmlrpc.cgi'
48 if not (user and password): 48​ if not (user and password):
49 self.bz = bugzilla.RHBugzilla4(url=url, cookiefile=None) 49​ self.bz = bugzilla.RHBugzilla4(url=url,
50​ cookiefile=None,
51​ tokenfile=None)
50 else: 52​ else:
51 self.bz = bugzilla.RHBugzilla4(url=url, 53​ self.bz = bugzilla.RHBugzilla4(url=url,
52 user=user, 54​ user=user,
53 password=password, 55​ password=password,
54 cookiefile=None) 56​ cookiefile=None,
57​ tokenfile=None)
55 else: 58​ else:
56 self.bz = bz 59​ self.bz = bz
57 self.logger.info('Using bugzilla URL: %s' % url) 60​ self.logger.info('Using bugzilla URL: %s' % url)
58 #https://partner-bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED 61​ #https://partner-bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED
59 #&bug_status=POST&bug_status=MODIFIED&classification=Fedora&component=anaconda&f1=component&o1=changedafter&product=Fedora&query_format=advanced&v1=2013-03-21%2012%3A25&version=19 62​ #&bug_status=POST&bug_status=MODIFIED&classification=Fedora&component=anaconda&f1=component&o1=changedafter&product=Fedora&query_format=advanced&v1=2013-03-21%2012%3A25&version=19
60 def get_bz_query(self, tracker, last_update=None): 63​ def get_bz_query(self, tracker, last_update=None):
61 query = {} 64​ query = {}
62 query.update(base_query) 65​ query.update(base_query)
▲ Show 20 Lines • Show All 170 Lines • Show Last 20 Lines
View Options

requirements.txt

1Flask==0.9 1​Flask==0.9
2Flask-SQLAlchemy==0.16 2​Flask-SQLAlchemy==0.16
3Flask-WTF>=0.8 3​Flask-WTF>=0.8
4Jinja2==2.6 4​Jinja2==2.6
5SQLAlchemy==0.7.8 5​SQLAlchemy==0.7.8
6WTAlchemy==0.1b3 6​WTAlchemy==0.1b3
7WTForms>=1.0.1 7​WTForms>=1.0.1
8Werkzeug==0.8.3 8​Werkzeug==0.8.3
9bunch==1.0.1 9​bunch==1.0.1
10distribute==0.6.24 10​distribute==0.6.24
11mock>=0.8.0 11​mock>=0.8.0
12py==1.4.9 12​py==1.4.9
13pytest==2.2.4 13​pytest==2.2.4
14pytest-cov==1.6 14​pytest-cov==1.6
15python-bugzilla>=0.7 15​python-bugzilla>=1.1.0
16wsgiref==0.1.2 16​wsgiref==0.1.2
17kitchen==1.1.1 17​kitchen==1.1.1
18python-fedora>=0.3.33 18​python-fedora>=0.3.33
19pycurl==7.19.0 19​pycurl==7.19.0
20Flask-FAS>=0.1.0 20​Flask-FAS>=0.1.0
21dingus==0.3.4 21​dingus==0.3.4
22alembic==0.5.0 22​alembic==0.5.0
23flask-admin==1.0.5 23​flask-admin==1.0.5
24iso8601==0.1.4 24​iso8601==0.1.4
25Flask-Assets==0.8 25​Flask-Assets==0.8
26cssmin==0.1.4 26​cssmin==0.1.4