Skip to content

Commit fa235b6

Browse files
remove Rakefile in favour of makefile
1 parent 2448113 commit fa235b6

File tree

5 files changed

+19
-35
lines changed

5 files changed

+19
-35
lines changed

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ jobs:
5555
echo
5656
echo "token: ${mapbox_token}" > _data/mapbox_token.yml
5757
rm -rf _posts/python/html
58-
rm -rf _posts/r/md
5958
git clone -b built git@github.com:plotly/plotly.py-docs _posts/python/html
59+
rm -rf _posts/r/md
6060
git clone -b built git@github.com:plotly/plotly.r-docs _posts/r/md
6161
mv _posts/r/md/ggplot2 _posts/ggplot2/md
62+
rm -rf _posts/julia/html
6263
git clone -b built git@github.com:plotly/plotlyjs.jl-docs _posts/julia/html
6364
python front-matter-ci.py _posts
6465
python check-or-enforce-order.py _posts/python

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ _posts/ggplot2/md
3131

3232
_data/mapbox_token.yml
3333
plot-schema.json
34+
35+
_posts/julia/html

Rakefile

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

makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,16 @@ update_r_search :
3131
update_ref_search :
3232
@echo "Updating search for reference pages"
3333
python update_ref_search.py
34+
35+
fetch_adjacent_python_files:
36+
rm -rf _posts/python/html
37+
cp -r ../plotly.py/doc/build/html _posts/python/html
38+
39+
fetch_upstream_files:
40+
rm -rf _posts/python/html
41+
git clone --depth 1 -b built git@github.com:plotly/plotly.py-docs _posts/python/html
42+
rm -rf _posts/r/md
43+
git clone --depth 1 -b built git@github.com:plotly/plotly.r-docs _posts/r/md
44+
mv _posts/r/md/ggplot2 _posts/ggplot2/md
45+
rm -rf _posts/julia/html
46+
git clone --depth 1 -b built git@github.com:plotly/plotlyjs.jl-docs _posts/julia/html

style_README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ OR
2626

2727
### markup + scss workflow
2828

29-
It's a bit of a hassle to make concurrent updates to markup and scss. Anytime you update an html/js file you'll have to run a `$ jekyll build` command or `$ jekyll serve` and have jekyll watching for changes. I have found issues with jekyll's watch being too sensitive and have opted to build when I choose to prevent long hangs because of the size of the repo.
29+
It's a bit of a hassle to make concurrent updates to markup and scss. Anytime you update an html/js file you'll have to run a `$ jekyll build` command or `$ jekyll serve` and have jekyll watching for changes. I have found issues with jekyll's watch being too sensitive and have opted to build when I choose to prevent long hangs because of the size of the repo.
3030
When you run a `$ jekyll` you need to update any scss file as jekyll will automatically replace the styles.css file. e.g.: if you modify any scss file and save it, it will overwrite the file jekyll has produced.
3131

3232
### folder structure
@@ -49,15 +49,14 @@ When you run a `$ jekyll` you need to update any scss file as jekyll will automa
4949
* _tutorial-index.scss
5050
* _tutorial-single.scss
5151
- main.scss *(bringing it all together)*
52-
52+
5353
- all_static/css/
5454
- main.css *(the css conversion of main.scss)*
5555

5656
## Deploying Changes After Editing the SCSS
5757

5858
- Run `gulp build` in the root of the documentation repo after making any scss edits. This will update `main.css` as well as the [version](https://github.com/plotly/graphing-library-docs/blob/master/_data/cache_bust_css.yml) which is used to prevent css caching.
5959
- `git add` the files you've changed as well as the generated `main.css` and `cache_bust_css.yml` files, `git commit -m 'message about update'`, and `git push origin master` to add your updates to the repo.
60-
- run `rake deploy` to deploy changes.
6160

6261
## vanilla css
6362

0 commit comments

Comments
 (0)