centersl/ansible-docs
1
0
Fork 0
mirror of https://github.com/ansible/ansible-documentation.git synced 2026-03-26 13:18:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add manifest includes for reuse licenses (#79403)

Browse Source 
* Add includes for reuse licenses

* Add additional exludes to follow REJECT_EXTS

* clog frag
This commit is contained in:
Matt Martz
2022-11-17 17:13:01 -06:00
committed by GitHub
parent a954918b60
commit 942bcf6e7a
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelogs/fragments/79368-galaxy-manifest-reuse-licenses.yml Normal file
View File

@@ -0,0 +1,3 @@
minor_changes:
- collections - Add additional includes for REUSE license files (https://github.com/ansible/ansible/issues/79368)
- collections - Add additional ignores for commonly rejected file extensions

20
lib/ansible/galaxy/collection/__init__.py
View File

@@ -1113,13 +1113,15 @@ def _build_files_manifest_distlib(b_collection_path, namespace, name, manifest_c
else:
directives.extend([
'include meta/*.yml',
'include *.txt *.md *.rst COPYING LICENSE',
'include *.txt *.md *.rst *.license COPYING LICENSE',
'recursive-include .reuse **',
'recursive-include LICENSES **',
'recursive-include tests **',
'recursive-include docs **.rst **.yml **.yaml **.json **.j2 **.txt',
'recursive-include roles **.yml **.yaml **.json **.j2',
'recursive-include playbooks **.yml **.yaml **.json',
'recursive-include changelogs **.yml **.yaml',
'recursive-include plugins */**.py',
'recursive-include docs **.rst **.yml **.yaml **.json **.j2 **.txt **.license',
'recursive-include roles **.yml **.yaml **.json **.j2 **.license',
'recursive-include playbooks **.yml **.yaml **.json **.license',
'recursive-include changelogs **.yml **.yaml **.license',
'recursive-include plugins */**.py */**.license',
])
plugins = set(l.package.split('.')[-1] for d, l in get_all_plugin_loaders())
@@ -1132,8 +1134,8 @@ def _build_files_manifest_distlib(b_collection_path, namespace, name, manifest_c
)
directives.extend([
'recursive-include plugins/modules **.ps1 **.yml **.yaml',
'recursive-include plugins/module_utils **.ps1 **.psm1 **.cs',
'recursive-include plugins/modules **.ps1 **.yml **.yaml **.license',
'recursive-include plugins/module_utils **.ps1 **.psm1 **.cs **.license',
])
directives.extend(control.directives)
@@ -1141,7 +1143,7 @@ def _build_files_manifest_distlib(b_collection_path, namespace, name, manifest_c
directives.extend([
f'exclude galaxy.yml galaxy.yaml MANIFEST.json FILES.json {namespace}-{name}-*.tar.gz',
'recursive-exclude tests/output **',
'global-exclude /.* /__pycache__',
'global-exclude /.* /__pycache__ *.pyc *.pyo *.bak *~ *.swp',
])
display.vvv('Manifest Directives:')