Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move source subdir #24

Merged
merged 3 commits into from
Nov 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/antsibull-lint-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-css.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
- name: Build CSS
run: |
./build.sh
working-directory: ./sphinx_antsibull_ext/css
working-directory: ./src/sphinx_antsibull_ext/css
6 changes: 3 additions & 3 deletions .github/workflows/build-simple-docsite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion lint-flake8.sh
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion lint-mypy.sh
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion lint-pylint.sh
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion lint-pyre.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/ "$@"
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 = [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion test-pytest.sh
Original file line number Diff line number Diff line change
@@ -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 "$@"