Merge lp:~allenap/maas/upgrade-deps-2017-01 into lp:~maas-committers/maas/trunk

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 5644
Proposed branch: lp:~allenap/maas/upgrade-deps-2017-01
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 105 lines (+25/-25)
2 files modified
Makefile (+2/-2)
versions.cfg (+23/-23)
To merge this branch: bzr merge lp:~allenap/maas/upgrade-deps-2017-01
Reviewer Review Type Date Requested Status
Lee Trager (community) Approve
Review via email: mp+314727@code.launchpad.net

Commit message

Upgrade lots of test and documentation dependencies.

Description of the change

These dependency changes serve several purposes:

- Get the newest stuff.

- Get bug fixes.

- Pay down some upgrade cost; avoid having to pay for a huge upgrade later, perhaps one we're forced into.

I've run tests and everything passes. The docs also generate and seem to work fine.

To post a comment you must log in.
Revision history for this message
Lee Trager (ltrager) wrote :

Thanks for updating our test and doc deps, they're often overlooked. I pulled the branch and ran a couple of tests as well and everything seems to work fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2017-01-11 10:29:20 +0000
3+++ Makefile 2017-01-13 16:59:44 +0000
4@@ -297,7 +297,7 @@
5 lint-py: bin/flake8
6 @find $(sources) -name '*.py' \
7 ! -path '*/migrations/*' ! -path '*/south_migrations/*' -print0 \
8- | xargs -r0 bin/flake8 --ignore=E123,E402,E731 --isolated
9+ | xargs -r0 bin/flake8 --ignore=E123,E305,E402,E731 --isolated
10
11 # Ignore tests when checking complexity. The maximum complexity ought to
12 # be close to 10 but MAAS has many functions that are over that so we
13@@ -308,7 +308,7 @@
14 @find $(sources) -name '*.py' \
15 ! -path '*/migrations/*' ! -path '*/south_migrations/*' \
16 ! -path '*/tests/*' ! -path '*/testing/*' ! -name 'testing.py' \
17- -print0 | xargs -r0 bin/flake8 --ignore=E123,E402,E731 \
18+ -print0 | xargs -r0 bin/flake8 --ignore=E123,E305,E402,E731 \
19 --isolated --max-complexity=$(maximum)
20
21 # Statically check imports against policy.
22
23=== modified file 'versions.cfg'
24--- versions.cfg 2016-11-17 11:46:08 +0000
25+++ versions.cfg 2017-01-13 16:59:44 +0000
26@@ -1,56 +1,56 @@
27 [versions]
28
29 # Documentation.
30-collective.recipe.sphinxbuilder = 0.8.2
31-Pygments = 2.0.2
32+collective.recipe.sphinxbuilder = 1.0
33+Pygments = 2.1.3
34 snowballstemmer = 1.2.1
35-Sphinx = 1.3.5
36+Sphinx = 1.5.1
37 sphinx-rtd-theme = 0.1.9
38
39 # Development and testing.
40 argparse = 1.1
41 blessings = 1.6
42 buildout-versions = 1.7
43-coverage = 4.1
44+coverage = 4.3.1
45 decorator = 4.0.10
46 django-nose = 1.4.2
47-extras = 0.0.3
48-fixtures = 2.0.0
49-hypothesis = 1.11.4
50+extras = 1.0.0
51+fixtures = 3.0.0
52+hypothesis = 3.6.1
53 ipdb = 0.10.1
54 ipython = 5.1.0
55 ipython-genutils = 0.1.0
56-junitxml = 0.6
57+junitxml = 0.7
58 linecache2 = 1.0.0
59-nose = 1.3.1
60+nose = 1.3.7
61 nose-progressive = 1.5.1
62-nose-timer = 0.5.0
63-pbr = 1.8.1
64+nose-timer = 0.6.0
65+pbr = 1.10.0
66 pickleshare = 0.7.4
67 postgresfixture = 0.3.1
68-prompt-toolkit = 1.0.7
69-python-mimeparse = 0.1.4
70+prompt-toolkit = 1.0.9
71+python-mimeparse = 1.6.0
72 python-subunit = 1.2.0
73 selenium = 2.45
74-setuptools = 18.7
75+setuptools = 32.3.1
76 simplegeneric = 0.8.1
77-sqlparse = 0.1.10
78+sqlparse = 0.2.2
79 termcolor = 1.1.0
80-testresources = 0.2.7
81-testscenarios = 0.4
82-testtools = 2.1.0
83+testresources = 2.0.1
84+testscenarios = 0.5.0
85+testtools = 2.2.0
86 traceback2 = 1.4.0
87 traitlets = 4.3.1
88 unittest2 = 1.1.0
89 wcwidth = 0.1.7
90-zc.buildout = 2.5.0
91+zc.buildout = 2.5.3
92 zc.recipe.egg = 2.0.3
93
94 # Lint.
95-flake8 = 3.0.4
96-mccabe = 0.5.2
97-pycodestyle = 2.0.0
98-pyflakes = 1.1.0
99+flake8 = 3.2.1
100+mccabe = 0.5.3
101+pycodestyle = 2.2.0
102+pyflakes = 1.3.0
103
104 # Explicit versions for PACKAGED dependencies. This is where a TEST
105 # dependency itself depends on an INSTALL/RUNTIME dependency which is,