Merge pull request #41 from eddelbuettel/bugfix/no_xts_tests

keep xts tests inactive after xts 0.11.0 release
eddelbuettel · Jul 18, 2018 · 15e39f5 · 15e39f5
2 parents f6dc78c + a95f612
commit 15e39f5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-18  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/unitTests/test_xts.R: Continue to disable xts tests even after
+	0.11.0 release
+
 2018-07-01  Dirk Eddelbuettel  <edd@debian.org>
 
 	* DESCRIPTION (Version, Date): Release 0.2.1

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: nanotime
 Type: Package
 Title: Nanosecond-Resolution Time for R
-Version: 0.2.1
-Date: 2018-07-01
+Version: 0.2.1.1
+Date: 2018-07-18
 Author: Dirk Eddelbuettel and Leonardo Silvestri
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
 Description: Full 64-bit resolution date and time support with resolution up

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -3,6 +3,12 @@
 \newcommand{\ghpr}{\href{https://github.com/eddelbuettel/nanotime/pull/#1}{##1}}
 \newcommand{\ghit}{\href{https://github.com/eddelbuettel/nanotime/issues/#1}{##1}}
 
+\section{Changes in version 0.2.2 (2018-07-xx)}{
+  \itemize{
+    \item Unit tests depending on future \CRANpkg{xts} behaviour remain disabled.
+  }
+}
+
 \section{Changes in version 0.2.1 (2018-07-01)}{
   \itemize{
     \item Added attribute-preserving comparison (Leonardo in \ghpr{33}).

diff --git a/inst/unitTests/test_xts.R b/inst/unitTests/test_xts.R
@@ -39,8 +39,9 @@
 ## xtsInternals . . .
 ## [.xts . . . . . .
 
-if (requireNamespace("xts", quietly=TRUE) &&
-    packageVersion("xts") >= "0.11.0") {   		# hypothetical future version with nanotime support
+if (FALSE &&                            	# for now, never use this
+    requireNamespace("xts", quietly=TRUE) &&
+    packageVersion("xts") >= "0.12.0") {   	# hypothetical future version with nanotime support
 
     .setUp <- function() {
         library(xts)