Fix more issues with setuptools externally depending on six #190
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Puts the current six checkout ahead of the PYTHONPATH for tests, else tests end up running six code installed in the tox environment. See: benjaminp#182
Technically, six is not installed yet when running `setup.py`. We could end up importing six from somewhere else on `sys.path`. Fixes: benjaminp#188
benjaminp
reviewed
Apr 12, 2017
| @@ -6,6 +6,8 @@ indexserver= | |||
|
|
|||
| [testenv] | |||
| deps= pytest | |||
| setenv= | |||
| PYTHONPATH=. | |||
There was a problem hiding this comment.
Please add a comment about why this is here.
| @@ -484,6 +485,7 @@ class Module_six_moves_urllib(types.ModuleType): | |||
| def __dir__(self): | |||
| return ['parse', 'error', 'request', 'response', 'robotparser'] | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
Please remove these superfluous whitespace changes.
|
I'm assuming we don't need this, since the setuptools devendorization was abandoned. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In tox. make sure we're running our tests with the checked out six, not some six installed in the virtualenv (Tests no longer test local behavior #182).
In
setup.py, don't import six to get the version number (setup.py imports six to get version, sometimes gets version of six used by setuptools #188).Also, fix some flake8 complains in tox.