Update pip dependencies, fix conflicting dependency version, ensure there are no conflicting dependencies #4819
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
which polute PYTHONPATH.
there are no dependency conflicts.
pull-request-size
bot
added
the
size/M
Kami
commented
Nov 19, 2019
|
|
||
| # Generate all requirements to support current CI pipeline. | ||
| $(VIRTUALENV_DIR)/bin/python scripts/fixate-requirements.py --skip=virtualenv,virtualenv-osx -s st2*/in-requirements.txt contrib/runners/*/in-requirements.txt -f fixed-requirements.txt -o requirements.txt | ||
|
|
||
| # Remove any *.egg-info files which polute PYTHONPATH | ||
| rm -rf *.egg-info* |
There was a problem hiding this comment.
We should have done that before.
We add repo root to PYTHONPATH in virtualenv we create which means if you run python setup.py install or similar in st2client/ directory, it will create egg-info directory for that Python package which will mask actual st2client/ directory in PYTHONPATH.
|
I confirmed conflict checker tool works correctly. Here is an example if we use # Verify there are no conflicting dependencies
virtualenv/bin/pipconflictchecker
--------------------------------------------------
Conflicts Detected
--------------------------------------------------
- amqp(2.5.1) kombu(>=2.5.2,<2.6)
Makefile:437: recipe for target 'requirements' failedIt will return an error since that version of kombu request |
pull-request-size
bot
added
size/L
Kami
commented
Nov 19, 2019
test-requirements.txt
Outdated
| pyrabbit | ||
| # Since StackStorm v2.8.0 we now use cryptography instead of keyczar, but we still have some tests | ||
| # which utilize keyczar and ensure new cryptography code is fully compatible with keyczar code | ||
| # (those tests only run under Python 2.7 since keyczar doesn't support Python 3.x). | ||
| # See https://github.com/StackStorm/st2/pull/4165 | ||
| python-keyczar | ||
| git+https://github.com/Kami/pip-conflict-checker.git@fix_pip_issue#egg=pip-conflict-checker |
There was a problem hiding this comment.
Just FYI - that's the change we need - ambitioninc/pip-conflict-checker#14.
I can also push that fork to StackStorm org and use that version until it's merged upstream.
blag
approved these changes
Nov 19, 2019
|
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.
This pull request includes the following changes:
cryptographydependency to v2.8 since version ofrequestswe use depends on that version. As per Master currently broken because of dependency conflict between requests and cryptography #4818 (comment), that is not actually a fatal issue since pip just prints a warning and doesn't fail on install, but it's still good to get it sorted out.test-requirements.txtare in sync with versions inrequirements.txtpip-conflict-checkeras part ofmake requirementsstep. This command will fail and exit with non-zero if there are any conflicting dependency versions.TODO
Resolves #4818.