Skip to content

Commit

Permalink
Merge pull request #72 from dominikl/0_4_7
Browse files Browse the repository at this point in the history
0.4.7 release preparation
  • Loading branch information
dominikl authored Jun 26, 2019
2 parents f71f97a + d1239e4 commit 288c8ca
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 2 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
^jupyter$
^pom.xml$
^README.md$
^screenshot.png
^\.travis.yml$
^\.omeroci$
^tests$
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
0.4.7 (June 2019)
-----------------
- updated to OMERO 5.5
- preserved backward compatibility to OMERO 5.4

0.4.6 (June 2019)
-----------------
- fixed bug in Image.getPixelValues() method which returned
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: romero.gateway
Type: Package
Version: 0.4.6.999
Date: 2019-06-06
Version: 0.4.7
Date: 2019-06-25
Title: OMERO R Gateway
Description: R Wrapper around the OMERO Java Gateway, which
enables access to an OMERO server within R.
Expand Down
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Download the latest romero.gateway version which is compatible with your OMERO s

OMERO version | romero.gateway version
--- | ---
5.5 | 0.4.7
5.4 | all

### Windows
Expand All @@ -36,6 +37,8 @@ In RStudio "Install Packages" use option "Install from:" "Package Archive File"

Alternatively: In R console run `install.packages("https://github.com/ome/rOMERO-gateway/releases/download/vx.x.x/romero.gateway_x.x.x.zip", repos = NULL)`

See [Tips for Windows users](#tips-for-windows-users) section if you are running into difficulties.

### Unix / OSX

Download the tar.gz package.
Expand Down Expand Up @@ -111,4 +114,17 @@ and `libxml2-dev` first.
If you can't install an R package due to compile errors, most likely you are missing a development
package of some dependent library on your system.

## Tips for Windows users

### Installing rJava

You need to have a Java SDK installed. Latest version which is supported is 11.
Download for example the Adopt OpenJDK 11 from https://adoptopenjdk.net/

Make sure that the java executable is on your `Path` and `JAVA_HOME` is set,
see 'Environment Variables' settings:
![Environment Variables](screenshot.png)

Then install `rJava` as well as the additional dependencies for the R gateway
`httr` and `jpeg` from CRAN. Finally install the `romero-gateway` from the zip file.

Binary file added screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 288c8ca

Please sign in to comment.