Split history from readme.

Author: fschulze

HISTORY.rst

@@ -0,0 +1,141 @@
+Changelog
+=========
+
+1.2.0 - Unreleased
+------------------
+
+* Always set ``ansible_ssh_user`` in inventory.
+  [fschulze]
+
+* Clear host and pattern cache after calling original Inventory.__init__ method.
+  [fschulze]
+
+* Add ``--extra-vars`` option to ``configure`` command.
+  [witsch (Andreas Zeidler)]
+
+* Provide ploy_crypted lookup plugin to load encrypted files into Ansible
+  variables. Only ascii and utf8 encoded files will work.
+  [fschulze]
+
+* Expand Ansible variables in get_ansible_variables method.
+  [fschulze]
+
+* Support Ansible vault with safe key storage.
+  [fschulze]
+
+
+1.1.0 - 2014-08-13
+------------------
+
+* Test and fixes for changes in ansible 1.7.
+  [fschulze]
+
+* Add verbosity argument to ``configure`` command.
+  [fschulze]
+
+
+1.0.0 - 2014-07-19
+------------------
+
+* Added documentation.
+  [fschulze]
+
+
+1.0b8 - 2014-07-15
+------------------
+
+* Add ansible as dependency if it can't be imported already.
+  [fschulze]
+
+
+1.0b7 - 2014-07-08
+------------------
+
+* Packaging and test fixes.
+  [fschulze]
+
+
+1.0b6 - 2014-07-04
+------------------
+
+* Use unique instance id to avoid issues.
+  [fschulze]
+
+* Renamed mr.awsome to ploy and mr.awsome.ansible to ploy_ansible.
+  [fschulze]
+
+
+1.0b5 - 2014-06-16
+------------------
+
+* Set user in playbook to the one from the config if it's not set already.
+  [fschulze]
+
+* Change default playbook directory from the aws.conf directory to it's parent.
+  [fschulze]
+
+
+1.0b4 - 2014-06-11
+------------------
+
+* Added ``playbook`` and ``roles`` config options for instances.
+  [fschulze]
+
+* Added ``has_playbook`` and ``configure`` methods to instances.
+  [fschulze]
+
+* Added before/after_ansible_configure hooks.
+  [fschulze]
+
+
+1.0b3 - 2014-06-09
+------------------
+
+* Use execnet for connections. There is only one ssh connection per host and
+  it's reused for all commands.
+  [fschulze]
+
+* Make sure the playbook directory is always absolute.
+  [fschulze]
+
+* Prevent use of persistent ssh connections, as that easily results in
+  connections to wrong jails because of the proxying. This makes ansible a lot
+  slower at the moment.
+  [fschulze]
+
+* Add support for su and vault (ansible 1.5) as well as ``--force-handlers``
+  (ansible 1.6).
+  [fschulze]
+
+* Removed ``ansible`` from install requirements. It won't install in a buildout
+  so it needs to be installed in a virtualenv or via a system package.
+  [fschulze]
+
+
+1.0b2 - 2014-05-15
+------------------
+
+* Add ``configure`` command which is a stripped down variant of the
+  ``playbook`` command with assumptions about the location of the yml file.
+  [fschulze]
+
+* Warn if a playbook is requested for a host that is not configured in the
+  playbook hosts list.
+  [fschulze]
+
+* Allow mr.awsome plugins to add ansible variables.
+  [fschulze]
+
+* Inject the ansible paths sooner as they may not apply in some cases otherwise.
+  [fschulze]
+
+* Moved setuptools-git from setup.py to .travis.yml, it's only needed for
+  releases and testing.
+  [fschulze]
+
+
+1.0b1 - 2014-03-24
+------------------
+
+* Initial release
+  [fschulze]

MANIFEST.in

@@ -1,2 +1,3 @@
-include *.ini
 include *.rst
+include setup.py
+include tox.ini

README.rst

@@ -167,146 +167,3 @@ On the Python side, each ploy instance gains the following methods:
 ``get_vault_lib``
   Returns a readily usable Ansible VaultLib class.
   Use the ``encrypt`` and ``decrypt`` methods do encrypt/decrypt strings.
