MAAS

Merge lp:~allenap/maas/remove-dependency-on-iscpy into lp:~maas-committers/maas/trunk

  1. remove-dependency-on-iscpy
  2. Merge into trunk
Proposed by Gavin Panella
Status: Rejected
Rejected by: Gavin Panella
Proposed branch: lp:~allenap/maas/remove-dependency-on-iscpy
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 23 lines (+0/-2)
2 files modified
buildout.cfg (+0/-1)
required-packages/base (+0/-1)
To merge this branch: bzr merge lp:~allenap/maas/remove-dependency-on-iscpy
Reviewer Review Type Date Requested Status
MAAS Maintainers Pending
Review via email: mp+264010@code.launchpad.net

Commit message

Remove development dependency on iscpy / python-iscpy.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Raphael's branch has supplanted this one:
  https://code.launchpad.net/~rvb/maas/fix-iscpy/+merge/264012

Unmerged revisions

4071. By Gavin Panella

Remove development dependency on python-iscpy.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout.cfg'
2--- buildout.cfg 2015-07-03 21:35:26 +0000
3+++ buildout.cfg 2015-07-07 09:06:45 +0000
4@@ -231,7 +231,6 @@
5 djorm-ext-pgarray
6 docutils
7 crochet
8- iscpy
9 entry-points =
10 test.e2e=maastesting.protractor.runner:run_protractor
11 extra-paths =
12
13=== modified file 'required-packages/base'
14--- required-packages/base 2015-03-11 12:24:11 +0000
15+++ required-packages/base 2015-07-07 09:06:45 +0000
16@@ -29,7 +29,6 @@
17 python-formencode
18 python-hivex
19 python-httplib2
20-python-iscpy
21 python-jsonschema
22 python-lockfile
23 python-netaddr