From f739d3bd87f627d8171ebc63060c720170a36848 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 29 Nov 2021 16:25:03 +0100 Subject: [PATCH 1/2] Drop manual sdist file inclusion management This is necessary because `setuptools-scm` that is currently integrated, already includes all of the Git-tracked files to sdist. This means that only a single exclusion is needed for huge image blobs present in the Git tree now. --- MANIFEST.in | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 8e680caee..ff876bb6d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,37 +1 @@ prune asset -include *.md -include *.py -include *.txt -include *.yaml -include *.yml -include .ansible.cfg -include .coveragerc -include .pylintrc -include .yamllint -include mypy.ini -include tox.ini -include src/molecule/test/functional/.ansible-lint -include .config/molecule/config.yml -recursive-include docs *.ico -recursive-include docs *.png -recursive-include docs *.py -recursive-include docs *.rst -recursive-include src *.flake8 -recursive-include src *.j2 -recursive-include src *.json -recursive-include src *.md -recursive-include src *.py -recursive-include src *.rst -recursive-include src *.typed -recursive-include src *.yaml -recursive-include src *.yamllint -recursive-include src *.yml -recursive-include playbooks *.yaml -recursive-include snap *.yaml -recursive-include tools *.sh -recursive-include src/molecule/test/scenarios extra-host -recursive-include src/molecule/test/scenarios hosts -recursive-exclude .github *.* -recursive-exclude .mypy_cache *.* -recursive-exclude docs/docstree/html *.* -recursive-exclude zuul.d *.* From cc0e4d223505ebe4c8a7932d7df94ea955c1d8d1 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 29 Nov 2021 16:29:27 +0100 Subject: [PATCH 2/2] Drop the use of incompatible `check-manifest` pkg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is required because it tries to analyze `MANIFEST.in` without understanding the context of the current packaging setup. It does not even look into the actual sdist either. Because of this, it makes incorrect assumptions, makes false claims (like that some files are not included when in fact they are — via the `setuptool-scm` integration hook). It also produces harmful recommendations that mess up what's actually included and excluded if they are being followed without understanding the context. --- tox.ini | 2 -- 1 file changed, 2 deletions(-) diff --git a/tox.ini b/tox.ini index a98e11b9c..17d8f8247 100644 --- a/tox.ini +++ b/tox.ini @@ -154,7 +154,6 @@ usedevelop = false # don't install molecule itself in this env skip_install = true deps = - check-manifest >= 0.47 collective.checkdocs >= 0.2 build >= 0.7.0 pip >= 20.2.2 @@ -163,7 +162,6 @@ deps = setenv = commands = rm -rfv {toxinidir}/dist/ - python -m check_manifest python -m build \ --outdir {toxinidir}/dist/ \ {toxinidir}