Skip to content

Commit 25b64d4

Browse files
author
Joseph Damiba
committed
adding names to ci steps
download chopper.ply to repo add 2805.csv to repo Remove curl move files to data folder adding random package
1 parent e64b131 commit 25b64d4

File tree

6 files changed

+52158
-11
lines changed

6 files changed

+52158
-11
lines changed

.circleci/config.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
version: 2
22
jobs:
33
build:
4-
ignore:
4+
branches:
5+
ignore:
56
- built
67
working_directory: ~/project
78
docker:
@@ -15,6 +16,7 @@ jobs:
1516
keys:
1617
- cache2
1718
- run:
19+
name: Install container-level dependencies
1820
command: |
1921
sudo apt-get update -y
2022
sudo apt-get install -y curl python3-pip python3-venv ssh-client ssh git
@@ -23,6 +25,7 @@ jobs:
2325
name: Keyscan Github (HACK)
2426
command: ssh-keyscan -H github.com >> ~/.ssh/known_hosts
2527
- run:
28+
name: install application-level dependencies
2629
command: |
2730
sudo apt-get install -y pandoc libudunits2-dev libgdal-dev libxt-dev libglu1-mesa-dev
2831
sudo R -e 'install.packages(c("curl", "devtools", "mvtnorm")); devtools::install_github("hypertidy/anglr"); devtools::install_github("johannesbjork/LaCroixColoR"); devtools::install_deps(dependencies = TRUE) '
@@ -34,6 +37,7 @@ jobs:
3437
path: man/
3538
destination: man
3639
- run:
40+
name: build site and perform front-matter checks
3741
command: |
3842
rm -rf build
3943
mkdir build
@@ -49,14 +53,15 @@ jobs:
4953
curl https://raw.githubusercontent.com/plotly/documentation/source-design-merge/check-or-enforce-order.py > check-or-enforce-order.py
5054
python check-or-enforce-order.py build/r
5155
- run:
56+
name: deploy to plotly/r.docs:built
5257
command: |
5358
if [ "${CIRCLE_BRANCH}" == "master" ]; then
5459
cd build
5560
git init
5661
git config user.name plotlydocbot
5762
git config user.email accounts@plot.ly
5863
rm -rf r/*.html
59-
sed -i.bkp 's/<!--.*-->//g' r/*md && rm r/*.bkp
64+
sed -i.bkp 's/<!--.*-->//g' r/*md && rm r/*.bkp # remove html comments
6065
rm -rf ggplot2/*.html
6166
sed -i.bkp 's/<!--.*-->//g' ggplot2/*md && rm ggplot2/*.bkp
6267
git add *
@@ -66,7 +71,7 @@ jobs:
6671
fi
6772
6873
- run:
69-
name: trigger doc build
74+
name: trigger plotly/documentation build
7075
command: |
7176
if [ "${CIRCLE_BRANCH}" == "master" ]; then
7277
git clone --depth=1 --branch=source-design-merge https://github.com/plotly/documentation.git

DESCRIPTION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Imports:
1313
readr,
1414
MASS,
1515
htmltools,
16+
random,
1617
tidyr,
1718
broom,
1819
cli,

r/2016-06-17-3d-tri-surf.Rmd

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,7 @@ p
7373
library(plotly)
7474
library(geomorph)
7575
76-
plyFile <- 'http://people.sc.fsu.edu/~jburkardt/data/ply/chopper.ply'
77-
dest <- basename(plyFile)
78-
if (!file.exists(dest)) {
79-
download.file(plyFile, dest)
80-
}
81-
76+
dest <- "data/chopper.ply"
8277
mesh <- read.ply(dest)
8378
# see getS3method("shade3d", "mesh3d") for details on how to plot
8479

r/2017-01-19-buttons.Rmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@ library(plotly)
343343
# Sys.setenv('MAPBOX_TOKEN' = 'your mapbox token')
344344
345345
# read in wind turbines and farms data
346-
df_wind = read.csv('https://plot.ly/~datasets/2805.csv')
347-
df_farms = read.csv('https://plot.ly/~jackp/17256.csv')
346+
df_wind = read.csv('data/2805.csv')
347+
df_farms = read.csv('https://plot.ly/~jackp/17256.csv', skipNul = TRUE)
348348
349349
# subset and clean data
350350
df_sub <- subset(df_wind, manufac != "unknown", select=c(lat_DD, long_DD, manufac))

0 commit comments

Comments
 (0)