Merge lp:~ev/uci-engine/fix-pep8-and-pyflakes into lp:uci-engine
- fix-pep8-and-pyflakes
- Merge into trunk
Status: | Needs review |
---|---|
Proposed branch: | lp:~ev/uci-engine/fix-pep8-and-pyflakes |
Merge into: | lp:uci-engine |
Diff against target: |
511 lines (+39/-222) 15 files modified
bin/engine_health.py (+1/-1) branch-source-builder/bin/check_bsbuilder.py (+1/-1) branch-source-builder/cupstream2distro/packageinppa.py (+0/-2) charms/precise/key-secret-subordinate/unit_tests/test_hooks.py (+1/-1) charms/precise/system-image-server/hooks/hooks.py (+6/-14) charms/precise/webui/unit_tests/test_hooks.py (+0/-1) cupstream2distro/tests/unit/test_resignpackage.py (+1/-1) docs/conf.py (+20/-191) image-builder/imagebuilder/run_worker.py (+1/-1) lander/setup.py (+0/-1) nf-stats-service/nfss/__init__.py (+2/-0) ticket_system/project/tests.py (+1/-1) ticket_system/ticket/tests/test_style.py (+1/-1) ticket_system/ticket/tests/test_user_info.py (+2/-2) ticket_system/ticket_system/settings.py (+2/-4) |
To merge this branch: | bzr merge lp:~ev/uci-engine/fix-pep8-and-pyflakes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Canonical CI Engineering | Pending | ||
Review via email: mp+242806@code.launchpad.net |
Commit message
PEP8 and pyflakes fixes.
Description of the change
I fixed some pyflakes and pep8 errors on the flight out to Austin.
PS Jenkins bot (ps-jenkins) wrote : | # |
Robert Bruce Park (robru) wrote : | # |
Considering that everything under cupstream2distro/ directory is an abandoned fork of lp:cupstream2distro, I hope you didn't waste too much time on that. It's probably worthwhile to delete that code or at least re-import it from our trunk, because your copy is just rotting away.
On 25 November 2014 at 20:16, ♫ Robert Bruce Park ♫
<email address hidden> wrote:
> Considering that everything under cupstream2distro/ directory is an abandoned fork of lp:cupstream2distro, I hope you didn't waste too much time on that. It's probably worthwhile to delete that code or at least re-import it from our trunk, because your copy is just rotting away.
I'm not deeply familiar with our cupstream2distro work. That's more a
question for Ursula or Francis. Guys?
Unmerged revisions
- 901. By Evan
-
Revert pyflakes-the-world change.
- 900. By Evan
-
Merge with trunk.
- 899. By Evan
-
Create a couple of exceptions to the pyflakes tests.
- 898. By Evan
-
Use the exclusion filter for pyflakes tests.
- 897. By Evan
-
Add a pyflakes check.
- 896. By Evan
-
Add a rationale for the new style test.
- 895. By Evan
-
Fix pep8 in time_sorted_tests tests.
- 894. By Evan
-
Make pep8 an opt-out, rather than opt-in test for python files. Test non-packaged python code.
- 893. By Evan
-
pyflakes fixes.
- 892. By Evan
-
pep8 fixes.
Preview Diff
1 | === modified file 'bin/engine_health.py' | |||
2 | --- bin/engine_health.py 2014-07-25 23:53:47 +0000 | |||
3 | +++ bin/engine_health.py 2014-11-25 16:38:40 +0000 | |||
4 | @@ -59,7 +59,7 @@ | |||
5 | 59 | # Health check always expects 'OK' or 'FAILED' in the first line of the | 59 | # Health check always expects 'OK' or 'FAILED' in the first line of the |
6 | 60 | # result file. | 60 | # result file. |
7 | 61 | result_file_contents = open(result_file).readlines() | 61 | result_file_contents = open(result_file).readlines() |
9 | 62 | if not 'OK' in result_file_contents[0]: | 62 | if 'OK' not in result_file_contents[0]: |
10 | 63 | # Printing only the first line of the result file because nagios | 63 | # Printing only the first line of the result file because nagios |
11 | 64 | # displays limited output on its interface (one line). Concatenating | 64 | # displays limited output on its interface (one line). Concatenating |
12 | 65 | # the whole file on a single message would produce a very confusing | 65 | # the whole file on a single message would produce a very confusing |
13 | 66 | 66 | ||
14 | === modified file 'branch-source-builder/bin/check_bsbuilder.py' | |||
15 | --- branch-source-builder/bin/check_bsbuilder.py 2014-10-29 15:06:26 +0000 | |||
16 | +++ branch-source-builder/bin/check_bsbuilder.py 2014-11-25 16:38:40 +0000 | |||
17 | @@ -158,7 +158,7 @@ | |||
18 | 158 | # run `worker.handle_request` in an isolated GPG environment | 158 | # run `worker.handle_request` in an isolated GPG environment |
19 | 159 | # so it has a chance to auto-retrieve missing keys from the | 159 | # so it has a chance to auto-retrieve missing keys from the |
20 | 160 | # keyserver. | 160 | # keyserver. |
22 | 161 | with gpg.GnupgEnvironment() as gnupg: | 161 | with gpg.GnupgEnvironment(): |
23 | 162 | (cb, result) = worker.handle_request(params, log) | 162 | (cb, result) = worker.handle_request(params, log) |
24 | 163 | except Exception as exc: | 163 | except Exception as exc: |
25 | 164 | message = 'BSB raised: {}'.format(exc.message) | 164 | message = 'BSB raised: {}'.format(exc.message) |
26 | 165 | 165 | ||
27 | === modified file 'branch-source-builder/cupstream2distro/packageinppa.py' | |||
28 | --- branch-source-builder/cupstream2distro/packageinppa.py 2014-04-16 18:36:03 +0000 | |||
29 | +++ branch-source-builder/cupstream2distro/packageinppa.py 2014-11-25 16:38:40 +0000 | |||
30 | @@ -179,9 +179,7 @@ | |||
31 | 179 | 179 | ||
32 | 180 | # Try to see if all binaries availables for this arch are built, including arch:all on other archs | 180 | # Try to see if all binaries availables for this arch are built, including arch:all on other archs |
33 | 181 | status = self.current_status | 181 | status = self.current_status |
34 | 182 | at_least_one_published_binary = False | ||
35 | 183 | for binary in self.source.getPublishedBinaries(): | 182 | for binary in self.source.getPublishedBinaries(): |
36 | 184 | at_least_one_published_binary = True | ||
37 | 185 | # all binaries for an arch are published at the same time | 183 | # all binaries for an arch are published at the same time |
38 | 186 | # launchpad is lying, it's telling that archs not in the ppa are built (for arch:all). Even for non supported arch! | 184 | # launchpad is lying, it's telling that archs not in the ppa are built (for arch:all). Even for non supported arch! |
39 | 187 | # for instance, we can have the case of self.arch_all_arch (arch:all), built before the others and amd64 will be built for it | 185 | # for instance, we can have the case of self.arch_all_arch (arch:all), built before the others and amd64 will be built for it |
40 | 188 | 186 | ||
41 | === modified file 'charms/precise/key-secret-subordinate/unit_tests/test_hooks.py' | |||
42 | --- charms/precise/key-secret-subordinate/unit_tests/test_hooks.py 2014-07-22 12:38:30 +0000 | |||
43 | +++ charms/precise/key-secret-subordinate/unit_tests/test_hooks.py 2014-11-25 16:38:40 +0000 | |||
44 | @@ -113,7 +113,7 @@ | |||
45 | 113 | def test_juju_info_joined(self): | 113 | def test_juju_info_joined(self): |
46 | 114 | # Keys are placed immediatelly when the subordinate charm is bound. | 114 | # Keys are placed immediatelly when the subordinate charm is bound. |
47 | 115 | os.makedirs(self.service_dir) | 115 | os.makedirs(self.service_dir) |
49 | 116 | self.config.return_value['ssh-private-key'] = base64.b64encode( | 116 | self.config.return_value['ssh-private-key'] = base64.b64encode( |
50 | 117 | 'secret!') | 117 | 'secret!') |
51 | 118 | 118 | ||
52 | 119 | hooks.hooks.execute(['hooks/juju-info-relation-joined']) | 119 | hooks.hooks.execute(['hooks/juju-info-relation-joined']) |
53 | 120 | 120 | ||
54 | === modified file 'charms/precise/system-image-server/hooks/hooks.py' | |||
55 | --- charms/precise/system-image-server/hooks/hooks.py 2014-10-14 09:04:09 +0000 | |||
56 | +++ charms/precise/system-image-server/hooks/hooks.py 2014-11-25 16:38:40 +0000 | |||
57 | @@ -16,11 +16,6 @@ | |||
58 | 16 | return os.path.join(charmconfig['install_root'], unit) | 16 | return os.path.join(charmconfig['install_root'], unit) |
59 | 17 | 17 | ||
60 | 18 | 18 | ||
61 | 19 | def _install_from_tarball(charmconfig, upgrade): | ||
62 | 20 | #Do we need this? | ||
63 | 21 | pass | ||
64 | 22 | |||
65 | 23 | |||
66 | 24 | def _install_from_bzr(charmconfig, upgrade): | 19 | def _install_from_bzr(charmconfig, upgrade): |
67 | 25 | log('grabbing service from bzr...', 'INFO') | 20 | log('grabbing service from bzr...', 'INFO') |
68 | 26 | sdir = _service_dir(charmconfig) | 21 | sdir = _service_dir(charmconfig) |
69 | @@ -77,16 +72,17 @@ | |||
70 | 77 | 72 | ||
71 | 78 | def _generate_keys(charmconfig): | 73 | def _generate_keys(charmconfig): |
72 | 79 | log('generating keys...', 'INFO') | 74 | log('generating keys...', 'INFO') |
74 | 80 | #haveged is just an entropy generator | 75 | # haveged is just an entropy generator |
75 | 81 | subprocess.check_output(['haveged']) | 76 | subprocess.check_output(['haveged']) |
76 | 82 | srvdir = _service_dir(charmconfig) | 77 | srvdir = _service_dir(charmconfig) |
78 | 83 | #the system-image tools unfortunately really want to run from this dir | 78 | # the system-image tools unfortunately really want to run from this dir |
79 | 84 | os.chdir(srvdir) | 79 | os.chdir(srvdir) |
80 | 85 | out = subprocess.check_output(['{}/tests/generate-keys'.format(srvdir)]) | 80 | out = subprocess.check_output(['{}/tests/generate-keys'.format(srvdir)]) |
81 | 86 | log(out, 'INFO') | 81 | log(out, 'INFO') |
83 | 87 | #copy the keys we just generated into the proper location | 82 | # copy the keys we just generated into the proper location |
84 | 88 | shutil.rmtree('{}/secret/gpg/keys/'.format(srvdir)) | 83 | shutil.rmtree('{}/secret/gpg/keys/'.format(srvdir)) |
86 | 89 | shutil.copytree('{}/tests/keys'.format(srvdir), '{}/secret/gpg/keys/'.format(srvdir)) | 84 | dest = '{}/secret/gpg/keys/'.format(srvdir) |
87 | 85 | shutil.copytree('{}/tests/keys'.format(srvdir), dest) | ||
88 | 90 | subprocess.check_output(['{}/bin/generate-keyrings'.format(srvdir)]) | 86 | subprocess.check_output(['{}/bin/generate-keyrings'.format(srvdir)]) |
89 | 91 | log(out, 'INFO') | 87 | log(out, 'INFO') |
90 | 92 | 88 | ||
91 | @@ -99,11 +95,7 @@ | |||
92 | 99 | charmhelpers.fetch.configure_sources(update=True) | 95 | charmhelpers.fetch.configure_sources(update=True) |
93 | 100 | charmhelpers.fetch.apt_install(pkgs) | 96 | charmhelpers.fetch.apt_install(pkgs) |
94 | 101 | 97 | ||
100 | 102 | if charmconfig.get('vcs') == 'tarball': | 98 | _install_from_bzr(charmconfig, upgrade) |
96 | 103 | _install_from_tarball(charmconfig, upgrade) | ||
97 | 104 | else: | ||
98 | 105 | _install_from_bzr(charmconfig, upgrade) | ||
99 | 106 | |||
101 | 107 | _write_system_image_config(charmconfig) | 99 | _write_system_image_config(charmconfig) |
102 | 108 | _generate_keys(charmconfig) | 100 | _generate_keys(charmconfig) |
103 | 109 | _create_stable_channel(charmconfig) | 101 | _create_stable_channel(charmconfig) |
104 | 110 | 102 | ||
105 | === modified file 'charms/precise/webui/unit_tests/test_hooks.py' | |||
106 | --- charms/precise/webui/unit_tests/test_hooks.py 2014-10-08 15:37:26 +0000 | |||
107 | +++ charms/precise/webui/unit_tests/test_hooks.py 2014-11-25 16:38:40 +0000 | |||
108 | @@ -119,4 +119,3 @@ | |||
109 | 119 | 119 | ||
110 | 120 | with hooks.status_urls() as data: | 120 | with hooks.status_urls() as data: |
111 | 121 | self.assertEqual({}, data) | 121 | self.assertEqual({}, data) |
112 | 122 | |||
113 | 123 | 122 | ||
114 | === modified file 'cupstream2distro/tests/unit/test_resignpackage.py' | |||
115 | --- cupstream2distro/tests/unit/test_resignpackage.py 2014-06-17 12:25:23 +0000 | |||
116 | +++ cupstream2distro/tests/unit/test_resignpackage.py 2014-11-25 16:38:40 +0000 | |||
117 | @@ -14,7 +14,7 @@ | |||
118 | 14 | # You should have received a copy of the GNU Affero General Public License | 14 | # You should have received a copy of the GNU Affero General Public License |
119 | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
120 | 16 | 16 | ||
122 | 17 | from . import BaseUnitTestCase, BaseUnitTestCaseWithErrors | 17 | from . import BaseUnitTestCase |
123 | 18 | 18 | ||
124 | 19 | import subprocess | 19 | import subprocess |
125 | 20 | import os | 20 | import os |
126 | 21 | 21 | ||
127 | === modified file 'docs/conf.py' | |||
128 | --- docs/conf.py 2014-10-07 10:04:01 +0000 | |||
129 | +++ docs/conf.py 2014-11-25 16:38:40 +0000 | |||
130 | @@ -3,28 +3,17 @@ | |||
131 | 3 | # Ubuntu CI Engine documentation build configuration file, created by | 3 | # Ubuntu CI Engine documentation build configuration file, created by |
132 | 4 | # sphinx-quickstart on Thu Nov 14 11:38:40 2013. | 4 | # sphinx-quickstart on Thu Nov 14 11:38:40 2013. |
133 | 5 | # | 5 | # |
135 | 6 | # This file is execfile()d with the current directory set to its containing dir. | 6 | # This file is execfile()d with the current directory set to its containing |
136 | 7 | # dir. | ||
137 | 7 | # | 8 | # |
138 | 8 | # Note that not all possible configuration values are present in this | 9 | # Note that not all possible configuration values are present in this |
139 | 9 | # autogenerated file. | 10 | # autogenerated file. |
140 | 10 | # | 11 | # |
158 | 11 | # All configuration values have a default; values that are commented out | 12 | # All configuration values have a default; values that are commented out serve |
159 | 12 | # serve to show the default. | 13 | # to show the default. |
160 | 13 | 14 | ||
161 | 14 | import sys, os | 15 | # Add any Sphinx extension module names here, as strings. They can be |
162 | 15 | 16 | # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. | |
146 | 16 | # If extensions (or modules to document with autodoc) are in another directory, | ||
147 | 17 | # add these directories to sys.path here. If the directory is relative to the | ||
148 | 18 | # documentation root, use os.path.abspath to make it absolute, like shown here. | ||
149 | 19 | #sys.path.insert(0, os.path.abspath('.')) | ||
150 | 20 | |||
151 | 21 | # -- General configuration ----------------------------------------------------- | ||
152 | 22 | |||
153 | 23 | # If your documentation needs a minimal Sphinx version, state it here. | ||
154 | 24 | #needs_sphinx = '1.0' | ||
155 | 25 | |||
156 | 26 | # Add any Sphinx extension module names here, as strings. They can be extensions | ||
157 | 27 | # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. | ||
163 | 28 | extensions = [ | 17 | extensions = [ |
164 | 29 | 'sphinx.ext.autodoc', | 18 | 'sphinx.ext.autodoc', |
165 | 30 | ] | 19 | ] |
166 | @@ -35,9 +24,6 @@ | |||
167 | 35 | # The suffix of source filenames. | 24 | # The suffix of source filenames. |
168 | 36 | source_suffix = '.rst' | 25 | source_suffix = '.rst' |
169 | 37 | 26 | ||
170 | 38 | # The encoding of source files. | ||
171 | 39 | #source_encoding = 'utf-8-sig' | ||
172 | 40 | |||
173 | 41 | # The master toctree document. | 27 | # The master toctree document. |
174 | 42 | master_doc = 'index' | 28 | master_doc = 'index' |
175 | 43 | 29 | ||
176 | @@ -45,54 +31,15 @@ | |||
177 | 45 | project = u'Ubuntu CI Engine' | 31 | project = u'Ubuntu CI Engine' |
178 | 46 | copyright = u'2013-2014, Canonical Ltd.' | 32 | copyright = u'2013-2014, Canonical Ltd.' |
179 | 47 | 33 | ||
180 | 48 | # The version info for the project you're documenting, acts as replacement for | ||
181 | 49 | # |version| and |release|, also used in various other places throughout the | ||
182 | 50 | # built documents. | ||
183 | 51 | # | ||
184 | 52 | # The short X.Y version. | ||
185 | 53 | #version = '0.0' | ||
186 | 54 | # The full version, including alpha/beta/rc tags. | ||
187 | 55 | #release = '0.0' | ||
188 | 56 | |||
189 | 57 | # The language for content autogenerated by Sphinx. Refer to documentation | ||
190 | 58 | # for a list of supported languages. | ||
191 | 59 | #language = None | ||
192 | 60 | |||
193 | 61 | # There are two options for replacing |today|: either, you set today to some | ||
194 | 62 | # non-false value, then it is used: | ||
195 | 63 | #today = '' | ||
196 | 64 | # Else, today_fmt is used as the format for a strftime call. | ||
197 | 65 | #today_fmt = '%B %d, %Y' | ||
198 | 66 | |||
199 | 67 | # List of patterns, relative to source directory, that match files and | 34 | # List of patterns, relative to source directory, that match files and |
200 | 68 | # directories to ignore when looking for source files. | 35 | # directories to ignore when looking for source files. |
201 | 69 | exclude_patterns = ['_build'] | 36 | exclude_patterns = ['_build'] |
202 | 70 | 37 | ||
203 | 71 | # The reST default role (used for this markup: `text`) to use for all documents. | ||
204 | 72 | #default_role = None | ||
205 | 73 | |||
206 | 74 | # If true, '()' will be appended to :func: etc. cross-reference text. | ||
207 | 75 | #add_function_parentheses = True | ||
208 | 76 | |||
209 | 77 | # If true, the current module name will be prepended to all description | ||
210 | 78 | # unit titles (such as .. function::). | ||
211 | 79 | #add_module_names = True | ||
212 | 80 | |||
213 | 81 | # If true, sectionauthor and moduleauthor directives will be shown in the | ||
214 | 82 | # output. They are ignored by default. | ||
215 | 83 | #show_authors = False | ||
216 | 84 | |||
217 | 85 | # The name of the Pygments (syntax highlighting) style to use. | 38 | # The name of the Pygments (syntax highlighting) style to use. |
218 | 86 | pygments_style = 'sphinx' | 39 | pygments_style = 'sphinx' |
219 | 87 | 40 | ||
228 | 88 | # A list of ignored prefixes for module index sorting. | 41 | # The theme to use for HTML and HTML Help pages. See the documentation for a |
229 | 89 | #modindex_common_prefix = [] | 42 | # list of builtin themes. |
222 | 90 | |||
223 | 91 | |||
224 | 92 | # -- Options for HTML output --------------------------------------------------- | ||
225 | 93 | |||
226 | 94 | # The theme to use for HTML and HTML Help pages. See the documentation for | ||
227 | 95 | # a list of builtin themes. | ||
230 | 96 | try: | 43 | try: |
231 | 97 | import sphinx_bootstrap_theme | 44 | import sphinx_bootstrap_theme |
232 | 98 | except ImportError: | 45 | except ImportError: |
233 | @@ -110,150 +57,32 @@ | |||
234 | 110 | 'globaltoc_depth': -1, | 57 | 'globaltoc_depth': -1, |
235 | 111 | } | 58 | } |
236 | 112 | 59 | ||
237 | 113 | # Theme options are theme-specific and customize the look and feel of a theme | ||
238 | 114 | # further. For a list of options available for each theme, see the | ||
239 | 115 | # documentation. | ||
240 | 116 | #html_theme_options = {} | ||
241 | 117 | |||
242 | 118 | # Add any paths that contain custom themes here, relative to this directory. | ||
243 | 119 | #html_theme_path = [] | ||
244 | 120 | |||
245 | 121 | # The name for this set of Sphinx documents. If None, it defaults to | ||
246 | 122 | # "<project> v<release> documentation". | ||
247 | 123 | #html_title = None | ||
248 | 124 | |||
249 | 125 | # A shorter title for the navigation bar. Default is the same as html_title. | ||
250 | 126 | #html_short_title = None | ||
251 | 127 | |||
252 | 128 | # The name of an image file (relative to this directory) to place at the top | ||
253 | 129 | # of the sidebar. | ||
254 | 130 | #html_logo = None | ||
255 | 131 | |||
256 | 132 | # The name of an image file (within the static path) to use as favicon of the | ||
257 | 133 | # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 | ||
258 | 134 | # pixels large. | ||
259 | 135 | #html_favicon = None | ||
260 | 136 | |||
261 | 137 | # Add any paths that contain custom static files (such as style sheets) here, | 60 | # Add any paths that contain custom static files (such as style sheets) here, |
262 | 138 | # relative to this directory. They are copied after the builtin static files, | 61 | # relative to this directory. They are copied after the builtin static files, |
263 | 139 | # so a file named "default.css" will overwrite the builtin "default.css". | 62 | # so a file named "default.css" will overwrite the builtin "default.css". |
264 | 140 | html_static_path = ['_static'] | 63 | html_static_path = ['_static'] |
265 | 141 | 64 | ||
266 | 142 | # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, | ||
267 | 143 | # using the given strftime format. | ||
268 | 144 | #html_last_updated_fmt = '%b %d, %Y' | ||
269 | 145 | |||
270 | 146 | # If true, SmartyPants will be used to convert quotes and dashes to | ||
271 | 147 | # typographically correct entities. | ||
272 | 148 | #html_use_smartypants = True | ||
273 | 149 | |||
274 | 150 | # Custom sidebar templates, maps document names to template names. | ||
275 | 151 | #html_sidebars = {} | ||
276 | 152 | |||
277 | 153 | # Additional templates that should be rendered to pages, maps page names to | ||
278 | 154 | # template names. | ||
279 | 155 | #html_additional_pages = {} | ||
280 | 156 | |||
281 | 157 | # If false, no module index is generated. | ||
282 | 158 | #html_domain_indices = True | ||
283 | 159 | |||
284 | 160 | # If false, no index is generated. | ||
285 | 161 | #html_use_index = True | ||
286 | 162 | |||
287 | 163 | # If true, the index is split into individual pages for each letter. | ||
288 | 164 | #html_split_index = False | ||
289 | 165 | |||
290 | 166 | # If true, links to the reST sources are added to the pages. | ||
291 | 167 | #html_show_sourcelink = True | ||
292 | 168 | |||
293 | 169 | # If true, "Created using Sphinx" is shown in the HTML footer. Default is True. | ||
294 | 170 | #html_show_sphinx = True | ||
295 | 171 | |||
296 | 172 | # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. | ||
297 | 173 | #html_show_copyright = True | ||
298 | 174 | |||
299 | 175 | # If true, an OpenSearch description file will be output, and all pages will | ||
300 | 176 | # contain a <link> tag referring to it. The value of this option must be the | ||
301 | 177 | # base URL from which the finished HTML is served. | ||
302 | 178 | #html_use_opensearch = '' | ||
303 | 179 | |||
304 | 180 | # This is the file name suffix for HTML files (e.g. ".xhtml"). | ||
305 | 181 | #html_file_suffix = None | ||
306 | 182 | |||
307 | 183 | # Output file base name for HTML help builder. | 65 | # Output file base name for HTML help builder. |
308 | 184 | htmlhelp_basename = 'UbuntuCIEnginedoc' | 66 | htmlhelp_basename = 'UbuntuCIEnginedoc' |
309 | 185 | 67 | ||
326 | 186 | 68 | # Grouping the document tree into LaTeX files. List of tuples (source start | |
327 | 187 | # -- Options for LaTeX output -------------------------------------------------- | 69 | # file, target name, title, author, documentclass [howto/manual]). |
312 | 188 | |||
313 | 189 | latex_elements = { | ||
314 | 190 | # The paper size ('letterpaper' or 'a4paper'). | ||
315 | 191 | #'papersize': 'letterpaper', | ||
316 | 192 | |||
317 | 193 | # The font size ('10pt', '11pt' or '12pt'). | ||
318 | 194 | #'pointsize': '10pt', | ||
319 | 195 | |||
320 | 196 | # Additional stuff for the LaTeX preamble. | ||
321 | 197 | #'preamble': '', | ||
322 | 198 | } | ||
323 | 199 | |||
324 | 200 | # Grouping the document tree into LaTeX files. List of tuples | ||
325 | 201 | # (source start file, target name, title, author, documentclass [howto/manual]). | ||
328 | 202 | latex_documents = [ | 70 | latex_documents = [ |
331 | 203 | ('index', 'UbuntuCIEngine.tex', u'Ubuntu CI Engine Documentation', | 71 | ('index', 'UbuntuCIEngine.tex', u'Ubuntu CI Engine Documentation', |
332 | 204 | u'Canonical CI Engineering Team', 'manual'), | 72 | u'Canonical CI Engineering Team', 'manual'), |
333 | 205 | ] | 73 | ] |
334 | 206 | 74 | ||
360 | 207 | # The name of an image file (relative to this directory) to place at the top of | 75 | # One entry per manual page. List of tuples (source start file, name, |
361 | 208 | # the title page. | 76 | # description, authors, manual section). |
337 | 209 | #latex_logo = None | ||
338 | 210 | |||
339 | 211 | # For "manual" documents, if this is true, then toplevel headings are parts, | ||
340 | 212 | # not chapters. | ||
341 | 213 | #latex_use_parts = False | ||
342 | 214 | |||
343 | 215 | # If true, show page references after internal links. | ||
344 | 216 | #latex_show_pagerefs = False | ||
345 | 217 | |||
346 | 218 | # If true, show URL addresses after external links. | ||
347 | 219 | #latex_show_urls = False | ||
348 | 220 | |||
349 | 221 | # Documents to append as an appendix to all manuals. | ||
350 | 222 | #latex_appendices = [] | ||
351 | 223 | |||
352 | 224 | # If false, no module index is generated. | ||
353 | 225 | #latex_domain_indices = True | ||
354 | 226 | |||
355 | 227 | |||
356 | 228 | # -- Options for manual page output -------------------------------------------- | ||
357 | 229 | |||
358 | 230 | # One entry per manual page. List of tuples | ||
359 | 231 | # (source start file, name, description, authors, manual section). | ||
362 | 232 | man_pages = [ | 77 | man_pages = [ |
363 | 233 | ('index', 'ubuntuciengine', u'Ubuntu CI Engine Documentation', | 78 | ('index', 'ubuntuciengine', u'Ubuntu CI Engine Documentation', |
364 | 234 | [u'Canonical CI Engineering Team'], 1) | 79 | [u'Canonical CI Engineering Team'], 1) |
365 | 235 | ] | 80 | ] |
366 | 236 | 81 | ||
376 | 237 | # If true, show URL addresses after external links. | 82 | # Grouping the document tree into Texinfo files. List of tuples (source start |
377 | 238 | #man_show_urls = False | 83 | # file, target name, title, author, dir menu entry, description, category) |
369 | 239 | |||
370 | 240 | |||
371 | 241 | # -- Options for Texinfo output ------------------------------------------------ | ||
372 | 242 | |||
373 | 243 | # Grouping the document tree into Texinfo files. List of tuples | ||
374 | 244 | # (source start file, target name, title, author, | ||
375 | 245 | # dir menu entry, description, category) | ||
378 | 246 | texinfo_documents = [ | 84 | texinfo_documents = [ |
382 | 247 | ('index', 'UbuntuCIEngine', u'Ubuntu CI Engine Documentation', | 85 | ('index', 'UbuntuCIEngine', u'Ubuntu CI Engine Documentation', |
383 | 248 | u'Canonical CI Engineering Team', 'UbuntuCIEngine', 'One line description of project.', | 86 | u'Canonical CI Engineering Team', 'UbuntuCIEngine', |
384 | 249 | 'Miscellaneous'), | 87 | 'One line description of project.', 'Miscellaneous'), |
385 | 250 | ] | 88 | ] |
386 | 251 | |||
387 | 252 | # Documents to append as an appendix to all manuals. | ||
388 | 253 | #texinfo_appendices = [] | ||
389 | 254 | |||
390 | 255 | # If false, no module index is generated. | ||
391 | 256 | #texinfo_domain_indices = True | ||
392 | 257 | |||
393 | 258 | # How to display URL addresses: 'footnote', 'no', or 'inline'. | ||
394 | 259 | #texinfo_show_urls = 'footnote' | ||
395 | 260 | 89 | ||
396 | === modified file 'image-builder/imagebuilder/run_worker.py' | |||
397 | --- image-builder/imagebuilder/run_worker.py 2014-10-29 16:43:39 +0000 | |||
398 | +++ image-builder/imagebuilder/run_worker.py 2014-11-25 16:38:40 +0000 | |||
399 | @@ -42,7 +42,7 @@ | |||
400 | 42 | log.info(msg) | 42 | log.info(msg) |
401 | 43 | amqp_utils.progress_update(trigger, {'message': msg}) | 43 | amqp_utils.progress_update(trigger, {'message': msg}) |
402 | 44 | 44 | ||
404 | 45 | #Check API version | 45 | # Check API version |
405 | 46 | api = params.get('api_version') | 46 | api = params.get('api_version') |
406 | 47 | if api == '20140721': | 47 | if api == '20140721': |
407 | 48 | image_id = get_image(image, status_cb) | 48 | image_id = get_image(image, status_cb) |
408 | 49 | 49 | ||
409 | === modified file 'lander/setup.py' | |||
410 | --- lander/setup.py 2014-10-15 07:10:31 +0000 | |||
411 | +++ lander/setup.py 2014-11-25 16:38:40 +0000 | |||
412 | @@ -18,7 +18,6 @@ | |||
413 | 18 | import sys | 18 | import sys |
414 | 19 | 19 | ||
415 | 20 | 20 | ||
416 | 21 | |||
417 | 22 | HERE = os.path.abspath(os.path.dirname(__file__)) | 21 | HERE = os.path.abspath(os.path.dirname(__file__)) |
418 | 23 | # get ci_utils.setuptools on the path | 22 | # get ci_utils.setuptools on the path |
419 | 24 | sys.path.append(os.path.join(HERE, '..', 'ci-utils')) | 23 | sys.path.append(os.path.join(HERE, '..', 'ci-utils')) |
420 | 25 | 24 | ||
421 | === modified file 'nf-stats-service/nfss/__init__.py' | |||
422 | --- nf-stats-service/nfss/__init__.py 2014-08-26 14:49:08 +0000 | |||
423 | +++ nf-stats-service/nfss/__init__.py 2014-11-25 16:38:40 +0000 | |||
424 | @@ -36,6 +36,8 @@ | |||
425 | 36 | config.scan() | 36 | config.scan() |
426 | 37 | try: | 37 | try: |
427 | 38 | import pyramid_debugtoolbar | 38 | import pyramid_debugtoolbar |
428 | 39 | # Make pyflakes happy with a no-op statement. | ||
429 | 40 | pyramid_debugtoolbar | ||
430 | 39 | config.include('pyramid_debugtoolbar') | 41 | config.include('pyramid_debugtoolbar') |
431 | 40 | config.registry.settings['debugtoolbar.hosts'].append('10.0.0.0/16') | 42 | config.registry.settings['debugtoolbar.hosts'].append('10.0.0.0/16') |
432 | 41 | except ImportError: | 43 | except ImportError: |
433 | 42 | 44 | ||
434 | === modified file 'ticket_system/project/tests.py' | |||
435 | --- ticket_system/project/tests.py 2014-02-15 12:06:40 +0000 | |||
436 | +++ ticket_system/project/tests.py 2014-11-25 16:38:40 +0000 | |||
437 | @@ -173,7 +173,7 @@ | |||
438 | 173 | class TestPep8(styles.TestPep8): | 173 | class TestPep8(styles.TestPep8): |
439 | 174 | 174 | ||
440 | 175 | packages = [project] | 175 | packages = [project] |
442 | 176 | exclude = ['migrations/'] | 176 | exclude = ['migrations'] |
443 | 177 | 177 | ||
444 | 178 | 178 | ||
445 | 179 | class TestPyflakes(styles.TestPyflakes): | 179 | class TestPyflakes(styles.TestPyflakes): |
446 | 180 | 180 | ||
447 | === modified file 'ticket_system/ticket/tests/test_style.py' | |||
448 | --- ticket_system/ticket/tests/test_style.py 2014-10-07 10:04:01 +0000 | |||
449 | +++ ticket_system/ticket/tests/test_style.py 2014-11-25 16:38:40 +0000 | |||
450 | @@ -26,7 +26,7 @@ | |||
451 | 26 | class TestPep8(styles.TestPep8): | 26 | class TestPep8(styles.TestPep8): |
452 | 27 | 27 | ||
453 | 28 | packages = [ticket] | 28 | packages = [ticket] |
455 | 29 | exclude = ['migrations/'] | 29 | exclude = ['migrations'] |
456 | 30 | 30 | ||
457 | 31 | 31 | ||
458 | 32 | class TestPyflakes(styles.TestPyflakes): | 32 | class TestPyflakes(styles.TestPyflakes): |
459 | 33 | 33 | ||
460 | === modified file 'ticket_system/ticket/tests/test_user_info.py' | |||
461 | --- ticket_system/ticket/tests/test_user_info.py 2014-11-03 20:50:01 +0000 | |||
462 | +++ ticket_system/ticket/tests/test_user_info.py 2014-11-25 16:38:40 +0000 | |||
463 | @@ -85,7 +85,7 @@ | |||
464 | 85 | self.assertEqual('', self._get_current_username()) | 85 | self.assertEqual('', self._get_current_username()) |
465 | 86 | 86 | ||
466 | 87 | def test_logout_works(self): | 87 | def test_logout_works(self): |
468 | 88 | #'logout' inconditionally logs the user out. | 88 | # 'logout' inconditionally logs the user out. |
469 | 89 | self.assertLoggedIn('test') | 89 | self.assertLoggedIn('test') |
470 | 90 | 90 | ||
471 | 91 | # By default the 'logout' page redirects to the (webui) site root | 91 | # By default the 'logout' page redirects to the (webui) site root |
472 | @@ -97,7 +97,7 @@ | |||
473 | 97 | self.assertNotLoggedIn() | 97 | self.assertNotLoggedIn() |
474 | 98 | 98 | ||
475 | 99 | def test_logout_supports_next(self): | 99 | def test_logout_supports_next(self): |
477 | 100 | #'logout' can optionally redirect users to another page, normally | 100 | # 'logout' can optionally redirect users to another page, normally |
478 | 101 | # where they came from, via 'next' GET parameter. | 101 | # where they came from, via 'next' GET parameter. |
479 | 102 | self.assertLoggedIn('test') | 102 | self.assertLoggedIn('test') |
480 | 103 | 103 | ||
481 | 104 | 104 | ||
482 | === modified file 'ticket_system/ticket_system/settings.py' | |||
483 | --- ticket_system/ticket_system/settings.py 2014-10-07 10:04:01 +0000 | |||
484 | +++ ticket_system/ticket_system/settings.py 2014-11-25 16:38:40 +0000 | |||
485 | @@ -40,8 +40,8 @@ | |||
486 | 40 | with open(path) as f: | 40 | with open(path) as f: |
487 | 41 | config = yaml.safe_load(f.read()) | 41 | config = yaml.safe_load(f.read()) |
488 | 42 | except: | 42 | except: |
491 | 43 | print('Unable to use unit_config(%s), defaulting values' % path, | 43 | msg = 'Unable to use unit_config(%s), defaulting values' % path |
492 | 44 | file=sys.stderr) | 44 | print(msg, file=sys.stderr) |
493 | 45 | return config | 45 | return config |
494 | 46 | _cfg = _unit_config() | 46 | _cfg = _unit_config() |
495 | 47 | 47 | ||
496 | @@ -120,7 +120,6 @@ | |||
497 | 120 | STATICFILES_FINDERS = ( | 120 | STATICFILES_FINDERS = ( |
498 | 121 | 'django.contrib.staticfiles.finders.FileSystemFinder', | 121 | 'django.contrib.staticfiles.finders.FileSystemFinder', |
499 | 122 | 'django.contrib.staticfiles.finders.AppDirectoriesFinder', | 122 | 'django.contrib.staticfiles.finders.AppDirectoriesFinder', |
500 | 123 | #'django.contrib.staticfiles.finders.DefaultStorageFinder', | ||
501 | 124 | ) | 123 | ) |
502 | 125 | 124 | ||
503 | 126 | # Make this unique, and don't share it with anybody. | 125 | # Make this unique, and don't share it with anybody. |
504 | @@ -170,7 +169,6 @@ | |||
505 | 170 | ) | 169 | ) |
506 | 171 | 170 | ||
507 | 172 | LOCAL_APPS = ( | 171 | LOCAL_APPS = ( |
508 | 173 | #'people', | ||
509 | 174 | 'project', | 172 | 'project', |
510 | 175 | 'ticket', | 173 | 'ticket', |
511 | 176 | ) | 174 | ) |
PASSED: Continuous integration, rev:901 s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/1747/
http://
Executed test runs:
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/1747/ rebuild
http://