Merge lp:~johnsca/charm-helpers/contrib-setup-pypi into lp:charm-helpers

[Cory Johns]

Several contrib packages were missing from setup.py, meaning they would not be included in a pypi release.

[lp:~johnsca/charm-helpers/contrib-setup-pypi]

421. By Cory Johns on 2015-08-04

Added install_requires section to setup.py to ensure dependencies are met when installing from pypi

422. By Cory Johns on 2015-08-04

Removed version pins and netifaces to ensure that it installs properly on new trusty and precise images

[Matt Bruzek (mbruzek)]

Cory and I had a discussion on IRC about the version numbers in revision 421. I am glad he removed the specific version numbers.

I juju deployed both a precise and trusty Ubuntu charm. I was able to verify the old incorrect behavior of not being able to resolve: from charmhelpers.contrib import ssl.

When I branched this code and pip installed the current directory I was able to successfully import the missing package! Thanks Cory for this fix.

+1

review: Approve

[Matt Bruzek (mbruzek)]

I also tested with a python virtual environment, and was able to resolve: from charmhelpers.cli import cmdline - which required six and pyyaml installed before the import would resolve.

=== modified file 'setup.py'
--- setup.py	2015-03-04 16:15:18 +0000
+++ setup.py	2015-08-04 17:57:09 +0000
@@ -14,6 +14,13 @@
     'author': "Ubuntu Developers",
     'author_email': "[e-mail]",
     'url': "https://code.launchpad.net/charm-helpers",
+    'install_requires': [
+        'netaddr',
+        'PyYAML',
+        'Tempita',
+        'Jinja2',
+        'six',
+    ],
     'packages': [
         "charmhelpers",
         "charmhelpers.cli",
@@ -22,13 +29,27 @@
         "charmhelpers.fetch",
         "charmhelpers.payload",
         "charmhelpers.contrib",
+        "charmhelpers.contrib.amulet",
         "charmhelpers.contrib.ansible",
         "charmhelpers.contrib.benchmark",
         "charmhelpers.contrib.charmhelpers",
         "charmhelpers.contrib.charmsupport",
+        "charmhelpers.contrib.database",
+        "charmhelpers.contrib.hahelpers",
+        "charmhelpers.contrib.network",
+        "charmhelpers.contrib.network.ovs",
+        "charmhelpers.contrib.openstack",
+        "charmhelpers.contrib.openstack.amulet",
+        "charmhelpers.contrib.openstack.files",
+        "charmhelpers.contrib.openstack.templates",
+        "charmhelpers.contrib.peerstorage",
+        "charmhelpers.contrib.python",
         "charmhelpers.contrib.saltstack",
-        "charmhelpers.contrib.hahelpers",
+        "charmhelpers.contrib.ssl",
+        "charmhelpers.contrib.storage",
+        "charmhelpers.contrib.storage.linux",
         "charmhelpers.contrib.templating",
+        "charmhelpers.contrib.unison",
     ],
     'scripts': [
         "bin/chlp",