Fixed ignore lists in .gitignore and galaxy build_ignore

Signed-off-by: Andreas Maier <maiera@de.ibm.com>

.gitignore

@@ -1,34 +1,22 @@
 .DS_Store
 *.pyc
 *.pyo
-/env
-env*
-/venv
-/doc_check/
-/build/
-/htmlcov/
-.coverage
-/AUTHORS
-/ChangeLog
-/dist
 *.egg
 *.egg-info
-/_mailinglist
-/.tox
-/.cache
-/.idea
-/.vagrant
-/.pytest_cache
-/try
-try_*
-/tmp
-tmp_*
-*.tmp
+*.done
 *.log
 *.retry
-/*.done
+*.tmp
 vars.yml
 vault.yml
-/python-zhmcclient
+/try/
+try_*
+/tmp/
+tmp_*
+/.coverage
+/.pytest_cache/
+/venv/
+/htmlcov/
 /docs/build/
+/dist/
 /tests/output/

Makefile

@@ -261,7 +261,7 @@ install_pip_$(pymn).done: Makefile
 	$(PYTHON_CMD) -m pip install $(pip_level_opts) pip setuptools wheel
 	echo "done" >$@
 
-$(dist_file): $(dist_dependent_files)
+$(dist_file): $(dist_dependent_files) galaxy.yml
 	mkdir -p $(dist_dir)
 	ansible-galaxy collection build --output-path=$(dist_dir) --force .
 

galaxy.yml

@@ -40,21 +40,42 @@ issues: https://github.com/zhmcclient/zhmc-ansible-modules/issues
 
 # Ignore files and directories matching the following patterns
 build_ignore:
-  - '*.tar.gz'
-  - .DS_Store
+  # Ignore items from .gitignore:
+  - '*.DS_Store'
+  - '*.pyc'
+  - '*.pyo'
+  - '*.egg'
+  - '*.egg-info'
+  - '*.done'
+  - '*.log'
+  - '*.retry'
+  - '*.tmp'
+  - 'vars.yml'
+  - 'vault.yml'
+  - try
+  - 'try_*'
+  - tmp
+  - 'tmp_*'
+  - .coverage
   - .pytest_cache
-  - .coveragerc
-  - .flake8
+  - venv
+  - htmlcov
+  - docs/build
+  - dist
+  # Other ignore items:
+  - galaxy.yml
   - .gitignore
+  - .coveragerc
+  - .flake8  # only in older branches
   - .travis.yml
   - CODE_OF_CONDUCT.md
-  - CONTRIBUTING.rst
+  - CONTRIBUTING.rst  # only in older branches
   - DCO1.1.txt
   - LICENSE
   - Makefile
-  - dev-requirements.yml
+  - README.md
+  # requirements.txt is intentionally included for dependent install
+  - dev-requirements.txt
   - minimum-constraints.txt
-  - requirements.txt
   - setup.py
-  - tools/
-  - venv
+  - tools