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

[Mario Splivalo]

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

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

[Mario Splivalo (mariosplivalo)]

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'.

[Jorge Niedbalski (niedbalski)]

LGTM

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-11-25 15:04:52 +0000
+++ .bzrignore	2015-01-19 16:24:23 +0000
@@ -7,5 +7,8 @@
 .env/
 coverage.xml
 docs/_build
+.project
+.pydevproject
+.settings
 .venv
 .venv3

=== removed file '.project'
--- .project	2014-07-02 09:39:03 +0000
+++ .project	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>charm-helpers</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
-</projectDescription>

=== removed file '.pydevproject'
--- .pydevproject	2014-07-02 09:39:03 +0000
+++ .pydevproject	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/charm-helpers</path>
-</pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-</pydev_project>

=== 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 @@
     pip_execute(command)
 
 
-def pip_install(package, fatal=False, **options):
+def pip_install(package, fatal=False, upgrade=False, **options):
     """Install a python package"""
     command = ["install"]
 
@@ -43,6 +43,9 @@
     for option in parse_options(options, available_options):
         command.append(option)
 
+    if upgrade:
+        command.append('--upgrade')
+
     if isinstance(package, list):
         command.extend(package)
     else: