Differential D1023

Remove mongoquery bundle
ClosedPublic
Actions

Authored by mkrizek on Oct 13 2016, 8:52 AM.

Details

Reviewers
tflink
jskladan
Commits
rTRGR90b93a75ad55: Remove mongoquery bundle
Test Plan

make mockbuild. Unitttests pass.

Diff Detail

Repository
rTRGR taskotron-trigger
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mkrizek retitled this revision from to Remove mongoquery bundle.Oct 13 2016, 8:52 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added reviewers: tflink, jskladan.
tflink accepted this revision.Oct 14 2016, 2:46 PM
This revision is now accepted and ready to land.Oct 14 2016, 2:46 PM
jskladan accepted this revision.Oct 14 2016, 3:08 PM

Looks good!

Closed by commit rTRGR90b93a75ad55: Remove mongoquery bundle (authored by mkrizek). · Explain WhyOct 14 2016, 3:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mjobtriggers/jobtrigger.py (3 lines)
DMjobtriggers/mongoquery.py (299 lines)
Msetup.py (2 lines)
Mtaskotron-trigger.spec (7 lines)

Diff 2626

View Options

jobtriggers/jobtrigger.py

1import copy 1​import copy
2import yaml 2​import yaml
3import itertools 3​import itertools
4import fedmsg.consumers 4​import fedmsg.consumers
5​from mongoquery import Query, QueryError
6​
5from . import config, runners, utils 7​from . import config, runners, utils
6from . import exceptions as exc 8​from . import exceptions as exc
7from .mongoquery import Query, QueryError ​
8from .mongoquery_string_template import MongoTemplate 9​from .mongoquery_string_template import MongoTemplate
9 10​
10 11​
11class DefaultDict(dict): 12​class DefaultDict(dict):
12 13​
13 """Since the rules will contain unreplacable variables (for example KojiBuildCompleted 14​ """Since the rules will contain unreplacable variables (for example KojiBuildCompleted
14 provides ${critpath_pkgs} and KojiTagChanged does not), we need a default value. 15​ provides ${critpath_pkgs} and KojiTagChanged does not), we need a default value.
15 None/null would be probably safer, but to make debugging easier, let's replace the missing 16​ None/null would be probably safer, but to make debugging easier, let's replace the missing
▲ Show 20 Lines • Show All 104 Lines • Show Last 20 Lines
View Options

jobtriggers/mongoquery.py

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

setup.py

