Revert labels and dependencies #1161
Merged
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
This reverts commit 7213271. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This reverts commit d209ded. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
…uirement" This reverts commit 81a32a2. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Leave the pinned versions in requirements.txt alone, as there's an incompatibility between PyInstaller and requests 2.5.2 and 2.5.3, and by extension with docker-py 1.1.0. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
aanand
force-pushed
the
revert-labels-and-dependencies
branch
from
bdee2f9 to
1c14fc0
Compare
|
I am curious, have you tried with https://pypi.python.org/pypi/requests/2.6.0 ? It might be easier to use a newer version instead of reverting? Seems like there was a change related to the problem described in the SO: kennethreitz/requests@v2.5.3...v2.6.0 |
Author
|
Sadly, using requests 2.6.0 doesn't seem to appease PyInstaller. |
|
That's too bad, LGTM |
Author
|
FYI, I've reported that we're still having the issue at the bottom of this thread: https://github.com/kennethreitz/requests/issues/2465#issuecomment-85642105 |
yuval-k
pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
…cies Revert labels and dependencies Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
When we updated our docker-py and requests versions in #1100, we inadvertently introduced a dependency on a version of requests that doesn't play nicely with PyInstaller.
Since this hasn't been fixed yet, and the only feature we have that depends on an up-to-date docker-py is labels, I'm backing it out and resetting our pinned versions.
We can still specify a wider version range in
setup.pyfor people who install with pip and want to use newer versions of docker-py or requests, but for the purposes of building the binary, we're sticking with docker-py 1.0.0 and requests 2.2.1 for now.