Skip to content

Make graph_objs.py compatible with new graph reference! #118

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.

Sign up for GitHub

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 32 commits into from
Oct 15, 2014
Merged

Make graph_objs.py compatible with new graph reference! #118

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
90f12c4
Use type() to create new classes and a factory to instantiate.
theengineear Jul 30, 2014
c86fd28
removed extra definitions.
theengineear Jul 31, 2014
d45f0fc
Merge branch 'master' into etienne-factories
etpinard Sep 15, 2014
bac2e22
pep8 graph_objs.py, import OBJ_MAP directly
etpinard Sep 17, 2014
efdd187
sync graph_reference json files
etpinard Sep 17, 2014
54e129a
adapt to new graph ref structure
etpinard Sep 17, 2014
1e7c292
change INFO[obj] to INFO[obj]['keymeta']
etpinard Sep 17, 2014
c0bc4fb
Only copy over specific files into on sync.
theengineear Sep 18, 2014
8a36ccd
Merge pull request #120 from plotly/andrew-update-makefile
theengineear Sep 18, 2014
9bb41f2
rm python-specific objs, base trace obj to PlotlyTrace
etpinard Sep 18, 2014
2aa7b96
reordering, override some objs after type() creation
etpinard Sep 18, 2014
67cc021
fix update tests to new INFO
etpinard Sep 19, 2014
cd801c2
add python-only objs in INFO, NAME_TO_KEY, KEY_TO_NAME, mv content
etpinard Sep 19, 2014
686b6c5
update INFO to new graph ref!
etpinard Sep 19, 2014
71d3cc8
Merge branch 'master' into etienne-factories
etpinard Sep 19, 2014
906d7ff
change \n -> \n in .to_string() docstring
etpinard Sep 19, 2014
c7f3ad6
sub globals() for dynamically-created NAME_TO_CLASS dict
etpinard Sep 20, 2014
4daabfb
rm useless json file
etpinard Oct 6, 2014
72df9f0
sub 2 more globals() for NAME_TO_CLASS
etpinard Oct 6, 2014
62623a5
update make sync_refs to new graph_reference/ structure
etpinard Oct 14, 2014
7776b01
$ make pull_refs; $ make sync_refs
etpinard Oct 14, 2014
e7f6801
add 3d objs to graph_objs import *
etpinard Oct 14, 2014
ea2e7ad
update test_strip_style to new graph ref 'val_types'
etpinard Oct 14, 2014
e2c1029
sub _factory -> get_class_instance_by_name
etpinard Oct 14, 2014
179ae70
rm useless print statement
etpinard Oct 14, 2014
9c2c69a
sub patch_{} -> get_patch_{}_class
etpinard Oct 14, 2014
38dc8be
use os to build path to graph reg JSON files
etpinard Oct 14, 2014
1d42987
sub _class -> graph_obj_class
etpinard Oct 14, 2014
e03c0c0
Merge branch 'master' into etienne-factories
theengineear Oct 15, 2014
9052baf
Merge branch 'master' of https://github.com/plotly/python-api into et…
etpinard Oct 15, 2014
12ea243
Merge branch 'etienne-factories' of https://github.com/plotly/python-…
etpinard Oct 15, 2014
2380c4d
version bump
etpinard Oct 15, 2014
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
7 changes: 6 additions & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ sync_chunked : submodules/chunked_requests
sync_refs : submodules/graph_reference
@echo ""
@echo "Syncing graph_reference directories"
rsync -r submodules/graph_reference plotly/
rm -rf plotly/graph_reference
mkdir plotly/graph_reference
cp submodules/graph_reference/graph_objs/python/graph_objs_meta.json plotly/graph_reference
cp submodules/graph_reference/graph_objs/python/KEY_TO_NAME.json plotly/graph_reference
cp submodules/graph_reference/graph_objs/python/NAME_TO_KEY.json plotly/graph_reference
cp submodules/graph_reference/graph_objs/python/OBJ_MAP.json plotly/graph_reference

pull_refs : submodules/graph_reference
@echo ""
Expand Down
2 changes: 1 addition & 1 deletion plotly/graph_objs/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
Histogram2d, Histogram2dContour, Scatter, Annotation, AngularAxis,
ColorBar, Contours, ErrorX, ErrorY, Figure, Font, Layout, Legend,
Line, Margin, Marker, RadialAxis, Stream, Trace, XAxis, XBins, YAxis,
YBins
YBins, Scatter3d, Surface, Scene, ZAxis, ErrorZ
)
Loading