diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b4433a2..635245b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,33 +1,48 @@ -Mazer Changes by Release -======================== +======= +History +======= -v0.3.0 - Active development ---------------------------- +0.3.0 (2018-11-06) +------------------ -Closed PRS -`````````` -- `124 Remove --roles-path option from init and install commands `_. -- `130 Implement *build* command for building a collection artifact `_. -- `132 Create log directory before initializing logger. Support multiple locations for mazer.yml config `_. -- `133 Add MAZER_CONFIG environment var for specifying config file location `_. -- `135 For multi-content archive, install all content `_. -- `136 Support global content install option `_. -- `141 Add --editable install option. Similar to 'pip install -e' `_. -- `142 Add support for init of a collection, and make it the default `_. +* `155 Implement install of things with dep solving (for trad roles and collections) `_. +* `142 Add support for init of a collection, and make it the default `_. +* `139 Add 'editable' installs via 'install -e' (ala, 'python setup.py develop') `_. +* `138 Install role requirements `_. +* `136 Support global content install option `_. +* `135 For multi-content archive, install all content `_. +* `133 Add MAZER_CONFIG environment var for specifying config file location `_. +* `116 Add a 'mazer build' command to build collection artifacts `_. +* `151 Fix install of sdx_licenses.json `_. +* `132 Fix log directory creation before initializing logger. Support multiple locations for mazer.yml config `_. +* `127 Refactor ansible_galaxy.flat_rest_api.content `_. +* `126 Finish replacing core data objects with 'attrs' based classes `_. +* `124 Fix unneeded --roles-path option for init and install commands by removing it `_. +* `119 Fix "'mazer list' on multi-content repos looks for install_info in the wrong places" `_. -v0.2.1 - Released 08-Aug-2018 ------------------------------ +0.2.1 (2018-08-08) +------------------ -Closed PRS -`````````` -- `113 Make sure default-mazer-logging.yml gets installed `_. -- `120 Fix install if a role name is a substring of another role `_. -- `121 Send X-Request-ID header on HTTP requests `_. -- `122 Fix attr dependency `_. +* Add 'attrs' dep to setup.py. Update requirements.txt + to use setup.py requires. +* Add the default logging config to Manifest.in so + logging is setup correctly on pip install. + Fixes https://github.com/ansible/mazer/issues/114 +* Fix install if a role name is substring of another role. + Fixes https://github.com/ansible/mazer/issues/112 +* Create and send a X-Request-ID on http requests. -v0.2.0 - Released 26-Jul-2018 ------------------------------ +0.2.0 (2018-07-26) +------------------ -v0.1.0 - Released 03-Jul-2018 ------------------------------ +* Support new + ~/.ansible/content/namespace/reponame/content_type/content_name layout +* Create install receipts (.galaxy_install_info) on + install of repos and roles. +* 'list' and 'info' commands updated. +* Now requires and uses 'attrs' python module >=18.1.0 +0.1.0 (2018-04-18) +------------------ + +* First release on PyPI. diff --git a/HISTORY.rst b/HISTORY.rst deleted file mode 100644 index 0f3b9c6..0000000 --- a/HISTORY.rst +++ /dev/null @@ -1,30 +0,0 @@ -======= -History -======= - -0.2.1 (2018-08-08) ------------------- - -* Add 'attrs' dep to setup.py. Update requirements.txt - to use setup.py requires. -* Add the default logging config to Manifest.in so - logging is setup correctly on pip install. - Fixes https://github.com/ansible/mazer/issues/114 -* Fix install if a role name is substring of another role - Fixes https://github.com/ansible/mazer/issues/112 -* Create and send a X-Request-ID on http requests. - -0.2.0 (2018-07-26) ------------------- - -* Support new - ~/.ansible/content/namespace/reponame/content_type/content_name layout -* Create install receipts (.galaxy_install_info) on - install of repos and roles -* 'list' and 'info' commands updated -* Now requires and uses 'attrs' python module >=18.1.0 - -0.1.0 (2018-04-18) ------------------- - -* First release on PyPI. diff --git a/MANIFEST.in b/MANIFEST.in index 9829316..5748f65 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include AUTHORS.rst include CONTRIBUTING.rst -include HISTORY.rst +include CHANGELOG.rst include LICENSE include README.rst diff --git a/setup.py b/setup.py index a8442db..5f9e15b 100644 --- a/setup.py +++ b/setup.py @@ -8,8 +8,8 @@ from setuptools import setup, find_packages with open('README.rst') as readme_file: readme = readme_file.read() -with open('HISTORY.rst') as history_file: - history = history_file.read() +with open('CHANGELOG.rst') as changelog_file: + changelog = changelog_file.read() requirements = ['six', 'PyYaml', @@ -35,7 +35,7 @@ setup( entry_points=entry_points, install_requires=requirements, license="GPLv3", - long_description=readme + '\n\n' + history, + long_description=readme + '\n\n' + changelog, include_package_data=True, keywords='mazer', packages=find_packages(include=['ansible_galaxy', 'ansible_galaxy_cli',