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

[Aaron Bentley]

Prepare jujupy to be published on pypi.

This branch prepares jujupy for publication on pypi.

It updates setup.py with the relevant metadata, adds copyright statements and a description.

[Curtis Hovey (sinzui)]

We talked on IRC. This change is fine, but I am surprised that apache-2.0 was selected. We spoke on IRC and you will switch to LGPLv3.

review: Approve (code)

=== modified file '.bzrignore'
--- .bzrignore	2017-03-14 16:15:26 +0000
+++ .bzrignore	2017-03-22 19:43:01 +0000
@@ -6,3 +6,5 @@
 ./.coverage
 __pycache__
 ./jujupy.egg-info
+./dist
+./jujupy-*

=== added file 'jujupy-description.rst'
--- jujupy-description.rst	1970-01-01 00:00:00 +0000
+++ jujupy-description.rst	2017-03-22 19:43:01 +0000
@@ -0,0 +1,28 @@
+JujuPy
+######
+
+A library for driving the Juju commandline client, created by the Juju QA
+team.
+
+This library is compatible with released juju versions in the 1.x and 2.x
+series, beginning with 1.18.  It has been used in production since 2013, but
+was extracted into a separate library in 2017.
+
+It provides specific support for many commands.  In cases where it does not
+provide specific support, the normal juju commandline can be used through the
+``juju`` and ``get_juju_output`` methods.
+
+It provides ways of checking health, as well as waiting for an operation to
+complete.
+
+It supports interactive commands like ``register``.
+
+It is well-tested, with more than 8K lines of tests against more than 5K lines
+of code.
+
+It provides fakes for testing, i.e. a fake backend and the convenience
+function ``get_fake_client``.
+
+JujuPy is part of Juju CI tools.  For code and bugs, see its `Launchpad page`_.
+
+.. _Launchpad page: https://launchpad.net/juju-ci-tools

=== modified file 'jujupy/client.py'
--- jujupy/client.py	2017-03-17 20:26:17 +0000
+++ jujupy/client.py	2017-03-22 19:43:01 +0000
@@ -1,3 +1,17 @@
+# Copyright 2013-2017 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from __future__ import print_function
 
 from collections import (

=== modified file 'jujupy/configuration.py'
--- jujupy/configuration.py	2017-03-17 17:27:36 +0000
+++ jujupy/configuration.py	2017-03-22 19:43:01 +0000
@@ -1,3 +1,17 @@
+# Copyright 2013-2017 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """Low-level access to Juju configuration."""
 
 import os

=== modified file 'jujupy/fake.py'
--- jujupy/fake.py	2017-03-17 20:43:14 +0000
+++ jujupy/fake.py	2017-03-22 19:43:01 +0000
@@ -1,3 +1,17 @@
+# Copyright 2016-2017 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from argparse import ArgumentParser
 from base64 import b64encode
 from contextlib import contextmanager

=== modified file 'jujupy/timeout.py'
--- jujupy/timeout.py	2017-02-23 15:35:42 +0000
+++ jujupy/timeout.py	2017-03-22 19:43:01 +0000
@@ -1,4 +1,19 @@
 #!/usr/bin/env python
+#
+# Copyright 2015, 2017 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """A Python implementation of the *nix utility for use on all platforms."""
 from argparse import ArgumentParser
 from itertools import chain

=== modified file 'jujupy/utility.py'
--- jujupy/utility.py	2017-03-10 21:15:12 +0000
+++ jujupy/utility.py	2017-03-22 19:43:01 +0000
@@ -1,3 +1,17 @@
+# Copyright 2014-2017 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from contextlib import contextmanager
 from datetime import (
     datetime,

=== modified file 'jujupy/version_client.py'
--- jujupy/version_client.py	2017-03-10 19:54:30 +0000
+++ jujupy/version_client.py	2017-03-22 19:43:01 +0000
@@ -1,3 +1,17 @@
+# Copyright 2013-2017 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from contextlib import contextmanager
 import json
 from locale import getpreferredencoding

=== modified file 'setup.py'
--- setup.py	2017-03-14 16:15:26 +0000
+++ setup.py	2017-03-22 19:43:01 +0000
@@ -1,12 +1,34 @@
 from setuptools import setup
+
+
+with open('jujupy-description.rst') as f:
+    long_description = f.read()
+
+
 setup(
     name='jujupy',
-    version='0.1.2',
+    version='1.0.0',
     description='A library for driving the Juju client.',
+    long_description=long_description,
     packages=['jujupy'],
     install_requires=[
         'python-dateutil >= 2',
         'pexpect >= 4.0.0',
         'PyYAML >= 3.0',
-        ]
+        ],
+    author='The Juju QA Team',
+    author_email='[e-mail]',
+    url='https://launchpad.net/juju-ci-tools',
+    license='Apache 2',
+    classifiers=[
+        "License :: OSI Approved :: Apache Software License",
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.5",
+        "Operating System :: POSIX :: Linux",
+        "Operating System :: Microsoft :: Windows",
+        "Operating System :: MacOS :: MacOS X"
+    ],
     )