Merge lp:~abentley/juju-ci-tools/jujupy-reorg3 into lp:juju-ci-tools

[Aaron Bentley]

Turn jujupy into a standalone library.

This branch completes turning jujupy into a standalone library.

It moves timeout into jujupy, fixes some imports, and adds a setup.py.

I have successfully used this version with Hammer Time.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== renamed file 'tests/test_timeout.py' => 'jujupy/tests/test_timeout.py'
=== renamed file 'timeout.py' => 'jujupy/timeout.py'
--- timeout.py	2015-08-19 15:07:08 +0000
+++ jujupy/timeout.py	2017-02-22 21:42:28 +0000
@@ -7,7 +7,7 @@
 import sys
 import time
 
-from utility import until_timeout
+from jujupy.utility import until_timeout
 
 
 # Generate a list of all signals that can be used with Popen.send_signal on

=== modified file 'jujupy/utility.py'
--- jujupy/utility.py	2017-02-22 21:42:27 +0000
+++ jujupy/utility.py	2017-02-22 21:42:28 +0000
@@ -178,8 +178,8 @@
 
 
 def get_timeout_path():
-    import timeout
-    return os.path.abspath(timeout.__file__)
+    import jujupy.timeout
+    return os.path.abspath(jujupy.timeout.__file__)
 
 
 def unqualified_model_name(model_name):

=== modified file 'jujupy/version_client.py'
--- jujupy/version_client.py	2017-02-10 07:27:57 +0000
+++ jujupy/version_client.py	2017-02-22 21:42:28 +0000
@@ -28,7 +28,7 @@
     unqualified_model_name,
     UpgradeMongoNotSupported,
     )
-from utility import (
+from jujupy.utility import (
     ensure_deleted,
     scoped_environ,
     split_address_port,

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2017-02-22 21:42:28 +0000
@@ -0,0 +1,12 @@
+from setuptools import setup
+setup(
+    name='jujupy',
+    version='0.1.0',
+    description='A library for driving the Juju client.',
+    packages=['jujupy'],
+    install_requires=[
+        'python-dateutil >= 2',
+        'pexpect >= 4.0.0',
+        'PyYAML >= 3.0',
+        ]
+    )