Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add polyRAD #94

Merged
merged 57 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
2e0d6f5
Update test-diversity.R
alex-sandercock Dec 22, 2024
13fe33b
Update test-diversity.R
alex-sandercock Dec 22, 2024
c55733a
Merge pull request #89 from Breeding-Insight/development
alex-sandercock Dec 22, 2024
77d0c2a
Update README.md
alex-sandercock Dec 28, 2024
e20350e
Update README.md
alex-sandercock Dec 28, 2024
1558f84
Merge pull request #90 from Breeding-Insight/main
Cristianetaniguti Jan 2, 2025
02618e4
Merge pull request #21 from Breeding-Insight/cris_bridge
Cristianetaniguti Jan 2, 2025
430022a
add citation
Cristianetaniguti Jan 2, 2025
cc77e82
rm defunct code + add missing files warnings
Cristianetaniguti Jan 2, 2025
935995b
minor reviews
Cristianetaniguti Jan 6, 2025
e04118b
review PCA
Cristianetaniguti Jan 6, 2025
5ae0bd7
review DAPC
Cristianetaniguti Jan 6, 2025
aba12d9
review gwas tab
Cristianetaniguti Jan 6, 2025
5db7506
finish reviews
Cristianetaniguti Jan 6, 2025
b01ac8b
add Dockerfile #92
Cristianetaniguti Jan 7, 2025
2fcf73f
change ui
Cristianetaniguti Jan 28, 2025
6f865a8
Update mod_Filtering.R
alex-sandercock Jan 29, 2025
8503f5b
Update mod_GS.R
alex-sandercock Jan 29, 2025
38cd49d
Update mod_GSAcc.R
alex-sandercock Jan 29, 2025
930c261
Update mod_PCA.R
alex-sandercock Jan 29, 2025
198ed76
Update mod_dapc.R
alex-sandercock Jan 29, 2025
e50b153
Update mod_diversity.R
alex-sandercock Jan 29, 2025
91e5ffc
Update mod_gwas.R
alex-sandercock Jan 29, 2025
39b1634
rotate axis separated graphics
Cristianetaniguti Jan 30, 2025
b584171
Merge branch 'main' of https://github.com/Cristianetaniguti/Genomics_…
Cristianetaniguti Jan 30, 2025
fbfe29a
auto update of PCA Color Variable
Cristianetaniguti Jan 30, 2025
a1bcaea
Merge pull request #22 from Cristianetaniguti/off_targets
Cristianetaniguti Jan 30, 2025
f39b4a4
Add SVG option
alex-sandercock Jan 31, 2025
5922eaa
add MADC to VCF conversions
Cristianetaniguti Jan 31, 2025
bd326be
back config
Cristianetaniguti Jan 31, 2025
3dc7b6b
Added PolyRAD
alex-sandercock Feb 4, 2025
695941b
Updated Dosage UI
alex-sandercock Feb 4, 2025
c5d8318
Added packages
alex-sandercock Feb 4, 2025
7514914
add merge MADC function
Cristianetaniguti Feb 4, 2025
2f20bcc
polyRAD VCF Fix
alex-sandercock Feb 5, 2025
e0ff850
polyRAD VCF fix
alex-sandercock Feb 5, 2025
cb2dc31
Fix Missing String
alex-sandercock Feb 5, 2025
de129cb
Update polyRAD models
alex-sandercock Feb 6, 2025
69f56fc
Updated DESCRIPTION
alex-sandercock Feb 6, 2025
1b19bad
Merge pull request #23 from Cristianetaniguti/merge
Cristianetaniguti Feb 7, 2025
8d2730c
Merge branch 'main' into svg_add
Cristianetaniguti Feb 7, 2025
24f3815
rm MADC add dependency
Cristianetaniguti Feb 7, 2025
0209603
Merge branch 'main' into svg_add
Cristianetaniguti Feb 7, 2025
ae707ee
fix install
Cristianetaniguti Feb 7, 2025
344e239
Merge pull request #24 from Breeding-Insight/svg_add
Cristianetaniguti Feb 7, 2025
89d08e5
Merge pull request #95 from Cristianetaniguti/main
Cristianetaniguti Feb 7, 2025
cb52aa7
add required symbol
Cristianetaniguti Feb 7, 2025
c28f270
wait for BIGr update
Cristianetaniguti Feb 7, 2025
872cc63
add missing parameters
Cristianetaniguti Feb 7, 2025
993c5d0
Merge pull request #96 from Cristianetaniguti/main
alex-sandercock Feb 10, 2025
5c799d9
Update R Version (4.4)
alex-sandercock Feb 11, 2025
50adbae
Merge pull request #25 from Breeding-Insight/svg_add
Cristianetaniguti Feb 12, 2025
31333cf
update help
Cristianetaniguti Feb 12, 2025
95042bc
Merge pull request #98 from Cristianetaniguti/main
Cristianetaniguti Feb 12, 2025
06f2c6d
rm old check
Cristianetaniguti Feb 12, 2025
43658e6
Merge pull request #99 from Cristianetaniguti/main
Cristianetaniguti Feb 12, 2025
0ded358
Help Page
alex-sandercock Feb 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
Expand Down
9 changes: 7 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ License: Apache License (== 2.0)
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.2
Depends: R (>= 4.4.0)
biocViews:
Imports:
vcfR (>= 1.15.0),
Expand All @@ -35,6 +36,8 @@ Imports:
DT,
dplyr,
bs4Dash,
polyRAD,
R.utils,
golem,
ggplot2,
purrr,
Expand Down Expand Up @@ -62,9 +65,11 @@ Imports:
config,
Matrix,
matrixcalc,
markdown
markdown,
Rsamtools
Remotes:
github::jendelman/GWASpoly,
github::Breeding-Insight/BIGr
github::Breeding-Insight/BIGr,
bioc::Rsamtools
Suggests:
testthat
47 changes: 47 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
FROM rocker/r-ver:4.4.2
RUN apt-get update && apt-get install -y cmake libz-dev libcurl4-openssl-dev libssl-dev
RUN R -e 'install.packages("remotes")'
RUN Rscript -e 'remotes::install_version("adegenet",upgrade="never", version = "2.1.10")'
RUN Rscript -e 'remotes::install_version("curl",upgrade="never", version = "6.0.1")'
RUN Rscript -e 'remotes::install_version("DT",upgrade="never", version = "0.33")'
RUN Rscript -e 'remotes::install_version("dplyr",upgrade="never", version = "1.1.4")'
RUN Rscript -e 'remotes::install_version("vcfR",upgrade="never", version = "1.15.0")'
RUN Rscript -e 'remotes::install_version("ggplot2",upgrade="never", version = "3.5.1")'
RUN Rscript -e 'remotes::install_version("tidyr",upgrade="never", version = "1.3.1")'
RUN Rscript -e 'remotes::install_version("curl",upgrade="never", version = "6.0.1")'
RUN Rscript -e 'remotes::install_version("shiny",upgrade="never", version = "1.9.1")'
RUN Rscript -e 'remotes::install_version("config",upgrade="never", version = "0.3.2")'
RUN Rscript -e 'remotes::install_version("bs4Dash",upgrade="never", version = "2.3.4")'
RUN Rscript -e 'remotes::install_version("golem",upgrade="never", version = "0.5.1")'
RUN Rscript -e 'remotes::install_version("purrr",upgrade="never", version = "1.0.2")'
RUN Rscript -e 'remotes::install_version("markdown",upgrade="never", version = "1.13")'
RUN Rscript -e 'remotes::install_version("scales",upgrade="never", version = "1.3.0")'
RUN Rscript -e 'remotes::install_version("plotly",upgrade="never", version = "4.10.4")'
RUN Rscript -e 'remotes::install_version("shinyWidgets",upgrade="never", version = "0.8.7")'
RUN Rscript -e 'remotes::install_version("shinyjs",upgrade="never", version = "2.1.0")'
RUN Rscript -e 'remotes::install_version("shinydisconnect",upgrade="never", version = "0.1.1")'
RUN Rscript -e 'remotes::install_version("shinyalert",upgrade="never", version = "3.1.0")'
RUN Rscript -e 'remotes::install_version("stringr",upgrade="never", version = "1.5.1")'
RUN Rscript -e 'remotes::install_version("updog",upgrade="never", version = "2.1.5")'
RUN Rscript -e 'remotes::install_version("AGHmatrix",upgrade="never", version = "2.1.4")'
RUN Rscript -e 'remotes::install_version("factoextra",upgrade="never", version = "1.0.7")'
RUN Rscript -e 'remotes::install_version("httr",upgrade="never", version = "1.4.7")'
RUN Rscript -e 'remotes::install_version("future",upgrade="never", version = "1.34.0")'
RUN Rscript -e 'remotes::install_version("shinycssloaders",upgrade="never", version = "1.1.0")'
RUN Rscript -e 'remotes::install_version("RColorBrewer",upgrade="never", version = "1.1.3")'
RUN Rscript -e 'remotes::install_version("tibble",upgrade="never", version = "3.2.1")'
RUN Rscript -e 'remotes::install_version("rrBLUP",upgrade="never", version = "4.6.3")'
RUN Rscript -e 'remotes::install_version("MASS",upgrade="never", version = "7.3.60.2")'
RUN Rscript -e 'remotes::install_version("Matrix",upgrade="never", version = "1.7.0")'
RUN Rscript -e 'remotes::install_version("matrixcalc",upgrade="never", version = "1.0.6")'
RUN Rscript -e 'remotes::install_github("Breeding-Insight/BIGr",upgrade="never")'
RUN Rscript -e 'remotes::install_github("jendelman/GWASpoly",upgrade="never")'

