diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e381121a7..9a59e5235 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,6 @@ jobs: - testenv: vulture - testenv: misc - testenv: pyroma - - testenv: check-manifest - testenv: eslint - testenv: shellcheck args: "-f gcc" # For problem matchers diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc index 75d663a8d..39aa575c4 100644 --- a/doc/contributing.asciidoc +++ b/doc/contributing.asciidoc @@ -121,8 +121,6 @@ Currently, the following tox environments are available: * `pyroma`: Check packaging practices with https://pypi.python.org/pypi/pyroma/[pyroma]. * `eslint`: Run https://eslint.org/[ESLint] javascript checker. -* `check-manifest`: Check MANIFEST.in completeness with - https://github.com/mgedmin/check-manifest[check-manifest]. * `mkvenv`: Bootstrap a virtualenv for testing. * `misc`: Run `scripts/misc_checks.py` to check for: - untracked git files diff --git a/misc/requirements/requirements-check-manifest.txt b/misc/requirements/requirements-check-manifest.txt deleted file mode 100644 index e27f7bc1c..000000000 --- a/misc/requirements/requirements-check-manifest.txt +++ /dev/null @@ -1,9 +0,0 @@ -# This file is automatically generated by scripts/dev/recompile_requirements.py - -build==1.2.2.post1 -check-manifest==0.50 -importlib_metadata==8.7.0 -packaging==25.0 -pyproject_hooks==1.2.0 -tomli==2.2.1 -zipp==3.23.0 diff --git a/misc/requirements/requirements-check-manifest.txt-raw b/misc/requirements/requirements-check-manifest.txt-raw deleted file mode 100644 index dcc0efe13..000000000 --- a/misc/requirements/requirements-check-manifest.txt-raw +++ /dev/null @@ -1 +0,0 @@ -check-manifest diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt index f191c15a1..36dbb7760 100644 --- a/misc/requirements/requirements-pyroma.txt +++ b/misc/requirements/requirements-pyroma.txt @@ -3,6 +3,7 @@ build==1.2.2.post1 certifi==2025.6.15 charset-normalizer==3.4.2 +check-manifest==0.50 docutils==0.21.2 idna==3.10 importlib_metadata==8.7.0 diff --git a/misc/requirements/requirements-pyroma.txt-raw b/misc/requirements/requirements-pyroma.txt-raw index 5ddfb659c..4ee4d7a94 100644 --- a/misc/requirements/requirements-pyroma.txt-raw +++ b/misc/requirements/requirements-pyroma.txt-raw @@ -1 +1,2 @@ pyroma +check-manifest diff --git a/pyproject.toml b/pyproject.toml index b0f076532..a6e22c411 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,12 @@ [build-system] requires = ["setuptools>=42"] build-backend = "setuptools.build_meta" + +[tool.check-manifest] +ignore = [ + "qutebrowser/git-commit-id", + "qutebrowser/html/doc", + "qutebrowser/html/doc/*", + "qutebrowser/html/doc/img/cheatsheet-*.png", + "*/__pycache__", +] diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py index dfdb0a853..2f997b326 100755 --- a/scripts/mkvenv.py +++ b/scripts/mkvenv.py @@ -453,7 +453,6 @@ def install_dev_requirements(venv_dir: pathlib.Path) -> None: utils.print_title("Installing dev dependencies") pip_install(venv_dir, '-r', str(requirements_file('dev')), - '-r', str(requirements_file('check-manifest')), '-r', str(requirements_file('flake8')), '-r', str(requirements_file('mypy')), '-r', str(requirements_file('pyroma')), diff --git a/tox.ini b/tox.ini index 1432875d8..db9cf563d 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py39-pyqt515-cov,mypy-pyqt5,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint,yamllint,actionlint +envlist = py39-pyqt515-cov,mypy-pyqt5,misc,vulture,flake8,pylint,pyroma,eslint,yamllint,actionlint distshare = {toxworkdir} skipsdist = true minversion = 3.20 @@ -169,14 +169,6 @@ deps = commands = {envdir}/bin/pyroma -n 10 . -[testenv:check-manifest] -basepython = {env:PYTHON:python3} -passenv = -deps = - -r{toxinidir}/misc/requirements/requirements-check-manifest.txt -commands = - {envdir}/bin/check-manifest --ignore 'qutebrowser/git-commit-id,qutebrowser/html/doc,qutebrowser/html/doc/*,qutebrowser/html/doc/img/cheatsheet-*.png,*/__pycache__' - [testenv:docs] basepython = {env:PYTHON:python3} passenv =