1from setuptools import setup, Command 1​from setuptools import setup, Command
2 2​
3class PyTest(Command): 3​class PyTest(Command):
4 user_options = [] 4​ user_options = []
5 def initialize_options(self): 5​ def initialize_options(self):
6 pass 6​ pass
7 def finalize_options(self): 7​ def finalize_options(self):
8 pass 8​ pass
9 def run(self): 9​ def run(self):
10 import subprocess 10​ import subprocess
11 errno = subprocess.call(['py.test', 'testing']) 11​ errno = subprocess.call(['py.test', 'testing'])
12 raise SystemExit(errno) 12​ raise SystemExit(errno)
13 13​
14 14​
15setup( 15​setup(
16 name='jobtriggers', 16​ name='jobtriggers',
17 version='0.4.0', 17​ version='0.4.1',
18 description='triggering jobs via fedmsg', 18​ description='triggering jobs via fedmsg',
19 author='Tim Flink', 19​ author='Tim Flink',
20 author_email='tflink@fedoraproject.org', 20​ author_email='tflink@fedoraproject.org',
21 license='GPLv2+', 21​ license='GPLv2+',
22 url='https://fedorahosted.org/fedora-qa', 22​ url='https://fedorahosted.org/fedora-qa',
23 packages=['jobtriggers'], 23​ packages=['jobtriggers'],
24 entry_points={ 24​ entry_points={
25 'console_scripts': ['jobrunner=jobtriggers.jobrunner:main'], 25​ 'console_scripts': ['jobrunner=jobtriggers.jobrunner:main'],
Show All 13 Lines
View Options

taskotron-trigger.spec

1Name: taskotron-trigger 1​Name: taskotron-trigger
2Version: 0.4.0 2​Version: 0.4.1
3Release: 1%{?dist} 3​Release: 1%{?dist}
4Summary: Triggering Taskotron jobs via fedmsg 4​Summary: Triggering Taskotron jobs via fedmsg
5 5​
6License: GPLv2+ 6​License: GPLv2+
7URL: https://bitbucket.org/fedoraqa/taskotron-trigger 7​URL: https://bitbucket.org/fedoraqa/taskotron-trigger
8Source0: https://qadevel.cloud.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz 8​Source0: https://qadevel.cloud.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz
9 9​
10BuildArch: noarch 10​BuildArch: noarch
11 11​
12Requires: fedmsg 12​Requires: fedmsg
13Requires: fedmsg-hub 13​Requires: fedmsg-hub
14Requires: git 14​Requires: git
15Requires: koji 15​Requires: koji
16​Requires: python-mongoquery
16Requires: python-requests 17​Requires: python-requests
17Requires: python-twisted 18​Requires: python-twisted
18Requires: PyYAML 19​Requires: PyYAML
19BuildRequires: fedmsg 20​BuildRequires: fedmsg
20BuildRequires: koji 21​BuildRequires: koji
21BuildRequires: pytest 22​BuildRequires: pytest
22BuildRequires: python2-devel 23​BuildRequires: python2-devel
23BuildRequires: python-dingus 24​BuildRequires: python-dingus
24BuildRequires: python-mock 25​BuildRequires: python-mock
26​BuildRequires: python-mongoquery
25BuildRequires: python-munch 27​BuildRequires: python-munch
26BuildRequires: python-setuptools 28​BuildRequires: python-setuptools
27BuildRequires: PyYAML 29​BuildRequires: PyYAML
28 30​
29%description 31​%description
30Triggering Taskotron jobs via fedmsg. 32​Triggering Taskotron jobs via fedmsg.
31 33​
32%prep 34​%prep
Show All 32 Lines
65%dir %attr(755,fedmsg,fedmsg) %{_sharedstatedir}/taskotron-trigger 67​%dir %attr(755,fedmsg,fedmsg) %{_sharedstatedir}/taskotron-trigger
66 68​
67%dir %{_sysconfdir}/taskotron 69​%dir %{_sysconfdir}/taskotron
68%{_sysconfdir}/fedmsg.d/taskotron-trigger.py* 70​%{_sysconfdir}/fedmsg.d/taskotron-trigger.py*
69%config(noreplace) %{_sysconfdir}/taskotron/trigger.cfg 71​%config(noreplace) %{_sysconfdir}/taskotron/trigger.cfg
70%config(noreplace) %{_sysconfdir}/logrotate.d/taskotron-trigger 72​%config(noreplace) %{_sysconfdir}/logrotate.d/taskotron-trigger
71 73​
72%changelog 74​%changelog
75​* Thu Oct 13 2016 Martin Krizek <mkrizek@redhat.com> - 0.4.1-1
76​- remove mongoquery bundle
77​
73* Tue Oct 11 2016 Tim FLink <tflink@fedoraproject.org> - 0.4.0-1 78​* Tue Oct 11 2016 Tim FLink <tflink@fedoraproject.org> - 0.4.0-1
74- bumping version properly for a major release 79​- bumping version properly for a major release
75 80​
76* Tue Oct 11 2016 Tim FLink <tflink@fedoraproject.org> - 0.3.17-1 81​* Tue Oct 11 2016 Tim FLink <tflink@fedoraproject.org> - 0.3.17-1
77- rework trigger to be more easily configurable (D963) 82​- rework trigger to be more easily configurable (D963)
78 83​
79* Fri Jul 22 2016 Martin Krizek <mkrizek@redhat.com> - 0.3.16-4 84​* Fri Jul 22 2016 Martin Krizek <mkrizek@redhat.com> - 0.3.16-4
80- remove rm -rf buildroot as it's not neccessary 85​- remove rm -rf buildroot as it's not neccessary
▲ Show 20 Lines • Show All 86 Lines • Show Last 20 Lines