Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Clean up old graph reference stuff #310

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 4 commits into from
Sep 30, 2015
Merged

Clean up old graph reference stuff #310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ac736f
Remove old graph reference files.
theengineear Sep 30, 2015
843d38f
Remove graph_reference submodule from .gitmodules.
theengineear Sep 30, 2015
021cc42
Remove the reference to the submodule.
theengineear Sep 30, 2015
71892b3
Remove `refs` stuff from makefile and instructions
theengineear Sep 30, 2015
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
Prev Previous commit
Remove refs stuff from makefile and instructions
  • Loading branch information
@theengineear
theengineear committed Sep 30, 2015
commit 71892b35c40f3672a43fad1fa7a0a75036d329a4
8 changes: 2 additions & 6 deletions 8 make_instructions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,12 @@ Available targets (i.e. $ make target):

sync_chunked -> sync chunked_requests submodule ONLY

sync_refs -> sync graph_reference submodule ONLY

pull_subs -> `cd` into *each* submodule and `git pull origin master`

pull_mpl -> pull in mplexporter *master* branch

pull_chunked -> pull in chunked_requests *master* branch

pull_refs -> pull in graph_reference *master* branch

################################################################################

Getting setup:
Expand All @@ -51,8 +47,8 @@ Getting setup:

Pulling in changes from subprojects:

1. Only pull submodules that you require (e.g., $ make pull_refs)
2. Make sure to sync these changes (e.g., $ make sync_refs)
1. Only pull submodules that you require (e.g., $ make pull_mpl)
2. Make sure to sync these changes (e.g., $ make sync_mpl)

################################################################################

Expand Down
20 changes: 2 additions & 18 deletions 20 makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ readme :

setup_subs :
@echo "Deleting old submodule locations, if they exist"
rm -rf plotly/graph_reference
rm -rf plotly/mplexporter
rm -rf plotly/chunked_requests
rm -rf plotly/plotly/chunked_requests
Expand All @@ -31,11 +30,11 @@ install : sync_subs
@echo "Installing Python API with make"
python setup.py install

sync_subs : sync_mpl sync_chunked sync_refs
sync_subs : sync_mpl sync_chunked
@echo ""
@echo "Submodules synced"

pull_subs : pull_mpl pull_chunked pull_refs
pull_subs : pull_mpl pull_chunked
@echo ""
@echo "Submodules pulled"

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

sync_refs : submodules/graph_reference
@echo ""
@echo "Syncing graph_reference directories"
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 ""
@echo "Pulling down updates from graph_reference"
cd submodules/graph_reference; git pull origin master

pull_mpl : submodules/mplexporter
@echo ""
@echo "Pulling down updates from mplexporter"
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.