Skip to content

Commit 8e0f7d3

Browse files
nicoddemusnicoddemus
authored
Merge pull request #2051 from nicoddemus/check-manifest
Check manifest
2 parents fc304b8 + aaa547e commit 8e0f7d3

7 files changed

Lines changed: 18 additions & 46 deletions

File tree

‎CONTRIBUTING.rst‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,10 @@ but here is a simple overview:
199199
You need to have Python 2.7 and 3.5 available in your system. Now
200200
running tests is as simple as issuing this command::
201201

202-
$ python3 runtox.py -e linting,py27,py35
202+
$ tox -e linting,py27,py35
203203

204204
This command will run tests via the "tox" tool against Python 2.7 and 3.5
205-
and also perform "lint" coding-style checks. ``runtox.py`` is
206-
a thin wrapper around ``tox`` which installs from a development package
207-
index where newer (not yet released to PyPI) versions of dependencies
208-
(especially ``py``) might be present.
205+
and also perform "lint" coding-style checks.
209206

210207
#. You can now edit your local working copy.
211208

@@ -214,11 +211,11 @@ but here is a simple overview:
214211
To run tests on Python 2.7 and pass options to pytest (e.g. enter pdb on
215212
failure) to pytest you can do::
216213

217-
$ python3 runtox.py -e py27 -- --pdb
214+
$ tox -e py27 -- --pdb
218215

219216
Or to only run tests in a particular test module on Python 3.5::
220217

221-
$ python3 runtox.py -e py35 -- testing/test_config.py
218+
$ tox -e py35 -- testing/test_config.py
222219

223220
#. Commit and push once your tests pass and you are happy with your change(s)::
224221

‎MANIFEST.in‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,23 @@ include setup.py
1111

1212
include .coveragerc
1313

14-
include plugin-test.sh
15-
include requirements-docs.txt
16-
include runtox.py
17-
1814
recursive-include bench *.py
1915
recursive-include extra *.py
2016

2117
graft testing
2218
graft doc
19+
prune doc/en/_build
2320

2421
exclude _pytest/impl
2522

2623
graft _pytest/vendored_packages
2724

2825
recursive-exclude * *.pyc *.pyo
26+
recursive-exclude testing/.hypothesis *
27+
recursive-exclude testing/freeze/~ *
28+
recursive-exclude testing/freeze/build *
29+
recursive-exclude testing/freeze/dist *
2930

30-
exclude appveyor/install.ps1
3131
exclude appveyor.yml
32-
exclude appveyor
32+
exclude .travis.yml
33+
prune .github

‎plugin-test.sh‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎requirements-docs.txt‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎runtox.py‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎setup.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def main():
7272
entry_points={'console_scripts':
7373
['pytest=pytest:main', 'py.test=pytest:main']},
7474
classifiers=classifiers,
75+
keywords="test unittest",
7576
cmdclass={'test': PyTest},
7677
# the following should be enabled for release
7778
install_requires=install_requires,

‎tox.ini‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,13 @@ commands= pytest --genscript=pytest1
4747

4848
[testenv:linting]
4949
basepython = python2.7
50-
deps = flake8
50+
deps =
51+
flake8
5152
restructuredtext_lint
52-
commands = flake8 pytest.py _pytest testing
53+
check-manifest
54+
commands =
55+
check-manifest
56+
flake8 pytest.py _pytest testing
5357
rst-lint CHANGELOG.rst HOWTORELEASE.rst
5458

5559
[testenv:py27-xdist]

0 commit comments

Comments
 (0)