Skip to content

Commit

Permalink
More packaging fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ssbarnea committed Nov 25, 2021
1 parent c0274bb commit 9c14194
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
prune asset
prune .github
global-exclude .mypy_cache
include *.md
include *.py
include *.txt
Expand Down Expand Up @@ -31,7 +33,5 @@ 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 *.*
15 changes: 8 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ requires =
pip >= 20.2.4

[testenv]
usedevelop = True
# usedevelop fails due to https://github.com/tox-dev/tox/issues/2197
usedevelop = False

# do not put * in passenv as it may break builds do to reduced isolation
passenv =
CI
Expand All @@ -45,6 +47,7 @@ setenv =
PYTHONUNBUFFERED=1
_EXTRAS=-l --cov=molecule --no-cov-on-fail --cov-report xml:{envlogdir}/coverage.xml --html={envlogdir}/reports.html --self-contained-html
deps =
-e .
devel: git+https://github.com/ansible/ansible#egg=ansible-core
# pytest-molecule not used but we want to check that it does not conflict
devel: git+https://github.com/ansible-community/pytest-molecule#egg=pytest-molecule
Expand Down Expand Up @@ -155,20 +158,18 @@ usedevelop = false
# don't install molecule itself in this env
skip_install = true
deps =
check-manifest
check-manifest >= 0.47
collective.checkdocs >= 0.2
pep517 >= 0.8.2
build >= 0.7.0
pip >= 20.2.2
toml >= 0.10.1
twine >= 3.2.0 # pyup: ignore
setenv =
commands =
rm -rfv {toxinidir}/dist/
python -m check_manifest
python -m pep517.build \
--source \
--binary \
--out-dir {toxinidir}/dist/ \
python -m build \
--outdir {toxinidir}/dist/ \
{toxinidir}
# metadata validation
sh -c "python -m twine check {toxinidir}/dist/*"
Expand Down

0 comments on commit 9c14194

Please sign in to comment.