From b0048339fa40340fc8fceef3f24602c66747fda8 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Tue, 13 Aug 2024 09:23:14 +0200 Subject: [PATCH] Fix MANIFEST.in (#1222) --- .github/workflows/tests.yml | 24 ++++++++++++------------ .meta.toml | 4 +++- MANIFEST.in | 1 + setup.cfg | 1 + tox.ini | 1 + 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bb945227c3..936f164562 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,25 +22,25 @@ jobs: - ["macos", "macos-latest"] config: # [Python version, tox env] - - ["3.9", "release-check"] - - ["3.9", "lint"] + - ["3.11", "release-check"] + - ["3.11", "lint"] - ["3.8", "py38"] - ["3.9", "py39"] - ["3.10", "py310"] - ["3.11", "py311"] - ["3.12", "py312"] - ["3.13", "py313"] - - ["3.9", "docs"] - - ["3.9", "coverage"] + - ["3.11", "docs"] + - ["3.11", "coverage"] exclude: - - { os: ["windows", "windows-latest"], config: ["3.9", "release-check"] } - - { os: ["windows", "windows-latest"], config: ["3.9", "lint"] } - - { os: ["windows", "windows-latest"], config: ["3.9", "docs"] } - - { os: ["windows", "windows-latest"], config: ["3.9", "coverage"] } - - { os: ["macos", "macos-latest"], config: ["3.9", "release-check"] } - - { os: ["macos", "macos-latest"], config: ["3.9", "lint"] } - - { os: ["macos", "macos-latest"], config: ["3.9", "docs"] } - - { os: ["macos", "macos-latest"], config: ["3.9", "coverage"] } + - { os: ["windows", "windows-latest"], config: ["3.11", "release-check"] } + - { os: ["windows", "windows-latest"], config: ["3.11", "lint"] } + - { os: ["windows", "windows-latest"], config: ["3.11", "docs"] } + - { os: ["windows", "windows-latest"], config: ["3.11", "coverage"] } + - { os: ["macos", "macos-latest"], config: ["3.11", "release-check"] } + - { os: ["macos", "macos-latest"], config: ["3.11", "lint"] } + - { os: ["macos", "macos-latest"], config: ["3.11", "docs"] } + - { os: ["macos", "macos-latest"], config: ["3.11", "coverage"] } runs-on: ${{ matrix.os[1] }} if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name diff --git a/.meta.toml b/.meta.toml index ef6de0de65..a3f5db2b67 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/zope-product [meta] template = "zope-product" -commit-id = "6cd77955" +commit-id = "994c74d7" [python] with-pypy = false @@ -100,6 +100,7 @@ additional-rules = [ "recursive-include docs *.jpg", "recursive-include docs *.png", "recursive-include docs *.po", + "recursive-include docs *.svg", "recursive-include docs *.tgz", "recursive-include src *.css", "recursive-include src *.dtml", @@ -140,6 +141,7 @@ additional-ignores = [ "docs/_build/html/_sources/zopebook/includes/*", "docs/_build/html/_static/*", "docs/_build/html/_static/css/*", + "docs/_build/html/_static/css/*/*", "docs/_build/html/_static/scripts/*", "docs/_build/html/_static/styles/*", ] diff --git a/MANIFEST.in b/MANIFEST.in index 8d9d6e273c..3a3a7e9b98 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -22,6 +22,7 @@ recursive-include docs *.css recursive-include docs *.jpg recursive-include docs *.png recursive-include docs *.po +recursive-include docs *.svg recursive-include docs *.tgz recursive-include src *.css recursive-include src *.dtml diff --git a/setup.cfg b/setup.cfg index 90aaceee4b..5cc06c455a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,6 +22,7 @@ ignore = docs/_build/html/_sources/zopebook/includes/* docs/_build/html/_static/* docs/_build/html/_static/css/* + docs/_build/html/_static/css/*/* docs/_build/html/_static/scripts/* docs/_build/html/_static/styles/* ignore-bad-ideas = diff --git a/tox.ini b/tox.ini index f2e188c03e..9540c355f0 100644 --- a/tox.ini +++ b/tox.ini @@ -71,6 +71,7 @@ deps = commands = autopep8 --verbose --in-place --recursive --aggressive --aggressive {toxinidir}/src setup.py docformatter --in-place --recursive {toxinidir}/src setup.py + [testenv:release-check] description = ensure that the distribution is ready to release basepython = python3