fix ujson version #389
Merged
fix ujson version #389
Conversation
This file contains 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
li-wu
requested review from
arctan5x,
GordonWang,
jmeixensperger and
lephino
as code owners
|
You might also need to update the ujson package that's being downloaded in the Makefile: https://github.com/splunk/eventgen/blob/develop/Makefile#L45 |
li-wu
force-pushed
the
bugfix/ci-fail
branch
4 times, most recently
from
606f6dd
to
2aa781b
Compare
li-wu
commented
May 6, 2020
| @@ -42,7 +42,7 @@ test_helper: | |||
| docker exec -i ${EVENTGEN_TEST_IMAGE} /bin/sh -c "cd $(shell pwd); pip3 install dist/splunk_eventgen*.tar.gz" | |||
|
|
|||
| @echo 'Installing test requirements' | |||
| docker exec -i ${EVENTGEN_TEST_IMAGE} /bin/sh -c "pip3 install --upgrade pip;pip3 install -r $(shell pwd)/requirements.txt;pip3 install git+https://github.com/esnme/ultrajson.git" | |||
| docker exec -i ${EVENTGEN_TEST_IMAGE} /bin/sh -c "pip3 install --upgrade pip;pip3 install -r $(shell pwd)/requirements.txt" | |||
There was a problem hiding this comment.
Check related bug here: ultrajson/ultrajson#326. This issue has been fixed in version 2.0+. So we do not need to use git+https://github.com/esnme/ultrajson.git to install ujson.
li-wu
commented
May 6, 2020
| pip2 install filelock twisted requests queuelib ujson psutil crochet msgpack-python unidecode attrdict service_identity && \ | ||
| pip2 install git+https://github.com/esnme/ultrajson.git | ||
| pip2 install filelock twisted requests queuelib psutil crochet msgpack-python unidecode attrdict service_identity && \ | ||
| pip2 install git+https://github.com/esnme/ultrajson.git@v1.35 |
There was a problem hiding this comment.
The conductor2 depends on ujson < 2.0, so we need to install it in this way.
li-wu
commented
May 6, 2020
| @@ -10,12 +10,11 @@ pytest-mock>=1.10.4 | |||
| boto3 | |||
| requests>=2.18.4 | |||
| requests[security] | |||
| ujson>=1.35 | |||
| ujson==2.0.3 | |||
There was a problem hiding this comment.
upgrade to the latest version 2.0.3.
li-wu
commented
May 6, 2020
| @@ -9,4 +9,4 @@ exclude = ''' | |||
| | build | |||
| | dist | |||
| )/ | |||
| ``` | |||
| ''' | |||
There was a problem hiding this comment.
Fix typo and bug: #387
GordonWang
approved these changes
May 6, 2020
arctan5x
approved these changes
May 6, 2020
jmeixensperger
approved these changes
May 6, 2020
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.
No description provided.