Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4f86607

Browse files
chriddypchriddyp
committed
Merge branch 'master' into fix-config
2 parents a559dec + ff2dc96 commit 4f86607

File tree

11 files changed

+437
-5108
lines changed

11 files changed

+437
-5108
lines changed

‎.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[submodule "submodules/mplexporter"]
22
path = submodules/mplexporter
33
url = git://github.com/mpld3/mplexporter.git
4-
[submodule "submodules/graph_reference"]
5-
path = submodules/graph_reference
6-
url = git://github.com/plotly/graph_reference.git
74
[submodule "submodules/chunked_requests"]
85
path = submodules/chunked_requests
96
url = git://github.com/chriddyp/chunked_requests.git

‎make_instructions.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,12 @@ Available targets (i.e. $ make target):
3030

3131
sync_chunked -> sync chunked_requests submodule ONLY
3232

33-
sync_refs -> sync graph_reference submodule ONLY
34-
3533
pull_subs -> `cd` into *each* submodule and `git pull origin master`
3634

3735
pull_mpl -> pull in mplexporter *master* branch
3836

3937
pull_chunked -> pull in chunked_requests *master* branch
4038

41-
pull_refs -> pull in graph_reference *master* branch
42-
4339
################################################################################
4440

4541
Getting setup:
@@ -51,8 +47,8 @@ Getting setup:
5147

5248
Pulling in changes from subprojects:
5349

54-
1. Only pull submodules that you require (e.g., $ make pull_refs)
55-
2. Make sure to sync these changes (e.g., $ make sync_refs)
50+
1. Only pull submodules that you require (e.g., $ make pull_mpl)
51+
2. Make sure to sync these changes (e.g., $ make sync_mpl)
5652

5753
################################################################################
5854

‎makefile

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ readme :
66

77
setup_subs :
88
@echo "Deleting old submodule locations, if they exist"
9-
rm -rf plotly/graph_reference
109
rm -rf plotly/mplexporter
1110
rm -rf plotly/chunked_requests
1211
rm -rf plotly/plotly/chunked_requests
@@ -31,11 +30,11 @@ install : sync_subs
3130
@echo "Installing Python API with make"
3231
python setup.py install
3332

34-
sync_subs : sync_mpl sync_chunked sync_refs
33+
sync_subs : sync_mpl sync_chunked
3534
@echo ""
3635
@echo "Submodules synced"
3736

38-
pull_subs : pull_mpl pull_chunked pull_refs
37+
pull_subs : pull_mpl pull_chunked
3938
@echo ""
4039
@echo "Submodules pulled"
4140

@@ -49,21 +48,6 @@ sync_chunked : submodules/chunked_requests
4948
@echo "Syncing chunked_requests directories"
5049
rsync -r submodules/chunked_requests/chunked_requests plotly/plotly/
5150

52-
sync_refs : submodules/graph_reference
53-
@echo ""
54-
@echo "Syncing graph_reference directories"
55-
rm -rf plotly/graph_reference
56-
mkdir plotly/graph_reference
57-
cp submodules/graph_reference/graph_objs/python/graph_objs_meta.json plotly/graph_reference
58-
cp submodules/graph_reference/graph_objs/python/KEY_TO_NAME.json plotly/graph_reference
59-
cp submodules/graph_reference/graph_objs/python/NAME_TO_KEY.json plotly/graph_reference
60-
cp submodules/graph_reference/graph_objs/python/OBJ_MAP.json plotly/graph_reference
61-
62-
pull_refs : submodules/graph_reference
63-
@echo ""
64-
@echo "Pulling down updates from graph_reference"
65-
cd submodules/graph_reference; git pull origin master
66-
6751
pull_mpl : submodules/mplexporter
6852
@echo ""
6953
@echo "Pulling down updates from mplexporter"

‎plotly/graph_objs/graph_objs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -700,13 +700,13 @@ def to_string(self, level=0, indent=4, eol='\n',
700700
eol=eol,
701701
indent=' ' * indent * (level+1),
702702
key=key)
703-
try:
703+
if isinstance(self[key], PlotlyBase):
704704
string += self[key].to_string(level=level+1,
705705
indent=indent,
706706
eol=eol,
707707
pretty=pretty,
708708
max_chars=max_chars)
709-
except AttributeError:
709+
else:
710710
if pretty: # curtail representation if too many chars
711711
max_len = (max_chars -
712712
indent*(level + 1) -

‎plotly/graph_reference/KEY_TO_NAME.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎plotly/graph_reference/NAME_TO_KEY.json

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎plotly/graph_reference/OBJ_MAP.json

Lines changed: 0 additions & 142 deletions
This file was deleted.

0 commit comments

Comments
 (0)