Don't require simplejson#8
Merged
yannmh merged 2 commits intoDataDog:masterfrom Apr 6, 2015
benweatherman:master
Merged
Conversation
`simplejson` isn't listed as a dependency, but certain modules were importing it directly. I switched to using `datadog.compat` since that does the right thing for py2k and py3k and whether or not you have `simplejson` installed. A few other fixes - Fixed requirements needed for running `python setup.py test` - Use `pillow` instead of `PIL` for the images needed during testing. There are lots of reasons `pillow` is a much better choice, but py3k support is a pretty big one.
Contributor
|
I am also curious how /cc: @yannmh |
Contributor
Author
|
You're right, I didn't even notice that. Once we decide on how this project will use |
|
Great ! Thanks again @benweatherman.
Once, it's done we can merge your contribution and publish a new release 💥 |
Contributor
Author
|
OK, I think I've got it all tidied up now. Anything else that I can do to make this ready for primetime? |
|
Great work. Thanks a lot @benweatherman. I am merging your PR and releasing a new version of |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
simplejsonisn't listed as a dependency, but certain modules wereimporting it directly. I switched to using
datadog.compatsince thatdoes the right thing for py2k and py3k and whether or not you have
simplejsoninstalled.A few other fixes
python setup.py testpillowinstead ofPILfor the images needed during testing.There are lots of reasons
pillowis a much better choice, but py3ksupport is a pretty big one.