Skip to content

Commit 34d6e83

Browse files
royfrancisroyfrancis
authored
Merge pull request #3 from royfrancis/v2.1.1
Adding changes for v2.1.1
2 parents 1f713b5 + 51c800a commit 34d6e83

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+3672
-2406
lines changed

‎.Rbuildignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
^.*\.Rproj$
2+
^\.Rproj\.user$
3+
^\.Rhistory
4+
^\.Rdata
5+
pkgdown/
6+
_pkgdown.yml
7+
docs/
8+
index.md
9+
NEWS.md
10+
^\.github/
11+
^\.git/
12+
vignettes/
13+
vignettes/*
14+
^\.\.Rcheck/
15+
Dockerfile

‎.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
## GITHUB ACTION FOR R PACKAGE
22
## Build, check
3-
## Required secrets
4-
## TOKEN
53

64
name: build
75
on:
@@ -16,7 +14,7 @@ jobs:
1614
strategy:
1715
fail-fast: false
1816
matrix:
19-
r: [3.5.3,3.6.3,4.0.0]
17+
r: [3.6,4.0]
2018
steps:
2119
- uses: actions/checkout@v1
2220
- uses: r-lib/actions/setup-r@master
@@ -42,6 +40,7 @@ jobs:
4240
if: steps.cache-r-packages.outputs.cache-hit != 'true'
4341
run: |
4442
Rscript -e "install.packages(c('remotes','rcmdcheck'))"
43+
Rscript -e "remotes::install_github('royfrancis/pophelper',dependencies=TRUE)"
4544
Rscript -e "remotes::install_deps(pkgdir='.',dependencies=TRUE,repos='https://cran.rstudio.com/')"
4645
- name: RMD check and install package
4746
run: |
@@ -53,7 +52,7 @@ jobs:
5352
strategy:
5453
fail-fast: false
5554
matrix:
56-
r: [3.5.3,3.6.3,4.0.0]
55+
r: [3.6,4.0]
5756
steps:
5857
- uses: actions/checkout@v1
5958
- uses: r-lib/actions/setup-r@master
@@ -71,6 +70,7 @@ jobs:
7170
if: steps.cache-r-packages.outputs.cache-hit != 'true'
7271
run: |
7372
Rscript -e "install.packages(c('remotes','rcmdcheck','stringi'),lib='C:/R/library')"
73+
Rscript -e "remotes::install_github('royfrancis/pophelper',dependencies=TRUE)"
7474
Rscript -e "remotes::install_deps(pkgdir='.',dependencies=TRUE,repos='https://cran.rstudio.com/',lib='C:/R/library')"
7575
Rscript -e "(print(.libPaths()))"
7676
- name: RMD check and install package

‎.github/workflows/docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66

77
jobs:
88
push_to_registry:
9-
name: Push docker image to dockerhub
9+
name: Build/Push docker image to dockerhub
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: check out the repo
12+
- name: Check out the repo
1313
uses: actions/checkout@v2
14-
- name: push to dockerhub
14+
- name: Build and push to dockerhub
1515
uses: docker/build-push-action@v1
1616
with:
1717
username: ${{ secrets.DOCKER_USERNAME }}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
inst/doc

‎DESCRIPTION

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,36 @@
11
Package: pophelperShiny
22
Type: Package
33
Title: Interactive shiny GUI around pophelper R package
4-
Version: 2.1.0
5-
Date: 2019-08-15
4+
Version: 2.1.1
5+
Date: 2020-12-28
66
Author: Roy Mathew Francis
77
Authors@R: person("Roy", "Francis", email = "[email protected]",role = c("aut", "cre"))
88
Maintainer: Roy Mathew Francis <[email protected]>
99
Description: Interactive interface to pophelper using shiny web framework.
1010
URL: https://github.com/royfrancis/pophelperShiny
1111
Depends:
12-
R(>= 3.5.0),
13-
ggplot2,
14-
highcharter,
15-
magrittr,
16-
pophelper(>= 2.3.0),
17-
shiny
12+
R(>= 3.6)
1813
Imports:
1914
colourpicker,
2015
DT,
16+
ggplot2,
2117
gridExtra,
18+
highcharter,
2219
htmlwidgets,
2320
magrittr,
24-
markdown,
21+
pophelper(>= 2.3.1),
2522
RColorBrewer,
23+
shiny,
2624
shinyAce,
2725
shinyBS,
2826
shinythemes,
2927
shinyWidgets,
3028
tidyr,
3129
viridisLite,
3230
writexl
33-
Suggests:
34-
bookdown,
35-
captioner,
36-
ggpubr,
37-
knitr,
38-
markdown
31+
Remotes:
32+
royfrancis/pophelper
3933
License: GPL-3
4034
Encoding: UTF-8
4135
BugReports: https://github.com/royfrancis/pophelperShiny/issues
42-
VignetteBuilder: knitr
43-
RoxygenNote: 6.1.1
36+
RoxygenNote: 7.1.1

‎Dockerfile

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# DOCKER FILE FOR POPHELPERSHINY
2+
# 2021 Roy Francis
3+
4+
FROM rocker/shiny:4.0.3
5+
LABEL Description="Docker image for R package pophelperShiny"
6+
LABEL Maintainer="[email protected]"
7+
8+
RUN apt-get update -y \
9+
&& apt-get install --no-install-recommends -y \
10+
libfreetype6-dev \
11+
libcurl4-openssl-dev \
12+
libssl-dev \
13+
libudunits2-dev \
14+
libxml2-dev \
15+
libgeos-dev \
16+
libfontconfig1-dev \
17+
gdal-bin \
18+
libgdal-dev \
19+
libcairo2-dev \
20+
libxt-dev \
21+
libnlopt-dev \
22+
mesa-common-dev \
23+
libglu1-mesa-dev \
24+
libx11-dev \
25+
&& rm -rf /var/lib/apt/lists/*
26+
27+
# install r packages
28+
RUN Rscript -e 'install.packages(c("ggplot2","gridExtra","label.switching","tidyr","remotes","colourpicker","DT","highcharter","htmlwidgets","magrittr","markdown","RColorBrewer","shiny","shinyAce","shinyBS","shinythemes","shinyWidgets","viridisLite","writexl"),repos = "http://cran.us.r-project.org");'
29+
30+
# install pophelper package from github
31+
RUN Rscript -e 'remotes::install_github("royfrancis/pophelper")'
32+
RUN Rscript -e 'remotes::install_github("royfrancis/pophelperShiny")'
33+
34+
RUN cd /srv/shiny-server && \
35+
ln -s /usr/local/lib/R/site-library/pophelperShiny/app && \
36+
sudo chown -R shiny:shiny /srv/shiny-server/app
37+
38+
EXPOSE 3838
39+
40+
CMD ["R", "-e", "shiny::runApp('/srv/shiny-server/app/', host = '0.0.0.0', port = 8787)"]

‎NAMESPACE

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,83 @@
11
# Generated by roxygen2: do not edit by hand
22

33
export(runPophelper)
4+
import(ggplot2)
5+
import(highcharter)
6+
import(magrittr)
7+
import(pophelper)
48
importFrom(DT,dataTableOutput)
59
importFrom(DT,renderDataTable)
610
importFrom(RColorBrewer,brewer.pal)
711
importFrom(colourpicker,colourInput)
812
importFrom(colourpicker,updateColourInput)
913
importFrom(gridExtra,grid.arrange)
1014
importFrom(htmlwidgets,JS)
15+
importFrom(shiny,HTML)
16+
importFrom(shiny,Progress)
17+
importFrom(shiny,actionButton)
18+
importFrom(shiny,br)
19+
importFrom(shiny,checkboxInput)
20+
importFrom(shiny,column)
21+
importFrom(shiny,conditionalPanel)
22+
importFrom(shiny,div)
23+
importFrom(shiny,downloadButton)
24+
importFrom(shiny,downloadHandler)
25+
importFrom(shiny,eventReactive)
26+
importFrom(shiny,fileInput)
27+
importFrom(shiny,fluidPage)
28+
importFrom(shiny,fluidRow)
29+
importFrom(shiny,h1)
30+
importFrom(shiny,h2)
31+
importFrom(shiny,h3)
32+
importFrom(shiny,h4)
33+
importFrom(shiny,h5)
34+
importFrom(shiny,h6)
35+
importFrom(shiny,helpText)
36+
importFrom(shiny,hr)
37+
importFrom(shiny,htmlOutput)
38+
importFrom(shiny,imageOutput)
39+
importFrom(shiny,incProgress)
40+
importFrom(shiny,inputPanel)
41+
importFrom(shiny,isolate)
42+
importFrom(shiny,mainPanel)
43+
importFrom(shiny,numericInput)
44+
importFrom(shiny,observe)
45+
importFrom(shiny,observeEvent)
46+
importFrom(shiny,reactive)
47+
importFrom(shiny,reactiveValues)
48+
importFrom(shiny,renderImage)
49+
importFrom(shiny,renderPlot)
50+
importFrom(shiny,renderPrint)
51+
importFrom(shiny,renderTable)
52+
importFrom(shiny,renderText)
53+
importFrom(shiny,renderUI)
54+
importFrom(shiny,req)
55+
importFrom(shiny,runApp)
56+
importFrom(shiny,selectInput)
57+
importFrom(shiny,selectizeInput)
58+
importFrom(shiny,setProgress)
59+
importFrom(shiny,sidebarLayout)
60+
importFrom(shiny,sidebarPanel)
61+
importFrom(shiny,sliderInput)
62+
importFrom(shiny,submitButton)
63+
importFrom(shiny,tabPanel)
64+
importFrom(shiny,tabsetPanel)
65+
importFrom(shiny,tagList)
66+
importFrom(shiny,tags)
67+
importFrom(shiny,textInput)
68+
importFrom(shiny,titlePanel)
69+
importFrom(shiny,uiOutput)
70+
importFrom(shiny,updateActionButton)
71+
importFrom(shiny,updateCheckboxInput)
72+
importFrom(shiny,updateNumericInput)
73+
importFrom(shiny,updateSelectInput)
74+
importFrom(shiny,updateSelectizeInput)
75+
importFrom(shiny,updateSliderInput)
76+
importFrom(shiny,updateTextInput)
77+
importFrom(shiny,validate)
78+
importFrom(shiny,verbatimTextOutput)
79+
importFrom(shiny,wellPanel)
80+
importFrom(shiny,withProgress)
1181
importFrom(shinyAce,aceEditor)
1282
importFrom(shinyBS,bsTooltip)
1383
importFrom(shinyWidgets,pickerInput)

‎NEWS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
pophelperShiny 2.1.1
2+
====================
3+
28-Dec-2020
4+
* Based on pophelper_v2.3.1
5+
* Error bars in first plot of Evanno method showed max/min rather than SD. Fixed to show SD.
6+
* Legend is now sorted numerically
7+
* Better CRAN compatibility
8+
19
pophelperShiny 2.1.0
210
====================
311
* 15-Aug-2019

‎inst/app/versions.md renamed to ‎NEWS.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1-
#### v2.1.0
1+
# pophelperShiny 2.1.1
2+
3+
* 28-Dec-2020
4+
* Based on pophelper_v2.3.1
5+
* Error bars in first plot of Evanno method showed max/min rather than SD. Fixed to show SD.
6+
* Legend is now sorted numerically
7+
* Better CRAN compatibility
8+
9+
# pophelperShiny 2.1.0
210

311
* 15-Aug-2019
412
* R dependency set to >=3.5.0
513
* Based on pophelper_v2.3.0
614
* Added cluster colour palette picker with palette image
715
* 'Colorbrewer' option removed and added to regular colours
816
* Added R package **shinyWidgets**
9-
* Runs selection for plots do not maintain selection order
1017
* Runs selection options using datatable widget or picker widget
1118
* Excel dependency changed from **xlsx** to **writexl**
1219
* Dependency on CLUMPP executable removed
1320
* Align function added to align clusters within and across K
1421
* Temporary files and plots written in temporary directory
1522

16-
#### v2.0.1
23+
# pophelperShiny 2.0.1
1724

1825
* 17-Sep-2018
1926
* Removed dependency on **fields** package
2027
* Temporary directory is set to OS default
2128

22-
#### v2.0.0
29+
# pophelperShiny 2.0.0
2330

2431
* 13-Aug-2018
2532
* First v2 release
26-
27-
28-
29-
30-

‎R/script.R

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
#' library(pophelperShiny)
1313
#' runPophelper()
1414
#' }
15+
#' @import ggplot2
16+
#' @import highcharter
17+
#' @import magrittr
18+
#' @import pophelper
19+
#' @importFrom shiny actionButton br checkboxInput column conditionalPanel div downloadButton downloadHandler eventReactive fileInput fluidRow fluidPage h1 h2 h3 h4 h5 h6 helpText hr HTML htmlOutput imageOutput incProgress inputPanel isolate mainPanel numericInput observe observeEvent Progress reactive reactiveValues renderImage renderPlot renderPrint renderTable renderText renderUI req runApp selectInput selectizeInput setProgress sidebarLayout sidebarPanel sliderInput submitButton tabPanel tabsetPanel tags tagList textInput titlePanel uiOutput updateActionButton updateCheckboxInput updateNumericInput updateSelectInput updateSelectizeInput updateSliderInput updateTextInput validate verbatimTextOutput wellPanel withProgress
1520
#' @importFrom colourpicker colourInput updateColourInput
1621
#' @importFrom DT renderDataTable dataTableOutput
1722
#' @importFrom gridExtra grid.arrange
@@ -34,3 +39,4 @@ runPophelper <- function(display.mode="normal",launch.browser=TRUE,...) {
3439

3540
shiny::runApp(appDir,display.mode=display.mode,launch.browser=launch.browser,...)
3641
}
42+

0 commit comments

Comments
 (0)