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

Check manifest #2051

Merged
merged 3 commits into from
Nov 11, 2016
Merged

Check manifest #2051

merged 3 commits into from
Nov 11, 2016

Conversation

nicoddemus
Copy link
Member

Uses check-manifest to ensure our MANIFEST.in is in top-shape.

@hpk42, I removed some scripts from the root which don't seem to be used anymore, would love if you can take a quick look and give your opinion.

@The-Compiler if you could take a look as well it would be super.

Fixes #1907

@coveralls
Copy link

Coverage Status

Coverage remained the same at 92.79% when pulling 26b1519 on nicoddemus:check-manifest into fc304b8 on pytest-dev:master.

recursive-include bench *.py
recursive-include extra *.py

graft testing
graft doc
prune doc/en/_build

exclude _pytest/impl

graft _pytest/vendored_packages

recursive-exclude * *.pyc *.pyo
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about the recursive-excludes added in https://github.com/pytest-dev/pytest/pull/1901/files#diff-97c91a104c431d0c365565d3ac03ac13R24 - should we add them here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh good catch, thanks! Updated.

@hpk42
Copy link
Contributor

hpk42 commented Nov 10, 2016

looks good to me to remove the old scripts. We are missing an easy way to test a new pytest release against released versions of some plugins, don't we? devpi test X for packages coming from pypi doesn't work, only for packages uploaded to pypi indexes. that should change i guess because we could then run tests by a series of "devpi test X" while running from an index which contains the to-be-released version of pytest.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 92.79% when pulling aaa547e on nicoddemus:check-manifest into fc304b8 on pytest-dev:master.

Copy link
Member

@RonnyPfannschmidt RonnyPfannschmidt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well done - i like the alterations

@nicoddemus
Copy link
Member Author

That should change i guess because we could then run tests by a series of "devpi test X" while running from an index which contains the to-be-released version of pytest.

That sounds neat. I've been using devpi-cloud-tester for some time to test releases, it would be simple to just add a bunch of selected pytest plugins to test them together with releases.

devpi has a --index option, but I guess that won't solve this because we need to tell devpi to test the package from PyPI, but get the dependencies from the index (when possible) and fall back to PyPI for the others as it usually does anyway.

@nicoddemus nicoddemus merged commit 8e0f7d3 into pytest-dev:master Nov 11, 2016
@nicoddemus nicoddemus deleted the check-manifest branch November 11, 2016 00:58
@hpk42
Copy link
Contributor

hpk42 commented Nov 11, 2016

there is one prooblem with this PR: the "check-manifest" call depends on version control and "devpi test" only installs the packages and does not have .hg/.git etc. directories. so linting fails with "devpi test". It seems check-manifest has no way to go without VCS. What do we do?

@nicoddemus
Copy link
Member Author

Oh you're right. Hmm how about moving the command to a separate env, manifest, which is not listed in tox's env-list but is called explicitly by one of the CI services (say Travis)? This way it won't get executed by devpi test, but will run continuously on CI.

@hpk42
Copy link
Contributor

hpk42 commented Nov 11, 2016

On Fri, Nov 11, 2016 at 07:08 -0800, Bruno Oliveira wrote:

Oh you're right. Hmm how about moving the command to a separate env, manifest, which is not listed in tox's env-list but is called explicitly by one of the CI services (say Travis)? This way it won't get executed by devpi test, but will run continuously on CI.

probably works, feels a bit like a workaround. A more direct workaround might be to call a script a script which calls check-manifest only if there is a .git dir and otherwise prints a "no .git directory found, skipping checking the manifest file" or so.

@nicoddemus
Copy link
Member Author

I like your plan better. 😁

I will open a PR later.

nicoddemus added a commit to nicoddemus/pytest that referenced this pull request Nov 11, 2016
nicoddemus added a commit to nicoddemus/pytest that referenced this pull request Nov 11, 2016
nicoddemus added a commit to nicoddemus/pytest that referenced this pull request Nov 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants