Moving files around

gvegayon · Aug 8, 2021 · f02f682 · f02f682
1 parent 02b828e
commit f02f682
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 19 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -23,7 +23,7 @@ Description: Create, read and write 'GEXF' (Graph Exchange 'XML' Format) graph
     'javascript' library) and interact with the 'igraph' package.
 URL: https://gvegayon.github.io/rgexf
 BugReports: http://github.com/gvegayon/rgexf/issues
-Imports:
+Imports: 
     XML,
     igraph,
     grDevices,
@@ -34,8 +34,7 @@ LazyLoad: yes
 RoxygenNote: 7.0.2
 Suggests: knitr,
     rmarkdown,
-    testthat,
-    covr
+    tinytest,
+    covr, tinytest
 VignetteBuilder: knitr
 Roxygen: list(markdown = TRUE)
-
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -2,11 +2,10 @@ FROM rocker/r-base:latest
 
 RUN apt-get update && \
 	apt-get install -y --no-install-recommends \
-	r-cran-ape r-cran-coda r-cran-mass r-cran-rmarkdown r-cran-knitr \
-	r-cran-xml2 r-cran-covr r-cran-tinytest && \
-	Rscript -e 'utils::install.packages("fmcmc")'
+	r-cran-xml r-cran-igraph r-cran-rmarkdown r-cran-knitr \
+	r-cran-covr r-cran-tinytest
 
-RUN Rscript -e 'utils::install.packages("AUC")'
+RUN Rscript -e 'utils::install.packages("servr")'
 
 CMD ["bash"]
 
diff --git a/docker/Makefile b/docker/Makefile
@@ -1,6 +1,4 @@
 build:
-	docker build -t uscbiostats/aphylo:release -f Dockerfile . && \
-		docker build -t uscbiostats/aphylo:devel -f Dockerfile.dev .
+	docker build -t gvegayon/rgexf:release -f Dockerfile . 
 push: build
-	docker push uscbiostats/aphylo:release && \
-		docker push uscbiostats/aphylo:devel
+	docker push gvegayon/rgexf:release 
diff --git a/tests/rundemos.R → inst/tinytest/rundemos.R.old b/tests/rundemos.R → inst/tinytest/rundemos.R.old
diff --git a/tests/testthat/test-bugs.r → inst/tinytest/test-bugs.r b/tests/testthat/test-bugs.r → inst/tinytest/test-bugs.r
diff --git a/tests/testthat/test-igraph.r → inst/tinytest/test-igraph.r b/tests/testthat/test-igraph.r → inst/tinytest/test-igraph.r
diff --git a/tests/testthat/test-rgexf.r → inst/tinytest/test-rgexf.r b/tests/testthat/test-rgexf.r → inst/tinytest/test-rgexf.r
diff --git a/inst/tinytest/test_rgexf.R b/inst/tinytest/test_rgexf.R
@@ -0,0 +1,4 @@
+
+# Placeholder with simple test
+expect_equal(1 + 1, 2)
+
diff --git a/tests/testthat.R b/tests/testthat.R
diff --git a/tests/testthat/test-examples.r b/tests/testthat/test-examples.r
diff --git a/tests/tinytest.R b/tests/tinytest.R
@@ -0,0 +1,5 @@
+
+if ( requireNamespace("tinytest", quietly=TRUE) ){
+  tinytest::test_package("rgexf")
+}
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@

		# Placeholder with simple test
		expect_equal(1 + 1, 2)