Skip to content

Commit

Permalink
Merge pull request #85 from saezlab/main
Browse files Browse the repository at this point in the history
Main has github action required changed
  • Loading branch information
ChristinaSchmidt1 authored Oct 28, 2024
2 parents e24c93d + dcb1387 commit 0542660
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 12 deletions.
22 changes: 14 additions & 8 deletions .github/workflows/Build_gh-pages.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples and adapted
on:
push:
branches: [main, master]
branches: [main]

name: Build_gh-pages.yml #shown when action is run

jobs:
pkgdown:
runs-on: ubuntu-latest
env:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} #to push results to gh-pages branch!
steps: #Series of steps that is executed sequencially: https://github.com/r-lib/actions/
steps: #Series of steps that is executed sequencially: https://github.com/r-lib/actions/
- uses: actions/checkout@v4 # goes to gh-pages branch to work there

- uses: r-lib/actions/setup-pandoc@v2 #installs pandoc
Expand All @@ -22,11 +22,17 @@ jobs:

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown
extra-packages: any::pkgdown, local::.
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
run: |
git config --local user.name "GitHub Actions"
git config --local user.email "[email protected]"
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs
8 changes: 8 additions & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,24 @@ Depends:
R (>= 4.4.1),
ggplot2 (>= 3.3.5)
Imports:
clusterProfiler,
cosmosR,
dplyr,
EnhancedVolcano,
factoextra,
ggbeeswarm,
ggfortify,
ggplot2,
ggupset,
ggVennDiagram,
grid,
gridExtra,
gtools,
hash,
inflection,
kableExtra,
KEGGREST,
limma,
logger,
magrittr,
OmnipathR,
Expand Down
8 changes: 4 additions & 4 deletions R/Processing.R
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ PoolEstimation <- function(InputData,
labs(title="CV for metabolites of Pool samples",x="Coefficient of variation (CV%)", y = "Frequency")+
theme_classic()))

HistCV_Sized <- MetaProViz:::plotGrob_Processing(InputPlot = HistCV, PlotName= "CV for metabolites of Pool samples", , PlotType= "Hist")
HistCV_Sized <- MetaProViz:::plotGrob_Processing(InputPlot = HistCV, PlotName= "CV for metabolites of Pool samples", PlotType= "Hist")
PlotList [["Histogram_CV-PoolSamples"]] <- HistCV_Sized

# 2. ViolinPlot of CVs
Expand All @@ -503,7 +503,7 @@ PoolEstimation <- function(InputData,
labs(title="CV for metabolites of Pool samples",x="Metabolites", y = "Coefficient of variation (CV%)")+
theme_classic())

ViolinCV_Sized <- MetaProViz:::plotGrob_Processing(InputPlot = ViolinCV, PlotName= "CV for metabolites of Pool samples", , PlotType= "Violin")
ViolinCV_Sized <- MetaProViz:::plotGrob_Processing(InputPlot = ViolinCV, PlotName= "CV for metabolites of Pool samples", PlotType= "Violin")

PlotList [["ViolinPlot_CV-PoolSamples"]] <- ViolinCV_Sized

Expand Down Expand Up @@ -883,8 +883,8 @@ TICNorm <-function(InputData, SettingsFile_Sample, TIC){

#Combine Plots
dev.new()
norm_plots <- suppressWarnings(gridExtra::grid.arrange(RLA_data_raw_Sized+ theme(axis.text.x = element_text(angle = 90, hjust = 1))+ theme(legend.position = "none"),
RLA_data_norm_Sized+ theme(axis.text.x = element_text(angle = 90, hjust = 1))+ theme(legend.position = "none"),
norm_plots <- suppressWarnings(gridExtra::grid.arrange(RLA_data_raw+ theme(axis.text.x = element_text(angle = 90, hjust = 1))+ theme(legend.position = "none"),
RLA_data_norm+ theme(axis.text.x = element_text(angle = 90, hjust = 1))+ theme(legend.position = "none"),
ncol = 2))
dev.off()
norm_plots <- ggplot2::ggplot() +theme_minimal()+ annotation_custom(norm_plots)
Expand Down

0 comments on commit 0542660

Please sign in to comment.