Merge lp://staging/~freyes/maas-deployer/missing-deps into lp://staging/~maas-deployers/maas-deployer/next

Proposed by Felipe Reyes
Status: Merged
Merged at revision: 52
Proposed branch: lp://staging/~freyes/maas-deployer/missing-deps
Merge into: lp://staging/~maas-deployers/maas-deployer/next
Diff against target: 8 lines (+1/-0)
1 file modified
requirements.txt (+1/-0)
To merge this branch: bzr merge lp://staging/~freyes/maas-deployer/missing-deps
Reviewer Review Type Date Requested Status
Billy Olsen Approve
Review via email: mp+276398@code.staging.launchpad.net

Description of the change

Add missing dependencies

    - markupsafe
    - PyYAML

To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) wrote :

Agreed that PyYAML is needed but not sure about markupsafe since it is implicitly installed as a dependency on another packaged installed i.e. as part of the current installation process. Is there a real reason why this is required here?

Revision history for this message
Edward Hope-Morley (hopem) wrote :
Revision history for this message
Felipe Reyes (freyes) wrote :

Edward, you're right, markupsafe is needed by Jinja2, in a clean virtualenv it wasn't installed. The deb package doesn't expose this problem, because python-jinja2 explicitly depends on python-markupsafe.

This is weird, because jinja2 defined markupsafe as a dependency[0]

(maas-deployer)freyes@alienware:~/Projects/maas-deployer$ maas-deployer -h
Traceback (most recent call last):
  File "/home/freyes/.virtualenvs/maas-deployer/bin/maas-deployer", line 9, in <module>
    load_entry_point('maas-deployer==0.0.1', 'console_scripts', 'maas-deployer')()
  File "/home/freyes/.virtualenvs/maas-deployer/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 558, in load_entry_point
    return get_distribution(dist).load_entry_point(group, name)
  File "/home/freyes/.virtualenvs/maas-deployer/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 2682, in load_entry_point
    return ep.load()
  File "/home/freyes/.virtualenvs/maas-deployer/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 2355, in load
    return self.resolve()
  File "/home/freyes/.virtualenvs/maas-deployer/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 2361, in resolve
    module = __import__(self.module_name, fromlist=['__name__'], level=0)
  File "build/bdist.linux-x86_64/egg/maas_deployer/cli.py", line 25, in <module>
  File "build/bdist.linux-x86_64/egg/maas_deployer/vmaas/engine.py", line 17, in <module>
  File "build/bdist.linux-x86_64/egg/maas_deployer/vmaas/vm.py", line 21, in <module>
  File "build/bdist.linux-x86_64/egg/maas_deployer/vmaas/template.py", line 5, in <module>
  File "/home/freyes/.virtualenvs/maas-deployer/local/lib/python2.7/site-packages/jinja2/__init__.py", line 33, in <module>
    from jinja2.environment import Environment, Template
  File "/home/freyes/.virtualenvs/maas-deployer/local/lib/python2.7/site-packages/jinja2/environment.py", line 13, in <module>
    from jinja2 import nodes
  File "/home/freyes/.virtualenvs/maas-deployer/local/lib/python2.7/site-packages/jinja2/nodes.py", line 19, in <module>
    from jinja2.utils import Markup
  File "/home/freyes/.virtualenvs/maas-deployer/local/lib/python2.7/site-packages/jinja2/utils.py", line 531, in <module>
    from markupsafe import Markup, escape, soft_unicode
ImportError: No module named markupsafe

I'll drop the other MP and update this one to just include pyyaml.

[0] https://github.com/mitsuhiko/jinja2/blob/master/setup.py#L70

53. By Felipe Reyes

Remove markupsafe from requirements.txt

Revision history for this message
Billy Olsen (billy-olsen) wrote :

LGTM. I think the markupsafe not getting installed is an issue within pip, possibly a transient failure. The actual dependency is on PyYAML and not on markupsafe, which is PyYAMLs dependency so I think its clean to leave it the way it is in this latest revision.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches