Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cleaned up the Makefile and changed version to 1.0.0
Details: * Changed version from 1.0.0.dev1 to 1.0.0 to allow for use of ansible-galaxy commands. Note that most of the changes below caused changes to or removals of make variables, but that is not described in detail. * Changed the approach in setup.py for determining the collection version from using PyYAML to using regular expressions, in order to avoid the depenency on the PyYAML package. The version needs to bbe determined before any packages are installed. * Added ignores to 2.9 ignore file. * Removed the cloning of the ansible repo into ../ansible. This was possible since none of its tools is used any longer. * Removed target 'check' and use of flake8, since that is now done in the Ansible sanity test via check 'pep8'. Removed the .flake8 config file. Removed 'make check' from the travis control file, and enabled 'make sanity' in the travis control file for all Python versions. * Removed target 'doccheck' since its only value was to verify that the generated RST files are in sync with the checked in RST files. This can be done with git and is unlikely to be a comon issue that would need such a functionality. * Separated the RST extraction using ansible-doc-extractor into a separate pattern rule. That is not really motivated by performance concerns but by following the general idea of generating only what is out of date. This also allowed getting rid of the need to rename plugins/modules/__init__.py to *.skip. * Improved the invocation of the Ansible sanity test a little, by reusing the tar file and updating it instead of recreating it. The only downside is that when files are removed, 'make clobber' now needs to be invoked (or the tar file manually removed). * Removed make variables SPHINXOPTS, SPHINXBUILD, SOURCEDIR, and BUILDDIR (or in case of SPHINXOPTS used a new internal variable sphinx_opts), because it is unlikely that there is a need to set them from the outside. * Changed the 'test' target to no longer create a test log file, and thus the tests are now always executed even when 'make test' is re-run. * Fixed the 'linkcheck' target and made it part of the 'all' target. For now, its reported errors are ignored, so we can fix them separately. * Changed the 'install' target to use 'ansible-galaxy collection install' to install into the local collection search path. The distribution archive for that is again built in the 'dist' directory. Added '/dist' to .gitignore. * Changed the 'upload' target to use 'ansible-galaxy collection publish' to publish the collection to Ansible Galaxy. * Made the 'sanity' target part of the 'all' target. * Added some temporary directories to the 'clobber' target. * Removed extraeneous messages in rules. * Changed the approach for raising an error from using 'echo' and 'false' to using '$(error ...)'. Signed-off-by: Andreas Maier <maiera@de.ibm.com>
- Loading branch information