Merge pull request #229 from StuartWheater/v6.0.1-dev

Updated versions used

Author: StuartWheater

DESCRIPTION

@@ -1,12 +1,13 @@
 Package: dsBaseClient
 Title: DataSHIELD Client Functions
-Version: 6.0.0
+Version: 6.0.1
 Author: DataSHIELD Developers <datashield@newcastle.ac.uk>
 Maintainer: DataSHIELD Developers <datashield@newcastle.ac.uk>
 Description: DataSHIELD client functions for the client side.
 License: GPL-3
-Depends: R (>= 3.5.0),
-    DSI
+Depends:
+    R (>= 3.5.0),
+    DSI (>= 1.1.0)
 Imports:
     fields,
     metafor

README.md

@@ -9,8 +9,7 @@ DataSHIELD client side base R library.
 | Branch   | dsBase status | dsBaseClient status | dsBaseClient tests |
 | -------- | ------------  | ------------------- | ------------------ |
 | Master   | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=master)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=master) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=master)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=master) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/master/latest/) |
-| v6.0-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.0-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0-dev) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.0-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.0-dev/latest/) |
-| v6.0.1-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.0.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0.1-dev) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.0.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0.1-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.0.1-dev/latest/) |
+| v6.0.2-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.0.2-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0.2-dev) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.0.2-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0.2-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.0.2-dev/latest/) |
 | v6.1-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.1-dev) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.1-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.1-dev/latest/) |
 
 
@@ -32,4 +31,4 @@ Detailed instructions on how to install DataSHIELD are at https://www.datashield
 | obiba CRAN                   | Where you probably should install DataSHIELD from. |
 | releases                     | Stable releases. |
 | master branch                | Mostly in sync with the latest release, changes rarely. |
-| v6.0-dev branch (or similar) | Bleeding edge development. We make no claims that this branch is fully functional at any given time. |
+| v6.1-dev branch (or similar) | Bleeding edge development. We make no claims that this branch is fully functional at any given time. |

azure-pipelines.yml

@@ -47,7 +47,7 @@ resources:
     type: github
     endpoint: datashield-testing
     name: datashield/datashield-infrastructure
-    ref: refs/tags/6.0.1
+    ref: refs/tags/6.0.2
 
 
 #########################################################################################

azure-pipelines_site.pp

@@ -16,7 +16,7 @@
   remote_mysql   => false,        # There is not a remote mysql server
 
   dsbase_githubusername      => 'datashield',
-  dsbase_ref                 => 'v6.0.1-dev',
+  dsbase_ref                 => '6.0.1',
   dsstats_githubusername     => 'datashield',
   dsstats_ref                => '',
   dsgraphics_githubusername  => 'datashield',