Skip to content

Commit

Permalink
Fixed ignore lists in .gitigmore and galaxy build_ignore
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Maier <maiera@de.ibm.com>
  • Loading branch information
andy-maier committed Nov 9, 2020
1 parent 00465be commit d0cd11b
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 33 deletions.
34 changes: 11 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,33 +1,21 @@
.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/
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand Down
39 changes: 30 additions & 9 deletions galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit d0cd11b

Please sign in to comment.