Charm Helpers

Merge lp:~mariosplivalo/charm-helpers/pip_update into lp:charm-helpers

  1. pip_update
  2. Merge into devel
Proposed by Mario Splivalo
Status: Merged
Merged at revision: 286
Proposed branch: lp:~mariosplivalo/charm-helpers/pip_update
Merge into: lp:charm-helpers
Diff against target: 70 lines (+7/-26)
4 files modified
.bzrignore (+3/-0)
.project (+0/-17)
.pydevproject (+0/-8)
charmhelpers/contrib/python/packages.py (+4/-1)
To merge this branch: bzr merge lp:~mariosplivalo/charm-helpers/pip_update
Reviewer Review Type Date Requested Status
Jorge Niedbalski (community) Approve
Review via email: mp+246915@code.launchpad.net

Description of the change

Added option to pip_install to provide --upgrade, if needed.

Also, removed Eclipse-specific files (added them to .bzrignore too)

To post a comment you must log in.
Revision history for this message
Mario Splivalo (mariosplivalo) wrote :

I didn't add '--upgrade' to 'options' as that is 'reserved' for key-value options (which is not case for --upgrade).
Also, that would require modifying 'parse_options'.

Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2014-11-25 15:04:52 +0000
+++ .bzrignore 2015-01-19 16:24:23 +0000
@@ -7,5 +7,8 @@
7.env/7.env/
8coverage.xml8coverage.xml
9docs/_build9docs/_build
10.project
11.pydevproject
12.settings
10.venv13.venv
11.venv314.venv3
1215
=== removed file '.project'
--- .project 2014-07-02 09:39:03 +0000
+++ .project 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<projectDescription>
3 <name>charm-helpers</name>
4 <comment></comment>
5 <projects>
6 </projects>
7 <buildSpec>
8 <buildCommand>
9 <name>org.python.pydev.PyDevBuilder</name>
10 <arguments>
11 </arguments>
12 </buildCommand>
13 </buildSpec>
14 <natures>
15 <nature>org.python.pydev.pythonNature</nature>
16 </natures>
17</projectDescription>
180
=== removed file '.pydevproject'
--- .pydevproject 2014-07-02 09:39:03 +0000
+++ .pydevproject 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<?eclipse-pydev version="1.0"?><pydev_project>
3<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
4<path>/charm-helpers</path>
5</pydev_pathproperty>
6<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
7<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
8</pydev_project>
90
=== modified file 'charmhelpers/contrib/python/packages.py'
--- charmhelpers/contrib/python/packages.py 2014-11-26 04:52:18 +0000
+++ charmhelpers/contrib/python/packages.py 2015-01-19 16:24:23 +0000
@@ -35,7 +35,7 @@
35 pip_execute(command)35 pip_execute(command)
3636
3737
38def pip_install(package, fatal=False, **options):38def pip_install(package, fatal=False, upgrade=False, **options):
39 """Install a python package"""39 """Install a python package"""
40 command = ["install"]40 command = ["install"]
4141
@@ -43,6 +43,9 @@
43 for option in parse_options(options, available_options):43 for option in parse_options(options, available_options):
44 command.append(option)44 command.append(option)
4545
46 if upgrade:
47 command.append('--upgrade')
48
46 if isinstance(package, list):49 if isinstance(package, list):
47 command.extend(package)50 command.extend(package)
48 else:51 else:

Subscribers

People subscribed via source and target branches