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

1.1.13 #254

Merged
merged 172 commits into from
Jul 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
0f06727
add bioc information
marouenbg Nov 23, 2021
e4cb00c
Merge pull request #232 from marouenbg/add-bioc
marouenbg Nov 23, 2021
768a198
update website
marouenbg Nov 24, 2021
809e28b
Merge pull request #233 from marouenbg/update-desc
marouenbg Nov 24, 2021
d6d95a1
add crane and docs
marouenbg Dec 21, 2021
14538b2
update crane
marouenbg Dec 21, 2021
7ed368a
update worflow
marouenbg Dec 21, 2021
baa4bee
Merge pull request #235 from marouenbg/add-crane
marouenbg Dec 22, 2021
311b3d2
update crane
marouenbg Jan 29, 2022
58b38e4
update workflows
marouenbg Jan 29, 2022
0f665a3
update workflows
marouenbg Jan 29, 2022
764c899
update workfolw
marouenbg Jan 29, 2022
7180ebe
update workfolw
marouenbg Jan 29, 2022
5076cf7
update workfolw
marouenbg Jan 29, 2022
18af94d
update workfolw
marouenbg Jan 29, 2022
0f09c0d
Update main.yml
marouenbg Jan 29, 2022
7af5998
Update main.yml
marouenbg Jan 29, 2022
14e87e9
Update main.yml
marouenbg Jan 29, 2022
7a9c0d0
Merge pull request #236 from marouenbg/fix-crane-alpaca
marouenbg Jan 30, 2022
62b60af
fix lioness py
marouenbg Feb 15, 2022
f89c636
udpate lioness in R
marouenbg Feb 15, 2022
23ec0ff
include calculations python
marouenbg Feb 16, 2022
c8383f6
update panda rm missing
marouenbg Feb 17, 2022
a844667
update panda
marouenbg Feb 17, 2022
374216b
update lioness joblib
marouenbg Feb 17, 2022
923b87b
revert commits
marouenbg Feb 17, 2022
79b030b
fix conflcit
marouenbg Feb 17, 2022
c56ce28
ALPACA fix to NAs in community assignement
marouenbg Feb 17, 2022
b1b7576
version bump
marouenbg Feb 18, 2022
7b17419
Merge pull request #238 from marouenbg/upgrade-alpaca
marouenbg Feb 18, 2022
8c873db
revert lioness
marouenbg Feb 18, 2022
4cd7613
update crane with alpaca changes
marouenbg Feb 18, 2022
9f464ef
update lioness
marouenbg Feb 18, 2022
973264d
Merge pull request #239 from marouenbg/update-crane
marouenbg Feb 18, 2022
ba6fc1c
update lioness python
marouenbg Feb 18, 2022
738fbd6
fix test
marouenbg Feb 18, 2022
58ce20c
update workflows
marouenbg Feb 18, 2022
57e0d55
put back github actions
marouenbg Feb 19, 2022
2dcccc6
Merge pull request #237 from marouenbg/fix-panda-py
marouenbg Feb 19, 2022
ed3615d
Fixed typo
Feb 22, 2022
40659aa
Added LIONESS-pearson option + unit test
Feb 25, 2022
9f1d4dc
Merge branch 'kate-dev' of https://github.com/katehoffshutta/netZooR …
Feb 25, 2022
f0eaad7
changed param labels in LIONESS example
Feb 25, 2022
3a21cca
updated docs for lioness() function
Feb 28, 2022
f27d51b
Update main.yml
marouenbg Mar 1, 2022
ac02cff
Merge branch 'devel' into kate-dev
marouenbg Mar 1, 2022
27e77b7
Update main.yml
marouenbg Mar 1, 2022
d184ba7
Merge pull request #241 from katehoffshutta/kate-dev
marouenbg Mar 1, 2022
323d058
Update DESCRIPTION
marouenbg Jun 10, 2022
4a3fdde
fix crane issue #240
marouenbg Jun 16, 2022
c7764ef
Merge pull request #244 from marouenbg/fix-crane
marouenbg Jun 16, 2022
2340eaf
expanded PANDA and LIONESS description
katehoffshutta Jun 23, 2022
eb9b13e
update crane fix
marouenbg Jun 24, 2022
2a84467
added ALPACA, EGRET, and OTTER descriptions
katehoffshutta Jun 24, 2022
98e6e3f
Update README.md
katehoffshutta Jun 24, 2022
ad57350
Merge pull request #245 from marouenbg/fix-crane-2
marouenbg Jun 24, 2022
a0194ee
typo in na.rm
marouenbg Jun 27, 2022
6d7a175
Merge pull request #246 from marouenbg/fix-crane-3
marouenbg Jun 27, 2022
077b6cd
update workflow
marouenbg Jun 27, 2022
e7c4692
update workflow2
marouenbg Jun 27, 2022
70f6d81
fix-actions-3
marouenbg Jun 27, 2022
c90c77e
add r lib v2
marouenbg Jun 27, 2022
31674f0
add r lib v2
marouenbg Jun 27, 2022
5129e1c
update condor test
marouenbg Jun 28, 2022
de7a516
update condor test
marouenbg Jun 28, 2022
de5b323
update condor test
marouenbg Jun 28, 2022
5c469c1
update condor test
marouenbg Jun 28, 2022
534a568
show testthat output
marouenbg Jun 28, 2022
fc9ecc4
add pandoc and use cache
marouenbg Jun 28, 2022
d748cd9
use built in check
marouenbg Jun 28, 2022
1836947
use built in check
marouenbg Jun 28, 2022
cc7fc1e
update actions with built in check
marouenbg Jun 28, 2022
702a3e8
bump version
marouenbg Jun 28, 2022
115b644
use built in coverage
marouenbg Jun 28, 2022
912b3b3
use built in coverage
marouenbg Jun 28, 2022
9e415ff
remove sudo
marouenbg Jun 28, 2022
f2b77ac
update actions
marouenbg Jun 28, 2022
41d1d89
update actions
marouenbg Jun 28, 2022
3fa9115
removed sudo from actions
marouenbg Jun 28, 2022
75d7ea8
ugrade to R42
marouenbg Jun 28, 2022
c1cac6c
remove virtualenv
marouenbg Jun 28, 2022
1d93ccd
remove virtualenv
marouenbg Jun 28, 2022
b505ada
remove virtualenv
marouenbg Jun 28, 2022
4336aa6
modify condor test
marouenbg Jun 29, 2022
defaf1e
update condor test
marouenbg Jun 29, 2022
e7e7ef6
update condor test
marouenbg Jun 29, 2022
563e20d
adding retiucualte to covr
marouenbg Jun 29, 2022
ba53689
adding retiucualte to covr
marouenbg Jun 29, 2022
01944de
add panda test to coverignore
marouenbg Jun 29, 2022
d2b579e
update actions
marouenbg Jun 29, 2022
48235bb
remove lioness tests from coverage
marouenbg Jun 29, 2022
6fdd4d5
remove lioness tests from coverage
marouenbg Jun 29, 2022
2b376d1
added MONSTER and SAMBAR
katehoffshutta Jun 29, 2022
c43b11a
Merge branch 'master' of https://github.com/katehoffshutta/netZooR
katehoffshutta Jun 29, 2022
0fd74ec
remove lionessR test
marouenbg Jun 29, 2022
7757acb
Added CONDOR and YARN
katehoffshutta Jun 29, 2022
8cf70b4
Update README.md
katehoffshutta Jun 29, 2022
b79e291
Merge branch 'devel' into master
marouenbg Jun 29, 2022
4139e26
put back otter in rbuild
marouenbg Jun 29, 2022
66554cf
remove condor test
marouenbg Jun 29, 2022
4b00d1a
remove condor test
marouenbg Jun 30, 2022
db9927f
remove lioness docs
marouenbg Jun 30, 2022
74ddd95
add lioness to buildingore
marouenbg Jun 30, 2022
f53d822
donttest lionesss
marouenbg Jun 30, 2022
a5023fe
remove coverage from ubuntu test
marouenbg Jun 30, 2022
48f0fe2
remove rbuilignore
marouenbg Jun 30, 2022
60d2611
update rbuildignore
marouenbg Jun 30, 2022
8ed5634
update rbuildignore
marouenbg Jun 30, 2022
23592bd
update rbuildignore
marouenbg Jun 30, 2022
94495b3
update rbuildignore
marouenbg Jun 30, 2022
9ba4746
update rbuildignore
marouenbg Jun 30, 2022
e1befc3
add back buildignore
marouenbg Jun 30, 2022
1add3e6
add back buildignore
marouenbg Jun 30, 2022
dbcaa6d
add back buildignore
marouenbg Jun 30, 2022
08f570c
add back buildignore
marouenbg Jun 30, 2022
b61e582
add back buildignore
marouenbg Jun 30, 2022
9437c40
add back buildignore
marouenbg Jun 30, 2022
29d01fa
add back buildignore
marouenbg Jun 30, 2022
4c5ea04
add back buildignore
marouenbg Jun 30, 2022
5e48772
add back buildignore
marouenbg Jun 30, 2022
1a22c9f
add back buildignore
marouenbg Jun 30, 2022
52c1c11
put back tests
marouenbg Jun 30, 2022
636c803
add padanedge diff test
marouenbg Jun 30, 2022
7ad152e
add back egeret test
marouenbg Jun 30, 2022
93275c7
add monster test
marouenbg Jun 30, 2022
c043c12
fix monster test
marouenbg Jul 1, 2022
b0996a8
tolerance in expect equal
marouenbg Jul 1, 2022
2461c73
tolerance in expect equal
marouenbg Jul 1, 2022
dc0fbaf
tolerance in expect equal
marouenbg Jul 1, 2022
7ed40ef
tolerance in expect equal
marouenbg Jul 1, 2022
919cfd7
add sourceppi
marouenbg Jul 1, 2022
59c44a9
fixed PANDA tests
marouenbg Jul 1, 2022
6be7455
modify panda test
marouenbg Jul 5, 2022
c0bdbfa
update lioness test
marouenbg Jul 5, 2022
13aa71d
fix expect message
marouenbg Jul 5, 2022
cfbf975
update tests
marouenbg Jul 5, 2022
3ccf096
update tests
marouenbg Jul 5, 2022
865e389
update tests
marouenbg Jul 5, 2022
e0cf2ba
update tests
marouenbg Jul 5, 2022
fa29d0a
update tests
marouenbg Jul 5, 2022
e5f9d14
update tests
marouenbg Jul 5, 2022
f5567ab
reduced lioness test data
marouenbg Jul 6, 2022
003c638
reduced lioness test data
marouenbg Jul 6, 2022
8b51a84
reduced lioness test data
marouenbg Jul 6, 2022
aee2581
reduced lioness test data
marouenbg Jul 6, 2022
9e3e333
reduce test size
marouenbg Jul 6, 2022
57cd613
Merge pull request #247 from marouenbg/fix-actions
marouenbg Jul 6, 2022
29a2cd7
Merge pull request #248 from katehoffshutta/master
marouenbg Jul 6, 2022
3d7ab30
updating bioc (#250)
marouenbg Jul 7, 2022
15c4d27
Merge branch 'master' into devel
marouenbg Jul 7, 2022
0a81184
update citation
marouenbg Jul 7, 2022
b84122e
update citation
marouenbg Jul 7, 2022
3e50cbb
Merge branch 'master' into devel
marouenbg Jul 7, 2022
8008152
Update README.md
marouenbg Jul 15, 2022
2bf7181
Update README.md
marouenbg Jul 15, 2022
0f0b29f
Update main.yml
marouenbg Jul 15, 2022
78d2e76
Update main.yml
marouenbg Jul 15, 2022
212c893
Update .Rbuildignore
marouenbg Jul 15, 2022
210ae58
Update .Rbuildignore
marouenbg Jul 19, 2022
1217750
update lioness test
marouenbg Jul 19, 2022
b07f2aa
removed two last lioness tests
marouenbg Jul 19, 2022
8cc58ff
removed two last lioness tests
marouenbg Jul 19, 2022
38ad4e3
removed two last lioness tests
marouenbg Jul 19, 2022
e2d5a30
no saving of lioness networks
marouenbg Jul 19, 2022
a992531
no saving of lioness networks
marouenbg Jul 19, 2022
3a2d89e
no saving of lioness networks
marouenbg Jul 19, 2022
3ba0841
no saving of lioness networks
marouenbg Jul 20, 2022
fa457ae
update lioness test
marouenbg Jul 20, 2022
1302e6b
lower sizeof test
marouenbg Jul 20, 2022
e31bddc
update test data
marouenbg Jul 20, 2022
4c63d99
update test data
marouenbg Jul 20, 2022
6a1d8c5
update test data
marouenbg Jul 20, 2022
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
7 changes: 7 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ on:
jobs:
build:
runs-on: ${{ matrix.os }}
timeout-minutes: 300
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
Expand Down Expand Up @@ -56,6 +57,12 @@ jobs:
website
coverage

- name: Install blas/lapack
run: |
La_library()
extSoftVersion()["BLAS"]
shell: Rscript {0}

- name: Install reticulate
run: |
library("reticulate")
Expand Down
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Package: netZooR
Type: Package
Title: Unified methods for the inference and analysis of gene regulatory networks
Version: 1.1.12
Version: 1.1.14
Date: 2022-07-07
Authors@R: c(person("Marouen", "Ben Guebila",
email = "benguebila@hsph.harvard.edu", role = c("aut","cre"), comment = c(ORCID = "0000-0001-5934-966X")),
Expand All @@ -18,6 +19,7 @@ Authors@R: c(person("Marouen", "Ben Guebila",
email = "",role = "aut", comment = c(ORCID = "0000-0003-4979-5871")),
person("Kate", "Shutta",
email = "",role = "ctb", comment = c(ORCID = "0000-0003-0402-3771")))
Maintainer: Marouen Ben Guebila <benguebila@hsph.harvard.edu>
Description: netZooR unifies the implementations of several Network Zoo methods (netzoo, netzoo.github.io) into a single package by creating interfaces between network inference and network analysis methods. Currently, the package has 3 methods for network inference including PANDA and its optimized implementation OTTER (network reconstruction using mutliple lines of biological evidence), LIONESS (single-sample network inference), and EGRET (genotype-specific networks). Network analysis methods include CONDOR (community detection), ALPACA (differential community detection), CRANE (significance estimation of differential modules), MONSTER (estimation of network transition states). In addition, YARN allows to process gene expresssion data for tissue-specific analyses and SAMBAR infers missing mutation data based on pathway information.
Depends: R (>= 4.1.0),
igraph,
Expand Down Expand Up @@ -75,4 +77,4 @@ VignetteEngine: knitr
VignetteBuilder: knitr
RoxygenNote: 7.1.2
BugReports: https://github.com/netZoo/netZooR/issues
URL: https://github.com/netZoo/netZooR, https://netzoo.github.io/
URL: https://github.com/netZoo/netZooR, https://netzoo.github.io/
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CHANGES IN VERSION 1.0.11
CHANGES IN VERSION 1.1.12
--------------------------

o Reactivated unit tests for Ubuntu GitHub actions.
Expand Down
6 changes: 4 additions & 2 deletions R/LIONESS.R
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,10 @@ lionessPy <- function(expr_file, motif_file=NULL, ppi_file=NULL, computing="cpu"
# create an instance named "lioness_obj" of Lioness Class.
# when save_single_network = TRUE
if(save_single_network==TRUE){
py_run_string(paste("lioness_obj = Lioness(panda_obj", " , " , "computing='", computing, "' , ","start=", start_sample," , ", "end=" ,end_sample, " , " ,'save_single_network= True', " , ", "save_dir='", save_dir, "' , " , "save_fmt='" , save_fmt, "' )",sep = "" ))
} else {py_run_string(paste("lioness_obj = Lioness(panda_obj", " , " , "computing='", computing, "' , ","start=", start_sample," , ", "end=" ,end_sample, ")",sep = "" ))}
py_run_string(paste("lioness_obj = Lioness(panda_obj", " , " , "computing='", computing, "' , ","start=", start_sample," , ", "end=" ,end_sample, " , ", "save_dir='", save_dir, "' , " , "save_fmt='" , save_fmt, "' )",sep = "" ))
}else{
py_run_string(paste("lioness_obj = Lioness(panda_obj", " , " , "computing='", computing, "' , ","start=", start_sample," , ", "end=" ,end_sample, ")",sep = "" ))
}

# retrieve the "total_lioness_network" attribute of instance "lionesss_obj"
py_run_string("lioness_network = lioness_obj.export_lioness_results",local = FALSE, convert = TRUE)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
<a href="https://netzoo.github.io/netZooR/"><img src="https://img.shields.io/badge/docs-passing-green"></a>
[![tutorials](https://img.shields.io/badge/netZooR-tutorials-9cf)](https://github.com/netZoo/netZooR/tree/master/vignettes)
[![netBooks](https://img.shields.io/badge/netZooR-netBooks-ff69b4)](http://netbooks.networkmedicine.org/user/marouenbg/notebooks/Welcome_to_netBooks.ipynb?)
[![Netbooks](https://img.shields.io/badge/netZooR-Netbooks-ff69b4)](http://netbooks.networkmedicine.org/user/marouenbg/notebooks/Welcome_to_netBooks.ipynb?)
[![discussions](https://img.shields.io/badge/netZooR-discussions-orange)](https://github.com/netZoo/netZooR/discussions)


Expand Down
12 changes: 12 additions & 0 deletions inst/CITATION
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
citEntry(entry="article",
title = "The Network Zoo: a multilingual package for the inference and analysis of biological networks",
author = personList( as.person("Marouen Ben Guebila"),
as.person("Tian Wang"),
as.person("John Quackenbush")),
year = 2022,
journal = "bioRxiv",
doi = "10.1101/2022.05.30.494077",
textVersion =
paste("Ben Guebila, M, Wang, T., Quackenbush, J.",
"The Network Zoo: a multilingual package for the inference and analysis of biological networks",
"bioRxiv, 2022" ) )
Loading