RUN mkdir /build_zone
ADD . /build_zone
WORKDIR /build_zone
RUN R -e 'remotes::install_local(upgrade="never")'
RUN rm -rf /build_zone
EXPOSE 80
CMD R -e "options('shiny.port'=80,shiny.host='0.0.0.0');BIGapp::run_app()"

8 changes: 8 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ import(GWASpoly)
import(dplyr)
import(ggplot2)
import(grDevices)
import(polyRAD)
import(rrBLUP)
import(shiny)
import(shinyWidgets)
import(shinydisconnect)
import(tibble)
import(tidyr)
import(updog)
import(utils)
Expand All @@ -17,13 +20,16 @@ importClassesFrom(adegenet,genlight)
importFrom(AGHmatrix,Amatrix)
importFrom(AGHmatrix,Gmatrix)
importFrom(AGHmatrix,Hmatrix)
importFrom(BIGr,flip_dosage)
importFrom(BIGr,updog2vcf)
importFrom(DT,DTOutput)
importFrom(DT,datatable)
importFrom(DT,renderDT)
importFrom(MASS,ginv)
importFrom(Matrix,nearPD)
importFrom(R.utils,gunzip)
importFrom(RColorBrewer,brewer.pal)
importFrom(Rsamtools,bgzip)
importFrom(adegenet,"pop<-")
importFrom(adegenet,dapc)
importFrom(adegenet,find.clusters)
Expand Down Expand Up @@ -124,4 +130,6 @@ importFrom(stats,setNames)
importFrom(stringr,str_split)
importFrom(tibble,rownames_to_column)
importFrom(vcfR,extract.gt)
importFrom(vcfR,is.biallelic)
importFrom(vcfR,read.vcfR)
importFrom(vcfR,write.vcf)
Loading
Loading