Skip to content

Commit

Permalink
v. 1.3.6 (#324)
Browse files Browse the repository at this point in the history
## Bug fixes 
- Fix GDAL usage over Windows
  • Loading branch information
ranghetti authored Jun 4, 2020
1 parent 7922a00 commit 51c79bb
Show file tree
Hide file tree
Showing 89 changed files with 209 additions and 180 deletions.
4 changes: 3 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: sen2r
Type: Package
Title: Find, Download and Process Sentinel-2 Data
Version: 1.3.5
Version: 1.3.6
Authors@R: c(person("Luigi", "Ranghetti",
email = "[email protected]",
role = c("aut", "cre"),
Expand All @@ -16,6 +16,8 @@ Description: Functions to download Sentinel-2 optical images
(and eventually automate) the steps necessary to build a complete
Sentinel-2 processing chain.
A Graphical User Interface to facilitate data processing is also provided.
For additional documentation refer to the following article:
Ranghetti et al. (2020) <doi:10.1016/j.cageo.2020.104473>.
License: GPL-3
Encoding: UTF-8
URL: http://sen2r.ranghetti.info, https://github.com/ranghetti/sen2r
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Version 1.3.6

## Bug fixes
- Fix GDAL usage over Windows (a new version was specifically released for this bug because it caused **`sen2r`** stopping for many Windows users).


# Version 1.3.5

## Major changes
Expand Down
4 changes: 2 additions & 2 deletions R/check_sen2r_deps.R
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ check_sen2r_deps <- function() {
# build the icon of the check
observe({
input$check_gdal
rv$check_gdal_isvalid <- if (!is.null(binpaths()$gdal_calc)) {
file.exists(binpaths()$gdal_calc)
rv$check_gdal_isvalid <- if (!is.null(binpaths()$gdalinfo)) {
file.exists(binpaths()$gdalinfo)
} else {FALSE}
})
output$check_gdal_isvalid <- renderText(rv$check_gdal_isvalid)
Expand Down
2 changes: 1 addition & 1 deletion R/init_python.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ init_python <- function() {

binpaths <- load_binpaths("gdal")
pythonhome_new <- list.files(
file.path(dirname(dirname(binpaths$gdal_calc)),"apps"),
file.path(dirname(dirname(binpaths$gdalinfo)),"apps"),
pattern="^Python",
full.names=TRUE
)[1]
Expand Down
12 changes: 10 additions & 2 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# sen2r v. 1.3.5
# sen2r v. 1.3.6

## Test environments
* [local installation] Ubuntu 18.04, 64 bit, R 3.6.3
Expand All @@ -9,4 +9,12 @@
* [win-builder] R unstable (r78617), 4.0.0 and 3.6.3 (devel, release and oldrelease)

## R CMD check results
There were no ERRORs, WARNINGs or NOTEs.
There were no ERRORs or WARNINGs.

A note was returned:
```
Days since last update: 3
```
this because this is a bug-fixing release:
the bug I need to fix affects the major part of Windows users,
so this patch is urgent.
2 changes: 1 addition & 1 deletion docs/404.html

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

2 changes: 1 addition & 1 deletion docs/CODE-OF-CONDUCT.html

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

2 changes: 1 addition & 1 deletion docs/LICENSE.html

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

2 changes: 1 addition & 1 deletion docs/articles/docker.html

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

2 changes: 1 addition & 1 deletion docs/articles/index.html

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

2 changes: 1 addition & 1 deletion docs/articles/installation.html

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

2 changes: 1 addition & 1 deletion docs/articles/outstructure.html

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

2 changes: 1 addition & 1 deletion docs/articles/sen2r_cmd.html

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

2 changes: 1 addition & 1 deletion docs/articles/sen2r_gui.html

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

2 changes: 1 addition & 1 deletion docs/authors.html

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

6 changes: 4 additions & 2 deletions docs/index.html

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

32 changes: 22 additions & 10 deletions docs/news/index.html

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

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ articles:
outstructure: outstructure.html
sen2r_cmd: sen2r_cmd.html
sen2r_gui: sen2r_gui.html
last_built: 2020-05-30T07:32Z
last_built: 2020-06-04T08:39Z

2 changes: 1 addition & 1 deletion docs/reference/abs2rel.html

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

2 changes: 1 addition & 1 deletion docs/reference/add_rgb_image.html

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

4 changes: 2 additions & 2 deletions docs/reference/build_example_param_file.html

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

2 changes: 1 addition & 1 deletion docs/reference/calcindex.html

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

2 changes: 1 addition & 1 deletion docs/reference/check_gdal.html

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

2 changes: 1 addition & 1 deletion docs/reference/check_gui_deps.html

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

2 changes: 1 addition & 1 deletion docs/reference/check_param_list.html

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

2 changes: 1 addition & 1 deletion docs/reference/check_sen2r_deps.html

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

2 changes: 1 addition & 1 deletion docs/reference/compute_s2_paths.html

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

2 changes: 1 addition & 1 deletion docs/reference/comsub.html

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

2 changes: 1 addition & 1 deletion docs/reference/create_indices_db.html

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

2 changes: 1 addition & 1 deletion docs/reference/create_s2_dop.html

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

2 changes: 1 addition & 1 deletion docs/reference/dontuse.html

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

Loading

0 comments on commit 51c79bb

Please sign in to comment.