From 430bd7b7c4d878bd52844d52c416dacf5a52ff9c Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 15 Nov 2021 11:28:46 -0800 Subject: [PATCH] Move source subdir (#24) * Use poetry-core as the build backend. poetry has been split into poetry and poetry-core. The core is a small subset of functionality that is what is necessary to build python packages. Changing from poetry to poetry-core should improve the `pip install antsibull` experience since all of poetry and its dependencis won't be needed. The update to a newer version is also needed to solve: > https://github.com/python-poetry/poetry/issues/2450 and allow us to put the source in a subdirectory * Move source of ansibulled to a subdir. pyre prefers to be given the directory which holds your python package as the source-directory rather than the directory which is your python package. However, if the directory given is the toplevel, pyre tends to get slow for me. (I believe since it scans temporary directories that I have accumulated [downloads of all those ansible collections...]). Putting the source code in its own subdirectory is the way to fix that. * Change the source dir path in github workflows too --- .github/workflows/antsibull-lint-tests.yml | 4 ++-- .github/workflows/build-css.yml | 2 +- .github/workflows/build-simple-docsite.yml | 6 +++--- lint-flake8.sh | 2 +- lint-mypy.sh | 2 +- lint-pylint.sh | 2 +- lint-pyre.sh | 2 +- pyproject.toml | 8 ++++---- {antsibull => src/antsibull}/__init__.py | 0 {antsibull => src/antsibull}/ansible_base.py | 0 {antsibull => src/antsibull}/app_context.py | 0 {antsibull => src/antsibull}/args.py | 0 {antsibull => src/antsibull}/augment_docs.py | 0 {antsibull => src/antsibull}/build_ansible_commands.py | 0 {antsibull => src/antsibull}/build_changelog.py | 0 {antsibull => src/antsibull}/build_collection.py | 0 {antsibull => src/antsibull}/changelog.py | 0 {antsibull => src/antsibull}/cli/__init__.py | 0 {antsibull => src/antsibull}/cli/antsibull_build.py | 0 {antsibull => src/antsibull}/cli/antsibull_docs.py | 0 {antsibull => src/antsibull}/cli/antsibull_lint.py | 0 {antsibull => src/antsibull}/cli/doc_commands/__init__.py | 0 .../antsibull}/cli/doc_commands/collection.py | 0 {antsibull => src/antsibull}/cli/doc_commands/current.py | 0 {antsibull => src/antsibull}/cli/doc_commands/devel.py | 0 {antsibull => src/antsibull}/cli/doc_commands/plugin.py | 0 .../antsibull}/cli/doc_commands/sphinx_init.py | 0 {antsibull => src/antsibull}/cli/doc_commands/stable.py | 0 {antsibull => src/antsibull}/collections.py | 0 {antsibull => src/antsibull}/compat.py | 0 {antsibull => src/antsibull}/config.py | 0 {antsibull => src/antsibull}/constants.py | 0 {antsibull => src/antsibull}/data/README_md.txt | 0 {antsibull => src/antsibull}/data/__init__.py | 0 {antsibull => src/antsibull}/data/ansible-readme.rst | 0 {antsibull => src/antsibull}/data/ansible-release_py.j2 | 0 {antsibull => src/antsibull}/data/ansible-setup_py.j2 | 0 .../antsibull}/data/ansible_2_10_routing.yml | 0 {antsibull => src/antsibull}/data/build-ansible.sh.j2 | 0 {antsibull => src/antsibull}/data/collection-enum.py | 0 {antsibull => src/antsibull}/data/collection-readme.j2 | 0 {antsibull => src/antsibull}/data/collection-setup_py.j2 | 0 {antsibull => src/antsibull}/data/debian/changelog.j2 | 0 {antsibull => src/antsibull}/data/debian/control.j2 | 0 {antsibull => src/antsibull}/data/debian/copyright | 0 {antsibull => src/antsibull}/data/debian/rules | 0 {antsibull => src/antsibull}/data/docsite/__init__.py | 0 .../antsibull}/data/docsite/list_of_collections.rst.j2 | 0 .../data/docsite/list_of_collections_by_namespace.rst.j2 | 0 .../antsibull}/data/docsite/list_of_plugins.rst.j2 | 0 .../antsibull}/data/docsite/macros/deprecates.rst.j2 | 0 .../antsibull}/data/docsite/plugin-deprecation.rst.j2 | 0 .../antsibull}/data/docsite/plugin-error.rst.j2 | 0 .../antsibull}/data/docsite/plugin-redirect.rst.j2 | 0 .../antsibull}/data/docsite/plugin-tombstone.rst.j2 | 0 {antsibull => src/antsibull}/data/docsite/plugin.rst.j2 | 0 .../antsibull}/data/docsite/plugins_by_collection.rst.j2 | 0 {antsibull => src/antsibull}/data/docsite/role.rst.j2 | 0 {antsibull => src/antsibull}/data/galaxy_yml.j2 | 0 {antsibull => src/antsibull}/data/gplv3.txt | 0 .../antsibull}/data/sphinx_init/_gitignore.j2 | 0 {antsibull => src/antsibull}/data/sphinx_init/build_sh.j2 | 0 {antsibull => src/antsibull}/data/sphinx_init/conf_py.j2 | 0 .../antsibull}/data/sphinx_init/requirements_txt.j2 | 0 .../antsibull}/data/sphinx_init/rst_index_rst.j2 | 0 {antsibull => src/antsibull}/dependency_files.py | 0 {antsibull => src/antsibull}/docs_parsing/__init__.py | 0 {antsibull => src/antsibull}/docs_parsing/ansible_doc.py | 0 .../antsibull}/docs_parsing/ansible_internal.py | 0 {antsibull => src/antsibull}/docs_parsing/fqcn.py | 0 {antsibull => src/antsibull}/docs_parsing/parsing.py | 0 {antsibull => src/antsibull}/docs_parsing/routing.py | 0 {antsibull => src/antsibull}/extra_docs.py | 0 {antsibull => src/antsibull}/filesystem.py | 0 {antsibull => src/antsibull}/galaxy.py | 0 {antsibull => src/antsibull}/hashing.py | 0 {antsibull => src/antsibull}/jinja2/__init__.py | 0 {antsibull => src/antsibull}/jinja2/environment.py | 0 {antsibull => src/antsibull}/jinja2/filters.py | 0 {antsibull => src/antsibull}/jinja2/tests.py | 0 {antsibull => src/antsibull}/lint_extra_docs.py | 0 {antsibull => src/antsibull}/logging.py | 0 {antsibull => src/antsibull}/new_ansible.py | 0 {antsibull => src/antsibull}/schemas/__init__.py | 0 {antsibull => src/antsibull}/schemas/ansible_doc.py | 0 {antsibull => src/antsibull}/schemas/config.py | 0 {antsibull => src/antsibull}/schemas/context.py | 0 {antsibull => src/antsibull}/schemas/docs/__init__.py | 0 {antsibull => src/antsibull}/schemas/docs/ansible_doc.py | 0 {antsibull => src/antsibull}/schemas/docs/base.py | 0 {antsibull => src/antsibull}/schemas/docs/callback.py | 0 {antsibull => src/antsibull}/schemas/docs/module.py | 0 {antsibull => src/antsibull}/schemas/docs/plugin.py | 0 {antsibull => src/antsibull}/schemas/docs/role.py | 0 {antsibull => src/antsibull}/schemas/validators.py | 0 {antsibull => src/antsibull}/tarball.py | 0 {antsibull => src/antsibull}/utils/__init__.py | 0 {antsibull => src/antsibull}/utils/collections.py | 0 {antsibull => src/antsibull}/utils/get_pkg_data.py | 0 {antsibull => src/antsibull}/utils/http.py | 0 {antsibull => src/antsibull}/utils/transformations.py | 0 {antsibull => src/antsibull}/vendored/__init__.py | 0 .../vendored/_argparse_booleanoptionalaction.py | 0 {antsibull => src/antsibull}/vendored/collections.py | 0 {antsibull => src/antsibull}/vendored/json_utils.py | 0 {antsibull => src/antsibull}/venv.py | 0 {antsibull => src/antsibull}/write_docs.py | 0 {antsibull => src/antsibull}/yaml.py | 0 .../sphinx_antsibull_ext}/__init__.py | 0 .../sphinx_antsibull_ext}/antsibull-minimal.css | 0 .../sphinx_antsibull_ext}/assets.py | 0 .../sphinx_antsibull_ext}/css/antsibull-minimal.scss | 0 .../sphinx_antsibull_ext}/css/browserslistrc | 0 .../sphinx_antsibull_ext}/css/build.sh | 0 .../sphinx_antsibull_ext}/css/cssnano.config.js | 0 test-pytest.sh | 2 +- 116 files changed, 15 insertions(+), 15 deletions(-) rename {antsibull => src/antsibull}/__init__.py (100%) rename {antsibull => src/antsibull}/ansible_base.py (100%) rename {antsibull => src/antsibull}/app_context.py (100%) rename {antsibull => src/antsibull}/args.py (100%) rename {antsibull => src/antsibull}/augment_docs.py (100%) rename {antsibull => src/antsibull}/build_ansible_commands.py (100%) rename {antsibull => src/antsibull}/build_changelog.py (100%) rename {antsibull => src/antsibull}/build_collection.py (100%) rename {antsibull => src/antsibull}/changelog.py (100%) rename {antsibull => src/antsibull}/cli/__init__.py (100%) rename {antsibull => src/antsibull}/cli/antsibull_build.py (100%) rename {antsibull => src/antsibull}/cli/antsibull_docs.py (100%) rename {antsibull => src/antsibull}/cli/antsibull_lint.py (100%) rename {antsibull => src/antsibull}/cli/doc_commands/__init__.py (100%) rename {antsibull => src/antsibull}/cli/doc_commands/collection.py (100%) rename {antsibull => src/antsibull}/cli/doc_commands/current.py (100%) rename {antsibull => src/antsibull}/cli/doc_commands/devel.py (100%) rename {antsibull => src/antsibull}/cli/doc_commands/plugin.py (100%) rename {antsibull => src/antsibull}/cli/doc_commands/sphinx_init.py (100%) rename {antsibull => src/antsibull}/cli/doc_commands/stable.py (100%) rename {antsibull => src/antsibull}/collections.py (100%) rename {antsibull => src/antsibull}/compat.py (100%) rename {antsibull => src/antsibull}/config.py (100%) rename {antsibull => src/antsibull}/constants.py (100%) rename {antsibull => src/antsibull}/data/README_md.txt (100%) rename {antsibull => src/antsibull}/data/__init__.py (100%) rename {antsibull => src/antsibull}/data/ansible-readme.rst (100%) rename {antsibull => src/antsibull}/data/ansible-release_py.j2 (100%) rename {antsibull => src/antsibull}/data/ansible-setup_py.j2 (100%) rename {antsibull => src/antsibull}/data/ansible_2_10_routing.yml (100%) rename {antsibull => src/antsibull}/data/build-ansible.sh.j2 (100%) rename {antsibull => src/antsibull}/data/collection-enum.py (100%) rename {antsibull => src/antsibull}/data/collection-readme.j2 (100%) rename {antsibull => src/antsibull}/data/collection-setup_py.j2 (100%) rename {antsibull => src/antsibull}/data/debian/changelog.j2 (100%) rename {antsibull => src/antsibull}/data/debian/control.j2 (100%) rename {antsibull => src/antsibull}/data/debian/copyright (100%) rename {antsibull => src/antsibull}/data/debian/rules (100%) rename {antsibull => src/antsibull}/data/docsite/__init__.py (100%) rename {antsibull => src/antsibull}/data/docsite/list_of_collections.rst.j2 (100%) rename {antsibull => src/antsibull}/data/docsite/list_of_collections_by_namespace.rst.j2 (100%) rename {antsibull => src/antsibull}/data/docsite/list_of_plugins.rst.j2 (100%) rename {antsibull => src/antsibull}/data/docsite/macros/deprecates.rst.j2 (100%) rename {antsibull => src/antsibull}/data/docsite/plugin-deprecation.rst.j2 (100%) rename {antsibull => src/antsibull}/data/docsite/plugin-error.rst.j2 (100%) rename {antsibull => src/antsibull}/data/docsite/plugin-redirect.rst.j2 (100%) rename {antsibull => src/antsibull}/data/docsite/plugin-tombstone.rst.j2 (100%) rename {antsibull => src/antsibull}/data/docsite/plugin.rst.j2 (100%) rename {antsibull => src/antsibull}/data/docsite/plugins_by_collection.rst.j2 (100%) rename {antsibull => src/antsibull}/data/docsite/role.rst.j2 (100%) rename {antsibull => src/antsibull}/data/galaxy_yml.j2 (100%) rename {antsibull => src/antsibull}/data/gplv3.txt (100%) rename {antsibull => src/antsibull}/data/sphinx_init/_gitignore.j2 (100%) rename {antsibull => src/antsibull}/data/sphinx_init/build_sh.j2 (100%) rename {antsibull => src/antsibull}/data/sphinx_init/conf_py.j2 (100%) rename {antsibull => src/antsibull}/data/sphinx_init/requirements_txt.j2 (100%) rename {antsibull => src/antsibull}/data/sphinx_init/rst_index_rst.j2 (100%) rename {antsibull => src/antsibull}/dependency_files.py (100%) rename {antsibull => src/antsibull}/docs_parsing/__init__.py (100%) rename {antsibull => src/antsibull}/docs_parsing/ansible_doc.py (100%) rename {antsibull => src/antsibull}/docs_parsing/ansible_internal.py (100%) rename {antsibull => src/antsibull}/docs_parsing/fqcn.py (100%) rename {antsibull => src/antsibull}/docs_parsing/parsing.py (100%) rename {antsibull => src/antsibull}/docs_parsing/routing.py (100%) rename {antsibull => src/antsibull}/extra_docs.py (100%) rename {antsibull => src/antsibull}/filesystem.py (100%) rename {antsibull => src/antsibull}/galaxy.py (100%) rename {antsibull => src/antsibull}/hashing.py (100%) rename {antsibull => src/antsibull}/jinja2/__init__.py (100%) rename {antsibull => src/antsibull}/jinja2/environment.py (100%) rename {antsibull => src/antsibull}/jinja2/filters.py (100%) rename {antsibull => src/antsibull}/jinja2/tests.py (100%) rename {antsibull => src/antsibull}/lint_extra_docs.py (100%) rename {antsibull => src/antsibull}/logging.py (100%) rename {antsibull => src/antsibull}/new_ansible.py (100%) rename {antsibull => src/antsibull}/schemas/__init__.py (100%) rename {antsibull => src/antsibull}/schemas/ansible_doc.py (100%) rename {antsibull => src/antsibull}/schemas/config.py (100%) rename {antsibull => src/antsibull}/schemas/context.py (100%) rename {antsibull => src/antsibull}/schemas/docs/__init__.py (100%) rename {antsibull => src/antsibull}/schemas/docs/ansible_doc.py (100%) rename {antsibull => src/antsibull}/schemas/docs/base.py (100%) rename {antsibull => src/antsibull}/schemas/docs/callback.py (100%) rename {antsibull => src/antsibull}/schemas/docs/module.py (100%) rename {antsibull => src/antsibull}/schemas/docs/plugin.py (100%) rename {antsibull => src/antsibull}/schemas/docs/role.py (100%) rename {antsibull => src/antsibull}/schemas/validators.py (100%) rename {antsibull => src/antsibull}/tarball.py (100%) rename {antsibull => src/antsibull}/utils/__init__.py (100%) rename {antsibull => src/antsibull}/utils/collections.py (100%) rename {antsibull => src/antsibull}/utils/get_pkg_data.py (100%) rename {antsibull => src/antsibull}/utils/http.py (100%) rename {antsibull => src/antsibull}/utils/transformations.py (100%) rename {antsibull => src/antsibull}/vendored/__init__.py (100%) rename {antsibull => src/antsibull}/vendored/_argparse_booleanoptionalaction.py (100%) rename {antsibull => src/antsibull}/vendored/collections.py (100%) rename {antsibull => src/antsibull}/vendored/json_utils.py (100%) rename {antsibull => src/antsibull}/venv.py (100%) rename {antsibull => src/antsibull}/write_docs.py (100%) rename {antsibull => src/antsibull}/yaml.py (100%) rename {sphinx_antsibull_ext => src/sphinx_antsibull_ext}/__init__.py (100%) rename {sphinx_antsibull_ext => src/sphinx_antsibull_ext}/antsibull-minimal.css (100%) rename {sphinx_antsibull_ext => src/sphinx_antsibull_ext}/assets.py (100%) rename {sphinx_antsibull_ext => src/sphinx_antsibull_ext}/css/antsibull-minimal.scss (100%) rename {sphinx_antsibull_ext => src/sphinx_antsibull_ext}/css/browserslistrc (100%) rename {sphinx_antsibull_ext => src/sphinx_antsibull_ext}/css/build.sh (100%) rename {sphinx_antsibull_ext => src/sphinx_antsibull_ext}/css/cssnano.config.js (100%) diff --git a/.github/workflows/antsibull-lint-tests.yml b/.github/workflows/antsibull-lint-tests.yml index 0f3658b1..e6072a8f 100644 --- a/.github/workflows/antsibull-lint-tests.yml +++ b/.github/workflows/antsibull-lint-tests.yml @@ -34,11 +34,11 @@ jobs: - name: antsibull-lint collection-docs run: | - coverage run -p --source antsibull -m antsibull.cli.antsibull_lint collection-docs community.general + coverage run -p --source src/antsibull -m antsibull.cli.antsibull_lint collection-docs community.general - name: antsibull-lint changelog-yaml run: | - coverage run -p --source antsibull -m antsibull.cli.antsibull_lint changelog-yaml community.general/changelogs/changelog.yaml + coverage run -p --source src/antsibull -m antsibull.cli.antsibull_lint changelog-yaml community.general/changelogs/changelog.yaml - name: Combine and upload coverage stats run: | diff --git a/.github/workflows/build-css.yml b/.github/workflows/build-css.yml index d70e44b6..2cb839b2 100644 --- a/.github/workflows/build-css.yml +++ b/.github/workflows/build-css.yml @@ -31,4 +31,4 @@ jobs: - name: Build CSS run: | ./build.sh - working-directory: ./sphinx_antsibull_ext/css + working-directory: ./src/sphinx_antsibull_ext/css diff --git a/.github/workflows/build-simple-docsite.yml b/.github/workflows/build-simple-docsite.yml index 97376683..da60d24e 100644 --- a/.github/workflows/build-simple-docsite.yml +++ b/.github/workflows/build-simple-docsite.yml @@ -29,12 +29,12 @@ jobs: - name: Use antsibull-docs sphinx-init run: | - coverage run -p --source antsibull -m antsibull.cli.antsibull_docs sphinx-init --use-current --lenient --dest-dir . + coverage run -p --source src/antsibull -m antsibull.cli.antsibull_docs sphinx-init --use-current --lenient --dest-dir . - name: Patch build.sh to supply code coverage run: | - sed -i build.sh -e 's/antsibull-docs /coverage run -p --source antsibull -m antsibull.cli.antsibull_docs /g' - sed -i build.sh -e 's/sphinx-build /coverage run -p --source antsibull --source sphinx_antsibull_ext -m sphinx.cmd.build /g' + sed -i build.sh -e 's!antsibull-docs !coverage run -p --source src/antsibull -m antsibull.cli.antsibull_docs !g' + sed -i build.sh -e 's!sphinx-build !coverage run -p --source src/antsibull --source src/sphinx_antsibull_ext -m sphinx.cmd.build !g' - name: Install dependencies run: | diff --git a/lint-flake8.sh b/lint-flake8.sh index d43d550e..6c202824 100755 --- a/lint-flake8.sh +++ b/lint-flake8.sh @@ -1,3 +1,3 @@ #!/bin/bash set -e -poetry run flake8 antsibull sphinx_antsibull_ext --count --max-complexity=10 --max-line-length=100 --statistics "$@" +poetry run flake8 src/antsibull src/sphinx_antsibull_ext --count --max-complexity=10 --max-line-length=100 --statistics "$@" diff --git a/lint-mypy.sh b/lint-mypy.sh index 14df6a29..07cbdbea 100755 --- a/lint-mypy.sh +++ b/lint-mypy.sh @@ -1,3 +1,3 @@ #!/bin/bash set -e -MYPYPATH=stubs/ poetry run mypy antsibull sphinx_antsibull_ext "$@" +MYPYPATH=stubs/ poetry run mypy src/antsibull sphinx_antsibull_ext "$@" diff --git a/lint-pylint.sh b/lint-pylint.sh index 9aa07a0f..b48f6598 100755 --- a/lint-pylint.sh +++ b/lint-pylint.sh @@ -1,3 +1,3 @@ #!/bin/bash set -e -poetry run pylint --rcfile .pylintrc.automated antsibull sphinx_antsibull_ext "$@" +poetry run pylint --rcfile .pylintrc.automated src/antsibull sphinx_antsibull_ext "$@" diff --git a/lint-pyre.sh b/lint-pyre.sh index f1d40c86..72417748 100755 --- a/lint-pyre.sh +++ b/lint-pyre.sh @@ -3,4 +3,4 @@ set -e PURELIB=$(poetry run python -c 'from distutils.sysconfig import get_python_lib;print(get_python_lib(0))') PLATLIB=$(poetry run python -c 'from distutils.sysconfig import get_python_lib;print(get_python_lib(1))') -poetry run pyre --source-directory antsibull --source-directory sphinx_antsibull_ext --search-path "$PURELIB" --search-path "$PLATLIB" --search-path stubs/ --search-path . "$@" +poetry run pyre --source-directory src --search-path "$PURELIB" --search-path "$PLATLIB" --search-path stubs/ "$@" diff --git a/pyproject.toml b/pyproject.toml index aada352e..c6f2e4dd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core>=1.0.7"] +build-backend = "poetry.core.masonry.api" [tool.poetry] name = "antsibull" @@ -11,8 +11,8 @@ license = "GPL-3.0-or-later" readme = "README.md" repository = "https://github.com/ansible-community/antsibull" packages = [ - { include = "antsibull" }, - { include = "sphinx_antsibull_ext" }, + { include = "antsibull", from="src" }, + { include = "sphinx_antsibull_ext", from="src" }, { include = "tests", format = "sdist" } ] classifiers = [ diff --git a/antsibull/__init__.py b/src/antsibull/__init__.py similarity index 100% rename from antsibull/__init__.py rename to src/antsibull/__init__.py diff --git a/antsibull/ansible_base.py b/src/antsibull/ansible_base.py similarity index 100% rename from antsibull/ansible_base.py rename to src/antsibull/ansible_base.py diff --git a/antsibull/app_context.py b/src/antsibull/app_context.py similarity index 100% rename from antsibull/app_context.py rename to src/antsibull/app_context.py diff --git a/antsibull/args.py b/src/antsibull/args.py similarity index 100% rename from antsibull/args.py rename to src/antsibull/args.py diff --git a/antsibull/augment_docs.py b/src/antsibull/augment_docs.py similarity index 100% rename from antsibull/augment_docs.py rename to src/antsibull/augment_docs.py diff --git a/antsibull/build_ansible_commands.py b/src/antsibull/build_ansible_commands.py similarity index 100% rename from antsibull/build_ansible_commands.py rename to src/antsibull/build_ansible_commands.py diff --git a/antsibull/build_changelog.py b/src/antsibull/build_changelog.py similarity index 100% rename from antsibull/build_changelog.py rename to src/antsibull/build_changelog.py diff --git a/antsibull/build_collection.py b/src/antsibull/build_collection.py similarity index 100% rename from antsibull/build_collection.py rename to src/antsibull/build_collection.py diff --git a/antsibull/changelog.py b/src/antsibull/changelog.py similarity index 100% rename from antsibull/changelog.py rename to src/antsibull/changelog.py diff --git a/antsibull/cli/__init__.py b/src/antsibull/cli/__init__.py similarity index 100% rename from antsibull/cli/__init__.py rename to src/antsibull/cli/__init__.py diff --git a/antsibull/cli/antsibull_build.py b/src/antsibull/cli/antsibull_build.py similarity index 100% rename from antsibull/cli/antsibull_build.py rename to src/antsibull/cli/antsibull_build.py diff --git a/antsibull/cli/antsibull_docs.py b/src/antsibull/cli/antsibull_docs.py similarity index 100% rename from antsibull/cli/antsibull_docs.py rename to src/antsibull/cli/antsibull_docs.py diff --git a/antsibull/cli/antsibull_lint.py b/src/antsibull/cli/antsibull_lint.py similarity index 100% rename from antsibull/cli/antsibull_lint.py rename to src/antsibull/cli/antsibull_lint.py diff --git a/antsibull/cli/doc_commands/__init__.py b/src/antsibull/cli/doc_commands/__init__.py similarity index 100% rename from antsibull/cli/doc_commands/__init__.py rename to src/antsibull/cli/doc_commands/__init__.py diff --git a/antsibull/cli/doc_commands/collection.py b/src/antsibull/cli/doc_commands/collection.py similarity index 100% rename from antsibull/cli/doc_commands/collection.py rename to src/antsibull/cli/doc_commands/collection.py diff --git a/antsibull/cli/doc_commands/current.py b/src/antsibull/cli/doc_commands/current.py similarity index 100% rename from antsibull/cli/doc_commands/current.py rename to src/antsibull/cli/doc_commands/current.py diff --git a/antsibull/cli/doc_commands/devel.py b/src/antsibull/cli/doc_commands/devel.py similarity index 100% rename from antsibull/cli/doc_commands/devel.py rename to src/antsibull/cli/doc_commands/devel.py diff --git a/antsibull/cli/doc_commands/plugin.py b/src/antsibull/cli/doc_commands/plugin.py similarity index 100% rename from antsibull/cli/doc_commands/plugin.py rename to src/antsibull/cli/doc_commands/plugin.py diff --git a/antsibull/cli/doc_commands/sphinx_init.py b/src/antsibull/cli/doc_commands/sphinx_init.py similarity index 100% rename from antsibull/cli/doc_commands/sphinx_init.py rename to src/antsibull/cli/doc_commands/sphinx_init.py diff --git a/antsibull/cli/doc_commands/stable.py b/src/antsibull/cli/doc_commands/stable.py similarity index 100% rename from antsibull/cli/doc_commands/stable.py rename to src/antsibull/cli/doc_commands/stable.py diff --git a/antsibull/collections.py b/src/antsibull/collections.py similarity index 100% rename from antsibull/collections.py rename to src/antsibull/collections.py diff --git a/antsibull/compat.py b/src/antsibull/compat.py similarity index 100% rename from antsibull/compat.py rename to src/antsibull/compat.py diff --git a/antsibull/config.py b/src/antsibull/config.py similarity index 100% rename from antsibull/config.py rename to src/antsibull/config.py diff --git a/antsibull/constants.py b/src/antsibull/constants.py similarity index 100% rename from antsibull/constants.py rename to src/antsibull/constants.py diff --git a/antsibull/data/README_md.txt b/src/antsibull/data/README_md.txt similarity index 100% rename from antsibull/data/README_md.txt rename to src/antsibull/data/README_md.txt diff --git a/antsibull/data/__init__.py b/src/antsibull/data/__init__.py similarity index 100% rename from antsibull/data/__init__.py rename to src/antsibull/data/__init__.py diff --git a/antsibull/data/ansible-readme.rst b/src/antsibull/data/ansible-readme.rst similarity index 100% rename from antsibull/data/ansible-readme.rst rename to src/antsibull/data/ansible-readme.rst diff --git a/antsibull/data/ansible-release_py.j2 b/src/antsibull/data/ansible-release_py.j2 similarity index 100% rename from antsibull/data/ansible-release_py.j2 rename to src/antsibull/data/ansible-release_py.j2 diff --git a/antsibull/data/ansible-setup_py.j2 b/src/antsibull/data/ansible-setup_py.j2 similarity index 100% rename from antsibull/data/ansible-setup_py.j2 rename to src/antsibull/data/ansible-setup_py.j2 diff --git a/antsibull/data/ansible_2_10_routing.yml b/src/antsibull/data/ansible_2_10_routing.yml similarity index 100% rename from antsibull/data/ansible_2_10_routing.yml rename to src/antsibull/data/ansible_2_10_routing.yml diff --git a/antsibull/data/build-ansible.sh.j2 b/src/antsibull/data/build-ansible.sh.j2 similarity index 100% rename from antsibull/data/build-ansible.sh.j2 rename to src/antsibull/data/build-ansible.sh.j2 diff --git a/antsibull/data/collection-enum.py b/src/antsibull/data/collection-enum.py similarity index 100% rename from antsibull/data/collection-enum.py rename to src/antsibull/data/collection-enum.py diff --git a/antsibull/data/collection-readme.j2 b/src/antsibull/data/collection-readme.j2 similarity index 100% rename from antsibull/data/collection-readme.j2 rename to src/antsibull/data/collection-readme.j2 diff --git a/antsibull/data/collection-setup_py.j2 b/src/antsibull/data/collection-setup_py.j2 similarity index 100% rename from antsibull/data/collection-setup_py.j2 rename to src/antsibull/data/collection-setup_py.j2 diff --git a/antsibull/data/debian/changelog.j2 b/src/antsibull/data/debian/changelog.j2 similarity index 100% rename from antsibull/data/debian/changelog.j2 rename to src/antsibull/data/debian/changelog.j2 diff --git a/antsibull/data/debian/control.j2 b/src/antsibull/data/debian/control.j2 similarity index 100% rename from antsibull/data/debian/control.j2 rename to src/antsibull/data/debian/control.j2 diff --git a/antsibull/data/debian/copyright b/src/antsibull/data/debian/copyright similarity index 100% rename from antsibull/data/debian/copyright rename to src/antsibull/data/debian/copyright diff --git a/antsibull/data/debian/rules b/src/antsibull/data/debian/rules similarity index 100% rename from antsibull/data/debian/rules rename to src/antsibull/data/debian/rules diff --git a/antsibull/data/docsite/__init__.py b/src/antsibull/data/docsite/__init__.py similarity index 100% rename from antsibull/data/docsite/__init__.py rename to src/antsibull/data/docsite/__init__.py diff --git a/antsibull/data/docsite/list_of_collections.rst.j2 b/src/antsibull/data/docsite/list_of_collections.rst.j2 similarity index 100% rename from antsibull/data/docsite/list_of_collections.rst.j2 rename to src/antsibull/data/docsite/list_of_collections.rst.j2 diff --git a/antsibull/data/docsite/list_of_collections_by_namespace.rst.j2 b/src/antsibull/data/docsite/list_of_collections_by_namespace.rst.j2 similarity index 100% rename from antsibull/data/docsite/list_of_collections_by_namespace.rst.j2 rename to src/antsibull/data/docsite/list_of_collections_by_namespace.rst.j2 diff --git a/antsibull/data/docsite/list_of_plugins.rst.j2 b/src/antsibull/data/docsite/list_of_plugins.rst.j2 similarity index 100% rename from antsibull/data/docsite/list_of_plugins.rst.j2 rename to src/antsibull/data/docsite/list_of_plugins.rst.j2 diff --git a/antsibull/data/docsite/macros/deprecates.rst.j2 b/src/antsibull/data/docsite/macros/deprecates.rst.j2 similarity index 100% rename from antsibull/data/docsite/macros/deprecates.rst.j2 rename to src/antsibull/data/docsite/macros/deprecates.rst.j2 diff --git a/antsibull/data/docsite/plugin-deprecation.rst.j2 b/src/antsibull/data/docsite/plugin-deprecation.rst.j2 similarity index 100% rename from antsibull/data/docsite/plugin-deprecation.rst.j2 rename to src/antsibull/data/docsite/plugin-deprecation.rst.j2 diff --git a/antsibull/data/docsite/plugin-error.rst.j2 b/src/antsibull/data/docsite/plugin-error.rst.j2 similarity index 100% rename from antsibull/data/docsite/plugin-error.rst.j2 rename to src/antsibull/data/docsite/plugin-error.rst.j2 diff --git a/antsibull/data/docsite/plugin-redirect.rst.j2 b/src/antsibull/data/docsite/plugin-redirect.rst.j2 similarity index 100% rename from antsibull/data/docsite/plugin-redirect.rst.j2 rename to src/antsibull/data/docsite/plugin-redirect.rst.j2 diff --git a/antsibull/data/docsite/plugin-tombstone.rst.j2 b/src/antsibull/data/docsite/plugin-tombstone.rst.j2 similarity index 100% rename from antsibull/data/docsite/plugin-tombstone.rst.j2 rename to src/antsibull/data/docsite/plugin-tombstone.rst.j2 diff --git a/antsibull/data/docsite/plugin.rst.j2 b/src/antsibull/data/docsite/plugin.rst.j2 similarity index 100% rename from antsibull/data/docsite/plugin.rst.j2 rename to src/antsibull/data/docsite/plugin.rst.j2 diff --git a/antsibull/data/docsite/plugins_by_collection.rst.j2 b/src/antsibull/data/docsite/plugins_by_collection.rst.j2 similarity index 100% rename from antsibull/data/docsite/plugins_by_collection.rst.j2 rename to src/antsibull/data/docsite/plugins_by_collection.rst.j2 diff --git a/antsibull/data/docsite/role.rst.j2 b/src/antsibull/data/docsite/role.rst.j2 similarity index 100% rename from antsibull/data/docsite/role.rst.j2 rename to src/antsibull/data/docsite/role.rst.j2 diff --git a/antsibull/data/galaxy_yml.j2 b/src/antsibull/data/galaxy_yml.j2 similarity index 100% rename from antsibull/data/galaxy_yml.j2 rename to src/antsibull/data/galaxy_yml.j2 diff --git a/antsibull/data/gplv3.txt b/src/antsibull/data/gplv3.txt similarity index 100% rename from antsibull/data/gplv3.txt rename to src/antsibull/data/gplv3.txt diff --git a/antsibull/data/sphinx_init/_gitignore.j2 b/src/antsibull/data/sphinx_init/_gitignore.j2 similarity index 100% rename from antsibull/data/sphinx_init/_gitignore.j2 rename to src/antsibull/data/sphinx_init/_gitignore.j2 diff --git a/antsibull/data/sphinx_init/build_sh.j2 b/src/antsibull/data/sphinx_init/build_sh.j2 similarity index 100% rename from antsibull/data/sphinx_init/build_sh.j2 rename to src/antsibull/data/sphinx_init/build_sh.j2 diff --git a/antsibull/data/sphinx_init/conf_py.j2 b/src/antsibull/data/sphinx_init/conf_py.j2 similarity index 100% rename from antsibull/data/sphinx_init/conf_py.j2 rename to src/antsibull/data/sphinx_init/conf_py.j2 diff --git a/antsibull/data/sphinx_init/requirements_txt.j2 b/src/antsibull/data/sphinx_init/requirements_txt.j2 similarity index 100% rename from antsibull/data/sphinx_init/requirements_txt.j2 rename to src/antsibull/data/sphinx_init/requirements_txt.j2 diff --git a/antsibull/data/sphinx_init/rst_index_rst.j2 b/src/antsibull/data/sphinx_init/rst_index_rst.j2 similarity index 100% rename from antsibull/data/sphinx_init/rst_index_rst.j2 rename to src/antsibull/data/sphinx_init/rst_index_rst.j2 diff --git a/antsibull/dependency_files.py b/src/antsibull/dependency_files.py similarity index 100% rename from antsibull/dependency_files.py rename to src/antsibull/dependency_files.py diff --git a/antsibull/docs_parsing/__init__.py b/src/antsibull/docs_parsing/__init__.py similarity index 100% rename from antsibull/docs_parsing/__init__.py rename to src/antsibull/docs_parsing/__init__.py diff --git a/antsibull/docs_parsing/ansible_doc.py b/src/antsibull/docs_parsing/ansible_doc.py similarity index 100% rename from antsibull/docs_parsing/ansible_doc.py rename to src/antsibull/docs_parsing/ansible_doc.py diff --git a/antsibull/docs_parsing/ansible_internal.py b/src/antsibull/docs_parsing/ansible_internal.py similarity index 100% rename from antsibull/docs_parsing/ansible_internal.py rename to src/antsibull/docs_parsing/ansible_internal.py diff --git a/antsibull/docs_parsing/fqcn.py b/src/antsibull/docs_parsing/fqcn.py similarity index 100% rename from antsibull/docs_parsing/fqcn.py rename to src/antsibull/docs_parsing/fqcn.py diff --git a/antsibull/docs_parsing/parsing.py b/src/antsibull/docs_parsing/parsing.py similarity index 100% rename from antsibull/docs_parsing/parsing.py rename to src/antsibull/docs_parsing/parsing.py diff --git a/antsibull/docs_parsing/routing.py b/src/antsibull/docs_parsing/routing.py similarity index 100% rename from antsibull/docs_parsing/routing.py rename to src/antsibull/docs_parsing/routing.py diff --git a/antsibull/extra_docs.py b/src/antsibull/extra_docs.py similarity index 100% rename from antsibull/extra_docs.py rename to src/antsibull/extra_docs.py diff --git a/antsibull/filesystem.py b/src/antsibull/filesystem.py similarity index 100% rename from antsibull/filesystem.py rename to src/antsibull/filesystem.py diff --git a/antsibull/galaxy.py b/src/antsibull/galaxy.py similarity index 100% rename from antsibull/galaxy.py rename to src/antsibull/galaxy.py diff --git a/antsibull/hashing.py b/src/antsibull/hashing.py similarity index 100% rename from antsibull/hashing.py rename to src/antsibull/hashing.py diff --git a/antsibull/jinja2/__init__.py b/src/antsibull/jinja2/__init__.py similarity index 100% rename from antsibull/jinja2/__init__.py rename to src/antsibull/jinja2/__init__.py diff --git a/antsibull/jinja2/environment.py b/src/antsibull/jinja2/environment.py similarity index 100% rename from antsibull/jinja2/environment.py rename to src/antsibull/jinja2/environment.py diff --git a/antsibull/jinja2/filters.py b/src/antsibull/jinja2/filters.py similarity index 100% rename from antsibull/jinja2/filters.py rename to src/antsibull/jinja2/filters.py diff --git a/antsibull/jinja2/tests.py b/src/antsibull/jinja2/tests.py similarity index 100% rename from antsibull/jinja2/tests.py rename to src/antsibull/jinja2/tests.py diff --git a/antsibull/lint_extra_docs.py b/src/antsibull/lint_extra_docs.py similarity index 100% rename from antsibull/lint_extra_docs.py rename to src/antsibull/lint_extra_docs.py diff --git a/antsibull/logging.py b/src/antsibull/logging.py similarity index 100% rename from antsibull/logging.py rename to src/antsibull/logging.py diff --git a/antsibull/new_ansible.py b/src/antsibull/new_ansible.py similarity index 100% rename from antsibull/new_ansible.py rename to src/antsibull/new_ansible.py diff --git a/antsibull/schemas/__init__.py b/src/antsibull/schemas/__init__.py similarity index 100% rename from antsibull/schemas/__init__.py rename to src/antsibull/schemas/__init__.py diff --git a/antsibull/schemas/ansible_doc.py b/src/antsibull/schemas/ansible_doc.py similarity index 100% rename from antsibull/schemas/ansible_doc.py rename to src/antsibull/schemas/ansible_doc.py diff --git a/antsibull/schemas/config.py b/src/antsibull/schemas/config.py similarity index 100% rename from antsibull/schemas/config.py rename to src/antsibull/schemas/config.py diff --git a/antsibull/schemas/context.py b/src/antsibull/schemas/context.py similarity index 100% rename from antsibull/schemas/context.py rename to src/antsibull/schemas/context.py diff --git a/antsibull/schemas/docs/__init__.py b/src/antsibull/schemas/docs/__init__.py similarity index 100% rename from antsibull/schemas/docs/__init__.py rename to src/antsibull/schemas/docs/__init__.py diff --git a/antsibull/schemas/docs/ansible_doc.py b/src/antsibull/schemas/docs/ansible_doc.py similarity index 100% rename from antsibull/schemas/docs/ansible_doc.py rename to src/antsibull/schemas/docs/ansible_doc.py diff --git a/antsibull/schemas/docs/base.py b/src/antsibull/schemas/docs/base.py similarity index 100% rename from antsibull/schemas/docs/base.py rename to src/antsibull/schemas/docs/base.py diff --git a/antsibull/schemas/docs/callback.py b/src/antsibull/schemas/docs/callback.py similarity index 100% rename from antsibull/schemas/docs/callback.py rename to src/antsibull/schemas/docs/callback.py diff --git a/antsibull/schemas/docs/module.py b/src/antsibull/schemas/docs/module.py similarity index 100% rename from antsibull/schemas/docs/module.py rename to src/antsibull/schemas/docs/module.py diff --git a/antsibull/schemas/docs/plugin.py b/src/antsibull/schemas/docs/plugin.py similarity index 100% rename from antsibull/schemas/docs/plugin.py rename to src/antsibull/schemas/docs/plugin.py diff --git a/antsibull/schemas/docs/role.py b/src/antsibull/schemas/docs/role.py similarity index 100% rename from antsibull/schemas/docs/role.py rename to src/antsibull/schemas/docs/role.py diff --git a/antsibull/schemas/validators.py b/src/antsibull/schemas/validators.py similarity index 100% rename from antsibull/schemas/validators.py rename to src/antsibull/schemas/validators.py diff --git a/antsibull/tarball.py b/src/antsibull/tarball.py similarity index 100% rename from antsibull/tarball.py rename to src/antsibull/tarball.py diff --git a/antsibull/utils/__init__.py b/src/antsibull/utils/__init__.py similarity index 100% rename from antsibull/utils/__init__.py rename to src/antsibull/utils/__init__.py diff --git a/antsibull/utils/collections.py b/src/antsibull/utils/collections.py similarity index 100% rename from antsibull/utils/collections.py rename to src/antsibull/utils/collections.py diff --git a/antsibull/utils/get_pkg_data.py b/src/antsibull/utils/get_pkg_data.py similarity index 100% rename from antsibull/utils/get_pkg_data.py rename to src/antsibull/utils/get_pkg_data.py diff --git a/antsibull/utils/http.py b/src/antsibull/utils/http.py similarity index 100% rename from antsibull/utils/http.py rename to src/antsibull/utils/http.py diff --git a/antsibull/utils/transformations.py b/src/antsibull/utils/transformations.py similarity index 100% rename from antsibull/utils/transformations.py rename to src/antsibull/utils/transformations.py diff --git a/antsibull/vendored/__init__.py b/src/antsibull/vendored/__init__.py similarity index 100% rename from antsibull/vendored/__init__.py rename to src/antsibull/vendored/__init__.py diff --git a/antsibull/vendored/_argparse_booleanoptionalaction.py b/src/antsibull/vendored/_argparse_booleanoptionalaction.py similarity index 100% rename from antsibull/vendored/_argparse_booleanoptionalaction.py rename to src/antsibull/vendored/_argparse_booleanoptionalaction.py diff --git a/antsibull/vendored/collections.py b/src/antsibull/vendored/collections.py similarity index 100% rename from antsibull/vendored/collections.py rename to src/antsibull/vendored/collections.py diff --git a/antsibull/vendored/json_utils.py b/src/antsibull/vendored/json_utils.py similarity index 100% rename from antsibull/vendored/json_utils.py rename to src/antsibull/vendored/json_utils.py diff --git a/antsibull/venv.py b/src/antsibull/venv.py similarity index 100% rename from antsibull/venv.py rename to src/antsibull/venv.py diff --git a/antsibull/write_docs.py b/src/antsibull/write_docs.py similarity index 100% rename from antsibull/write_docs.py rename to src/antsibull/write_docs.py diff --git a/antsibull/yaml.py b/src/antsibull/yaml.py similarity index 100% rename from antsibull/yaml.py rename to src/antsibull/yaml.py diff --git a/sphinx_antsibull_ext/__init__.py b/src/sphinx_antsibull_ext/__init__.py similarity index 100% rename from sphinx_antsibull_ext/__init__.py rename to src/sphinx_antsibull_ext/__init__.py diff --git a/sphinx_antsibull_ext/antsibull-minimal.css b/src/sphinx_antsibull_ext/antsibull-minimal.css similarity index 100% rename from sphinx_antsibull_ext/antsibull-minimal.css rename to src/sphinx_antsibull_ext/antsibull-minimal.css diff --git a/sphinx_antsibull_ext/assets.py b/src/sphinx_antsibull_ext/assets.py similarity index 100% rename from sphinx_antsibull_ext/assets.py rename to src/sphinx_antsibull_ext/assets.py diff --git a/sphinx_antsibull_ext/css/antsibull-minimal.scss b/src/sphinx_antsibull_ext/css/antsibull-minimal.scss similarity index 100% rename from sphinx_antsibull_ext/css/antsibull-minimal.scss rename to src/sphinx_antsibull_ext/css/antsibull-minimal.scss diff --git a/sphinx_antsibull_ext/css/browserslistrc b/src/sphinx_antsibull_ext/css/browserslistrc similarity index 100% rename from sphinx_antsibull_ext/css/browserslistrc rename to src/sphinx_antsibull_ext/css/browserslistrc diff --git a/sphinx_antsibull_ext/css/build.sh b/src/sphinx_antsibull_ext/css/build.sh similarity index 100% rename from sphinx_antsibull_ext/css/build.sh rename to src/sphinx_antsibull_ext/css/build.sh diff --git a/sphinx_antsibull_ext/css/cssnano.config.js b/src/sphinx_antsibull_ext/css/cssnano.config.js similarity index 100% rename from sphinx_antsibull_ext/css/cssnano.config.js rename to src/sphinx_antsibull_ext/css/cssnano.config.js diff --git a/test-pytest.sh b/test-pytest.sh index 4b52040d..882cab9f 100755 --- a/test-pytest.sh +++ b/test-pytest.sh @@ -1,4 +1,4 @@ #!/bin/sh set -e -poetry run python -W 'ignore:"@coroutine" decorator is deprecated::asynctest.case' \ +PYTHONPATH=src poetry run python -W 'ignore:"@coroutine" decorator is deprecated::asynctest.case' \ -m pytest --cov-branch --cov=antsibull --cov=sphinx_antsibull_ext --cov-report term-missing -vv tests "$@"