-
-
-Changelog
-=========
-
-1.2.0 - Unreleased
-------------------
-
-* Always set ``ansible_ssh_user`` in inventory.
-  [fschulze]
-
-* Clear host and pattern cache after calling original Inventory.__init__ method.
-  [fschulze]
-
-* Add ``--extra-vars`` option to ``configure`` command.
-  [witsch (Andreas Zeidler)]
-
-* Provide ploy_crypted lookup plugin to load encrypted files into Ansible
-  variables. Only ascii and utf8 encoded files will work.
-  [fschulze]
-
-* Expand Ansible variables in get_ansible_variables method.
-  [fschulze]
-
-* Support Ansible vault with safe key storage.
-  [fschulze]
-
-
-1.1.0 - 2014-08-13
-------------------
-
-* Test and fixes for changes in ansible 1.7.
-  [fschulze]
-
-* Add verbosity argument to ``configure`` command.
-  [fschulze]
-
-
-1.0.0 - 2014-07-19
-------------------
-
-* Added documentation.
-  [fschulze]
-
-
-1.0b8 - 2014-07-15
-------------------
-
-* Add ansible as dependency if it can't be imported already.
-  [fschulze]
-
-
-1.0b7 - 2014-07-08
-------------------
-
-* Packaging and test fixes.
-  [fschulze]
-
-
-1.0b6 - 2014-07-04
-------------------
-
-* Use unique instance id to avoid issues.
-  [fschulze]
-
-* Renamed mr.awsome to ploy and mr.awsome.ansible to ploy_ansible.
-  [fschulze]
-
-
-1.0b5 - 2014-06-16
-------------------
-
-* Set user in playbook to the one from the config if it's not set already.
-  [fschulze]
-
-* Change default playbook directory from the aws.conf directory to it's parent.
-  [fschulze]
-
-
-1.0b4 - 2014-06-11
-------------------
-
-* Added ``playbook`` and ``roles`` config options for instances.
-  [fschulze]
-
-* Added ``has_playbook`` and ``configure`` methods to instances.
-  [fschulze]
-
-* Added before/after_ansible_configure hooks.
-  [fschulze]
-
-
-1.0b3 - 2014-06-09
-------------------
-
-* Use execnet for connections. There is only one ssh connection per host and
-  it's reused for all commands.
-  [fschulze]
-
-* Make sure the playbook directory is always absolute.
-  [fschulze]
-
-* Prevent use of persistent ssh connections, as that easily results in
-  connections to wrong jails because of the proxying. This makes ansible a lot
-  slower at the moment.
-  [fschulze]
-
-* Add support for su and vault (ansible 1.5) as well as ``--force-handlers``
-  (ansible 1.6).
-  [fschulze]
-
-* Removed ``ansible`` from install requirements. It won't install in a buildout
-  so it needs to be installed in a virtualenv or via a system package.
-  [fschulze]
-
-
-1.0b2 - 2014-05-15
-------------------
-
-* Add ``configure`` command which is a stripped down variant of the
-  ``playbook`` command with assumptions about the location of the yml file.
-  [fschulze]
-
-* Warn if a playbook is requested for a host that is not configured in the
-  playbook hosts list.
-  [fschulze]
-
-* Allow mr.awsome plugins to add ansible variables.
-  [fschulze]
-
-* Inject the ansible paths sooner as they may not apply in some cases otherwise.
-  [fschulze]
-
-* Moved setuptools-git from setup.py to .travis.yml, it's only needed for
-  releases and testing.
-  [fschulze]
-
-
-1.0b1 - 2014-03-24
-------------------
-
-* Initial release
-  [fschulze]

setup.py

@@ -4,6 +4,7 @@
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.rst')).read()
+HISTORY = open(os.path.join(here, 'HISTORY.rst')).read()
 
 
 version = "1.2.0dev"
@@ -26,7 +27,7 @@
 setup(
     version=version,
     description="Plugin to integrate Ansible with ploy.",
-    long_description=README + "\n\n",
+    long_description=README + "\n\n" + HISTORY,
     name="ploy_ansible",
     author='Florian Schulze',
     author_email='[email protected]',