Skip to content

Fix anaconda simplejson issue #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 5, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions plotly/graph_objs/graph_objs_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,16 @@
import os
import sys
if sys.version[:3] == '2.6':
from ordereddict import OrderedDict
import simplejson as json
try:
from ordereddict import OrderedDict
import simplejson as json
except ImportError:
raise ImportError(
"Looks like you're running Python 2.6. Plotly expects newer "
"standard library versions of ordereddict and json. You can "
"simply upgrade with these 'extras' with the following terminal "
"command:\npip install 'plotly[PY2.6]'"
)
else:
from collections import OrderedDict
import json
Expand Down
2 changes: 1 addition & 1 deletion plotly/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.6.9'
__version__ = '1.6.10'
7 changes: 2 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ def readme():
'plotly/matplotlylib/mplexporter',
'plotly/matplotlylib/mplexporter/renderers'],
package_data={'plotly': ['graph_reference/*.json', 'widgets/*.js']},
install_requires=['requests',
'six',
'pytz',
'ordereddict',
'simplejson'],
install_requires=['requests', 'six', 'pytz'],
extras_require={"PY2.6": ['simplejson', 'ordereddict']},
zip_safe=False)