Skip to content

Commit

Permalink
i really do not like appveyor
Browse files Browse the repository at this point in the history
  • Loading branch information
marcosci committed Nov 16, 2018
1 parent 6c0cf80 commit 0972cd8
Show file tree
Hide file tree
Showing 23 changed files with 38 additions and 22 deletions.
15 changes: 11 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,16 @@ install:
ps: Bootstrap

# Adapt as necessary starting from here
environment:
USE_RTOOLS: true
RTOOLS_VERSION: 35

build_script:
- travis-tool.sh install_deps

test_script:
- travis-tool.sh run_tests

on_failure:
- 7z a failure.zip *.Rcheck\*
- appveyor PushArtifact failure.zip

artifacts:
- path: '*.Rcheck\**\*.log'
Expand All @@ -32,4 +39,4 @@ artifacts:
name: Bits

- path: '\*_*.zip'
name: Bits
name: Bits
2 changes: 1 addition & 1 deletion docs/articles/articles/nlm_software_heritage.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/articles/articles/overview_tips.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions docs/articles/articles/visualize_nlms.html

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 14 additions & 5 deletions docs/articles/getstarted.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified docs/articles/getstarted_files/figure-html/unnamed-chunk-1-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/getstarted_files/figure-html/unnamed-chunk-2-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/getstarted_files/figure-html/unnamed-chunk-2-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/getstarted_files/figure-html/unnamed-chunk-3-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions vignettes/getstarted.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ following code:

```{r, fig.height=7, fig.width=7, fig.align='center'}
x <- NLMR::nlm_random(20,20)
landscapetools::util_plot(x)
plot(x)
```

## Merging landscapes
Expand All @@ -84,7 +84,7 @@ The `util_merge` function is used to merge the rasters as in the example below:
pL <- NLMR::nlm_edgegradient(ncol = 100,
nrow = 100)
landscapetools::util_plot(pL)
plot(pL)
#Create secondary landscape rasters
sL1 <- NLMR::nlm_distancegradient(ncol = 100,
Expand All @@ -95,7 +95,7 @@ The `util_merge` function is used to merge the rasters as in the example below:
mL1 <- pL + (sL1 + sL2)
landscapetools::util_plot(mL1)
plot(mL1)
```

## Classifying categories
Expand All @@ -112,7 +112,7 @@ nr <- NLMR::nlm_fbm(50, 100, fract_dim = 1.2)
nr_classified <- landscapetools::util_classify(nr, weighting = c(0.3, 0.3, 0.3))
landscapetools::util_plot(nr_classified, discrete = TRUE)
plot(nr_classified, discrete = TRUE)
```

##References

0 comments on commit 0972cd8

Please sign in to comment.