From 731c35fcabef1e145e8049e1bf565a7c18ca328d Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 14 Jun 2017 07:43:21 -0400 Subject: [PATCH] Remove MANIFEST.in and related lint check Because setuptools_scm already includes all version-controlled files in an sdist, we don't need to maintain a MANIFEST.in file and anymore See pytest-dev/pytest-xdist#161 --- MANIFEST.in | 39 --------------------------------------- scripts/check-manifest.py | 20 -------------------- tox.ini | 2 -- 3 files changed, 61 deletions(-) delete mode 100644 MANIFEST.in delete mode 100644 scripts/check-manifest.py diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index abf57fece..000000000 --- a/MANIFEST.in +++ /dev/null @@ -1,39 +0,0 @@ -include CHANGELOG.rst -include LICENSE -include AUTHORS -include pyproject.toml - -include README.rst -include CONTRIBUTING.rst -include HOWTORELEASE.rst - -include tox.ini -include setup.py - -recursive-include changelog * -recursive-include scripts *.py -recursive-include scripts *.bat - -include .coveragerc - -recursive-include bench *.py -recursive-include extra *.py - -graft testing -graft doc -prune doc/en/_build -graft tasks - -exclude _pytest/impl - -graft _pytest/vendored_packages - -recursive-exclude * *.pyc *.pyo -recursive-exclude testing/.hypothesis * -recursive-exclude testing/freeze/~ * -recursive-exclude testing/freeze/build * -recursive-exclude testing/freeze/dist * - -exclude appveyor.yml -exclude .travis.yml -prune .github diff --git a/scripts/check-manifest.py b/scripts/check-manifest.py deleted file mode 100644 index de1357685..000000000 --- a/scripts/check-manifest.py +++ /dev/null @@ -1,20 +0,0 @@ -""" -Script used by tox.ini to check the manifest file if we are under version control, or skip the -check altogether if not. - -"check-manifest" will needs a vcs to work, which is not available when testing the package -instead of the source code (with ``devpi test`` for example). -""" - -from __future__ import print_function - -import os -import subprocess -import sys -from check_manifest import main - -if os.path.isdir('.git'): - sys.exit(main()) -else: - print('No .git directory found, skipping checking the manifest file') - sys.exit(0) diff --git a/tox.ini b/tox.ini index b73deca7d..d8b27300f 100644 --- a/tox.ini +++ b/tox.ini @@ -57,9 +57,7 @@ deps = # pygments required by rst-lint pygments restructuredtext_lint - check-manifest commands = - {envpython} scripts/check-manifest.py flake8 pytest.py _pytest testing {envpython} scripts/check-rst.py