Skip to content

Commit ad5a54b

Browse files
committed
v1.1.0
1 parent 324c289 commit ad5a54b

File tree

7 files changed

+19
-18
lines changed

7 files changed

+19
-18
lines changed

ChangeLog.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Latest
77

88
- Reduce memory usage in certain steps.
99

10+
- Fix the normalization issue in bigwig file generation.
11+
1012
- Add more features to single cell RNA-seq analysis pipeline.
1113

1214
- Add more features to single cell ATAC-seq analysis pipeline.
@@ -33,4 +35,4 @@ v0.5.0 (2018-10-28)
3335
===================
3436

3537
- Add a function to include external networks, using the field
36-
`external_network` in the configuration file.
38+
`external_network` in the configuration file.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright Author name here (c) 2017
1+
Copyright Kai Zhang (c) 2017-2020
22

33
All rights reserved.
44

Taiji.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Taiji
2-
version: 1.0.1.9
2+
version: 1.1.0
33
synopsis: Multi-omics bioinformatics analysis pipeline
44
description: Taiji is an integrated multi-omics bioinformatics analysis
55
pipeline. It can analyze ATAC-seq, RNA-seq, single cell
@@ -10,7 +10,7 @@ license: BSD3
1010
license-file: LICENSE
1111
author: Kai Zhang
1212
maintainer: [email protected]
13-
copyright: (c) 2017-2019 Kai Zhang
13+
copyright: (c) 2017-2020 Kai Zhang
1414
category: Bio
1515
build-type: Simple
1616
extra-source-files:
@@ -41,7 +41,7 @@ library
4141
, bytestring
4242
, bio-pipelines >= 0.1.2
4343
, bio-experiments
44-
, bioinformatics-toolkit >= 0.9.0
44+
, bioinformatics-toolkit >= 0.9.1
4545
, containers
4646
, clustering
4747
, double-conversion
@@ -58,7 +58,7 @@ library
5858
, mtl
5959
, singletons >= 2.5
6060
, statistics >= 0.14.0
61-
, SciFlow >= 0.7.1
61+
, SciFlow >= 0.7.2
6262
, temporary
6363
, text
6464
, vector

app/Main.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ instance SCATACSeqConfig TaijiConfig where
6565
_scatacseq_cluster_resolution = _taiji_cluster_resolution
6666
_scatacseq_cluster_optimizer = _taiji_cluster_optimizer
6767
_scatacseq_doublet_score_cutoff = _taiji_scrna_doublet_score_cutoff
68+
_scatacseq_cluster_by_window = const False
6869

6970
instance RNASeqConfig TaijiConfig where
7071
_rnaseq_assembly = _taiji_assembly

src/Taiji/Core.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,11 @@ builder = do
5454
return $ getHiCLoops hic
5555
|] $ doc .= "Read HiC loops from input file."
5656

57-
node "Create_Linkage_Prep" 'aggregate $
58-
doc .= "Prepare for parallel execution."
57+
node "Create_Linkage_Prep" 'aggregate $ return ()
5958
nodePar "Create_Linkage" 'saveAssociations $ memory .= 20
6059
path ["Create_Linkage_Prep", "Create_Linkage"]
6160

62-
node "Compute_Ranks_Prep" [| \(x, expr) -> return $ zip x $ repeat expr |] $
63-
return ()
61+
uNode "Compute_Ranks_Prep" [| \(x, expr) -> zip x $ repeat expr |]
6462
nodePar "Compute_Ranks" 'computeRanks $ do
6563
doc .= "Perform personalized Pagerank."
6664
memory .= 20

src/Taiji/SingleCell.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ builder = do
1515
path ["Compute_Ranks_SC_Prep", "Compute_Ranks_SC"]
1616
-}
1717

18-
node "Compute_Ranks_SC_Prep" [| return . prepareData |] $ return ()
18+
uNode "Compute_Ranks_SC_Prep" [| prepareData |]
1919
nodePar "Compute_Ranks_SC" 'computeRanksCluster $ return ()
2020
node "Output_Ranks_SC" [| outputRanksCluster "/Rank/Cluster/" |] $ return ()
2121
path ["Compute_Ranks_SC_Prep", "Compute_Ranks_SC", "Output_Ranks_SC"]

stack.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,30 @@ extra-deps:
99
commit: f796c18ff3998713c2485d67f74c5e96367d285d
1010

1111
- git: https://github.com/Taiji-pipeline/bio-pipelines.git
12-
commit: 50d65bc42b9331badc00bf387cecfbe008ad37e9
12+
commit: 4b2feb52eb62dde1c26bb4a7e9c4d5456f6034b5
1313

1414
- git: https://github.com/Taiji-pipeline/bio-experiments.git
1515
commit: 470d1c09c8b8ecc64ced5f085c87cc66d70f8b9d
1616

1717
- git: https://github.com/Taiji-pipeline/Taiji-RNA-seq.git
18-
commit: 0b184782b70c4200c4be829e92c3fed6d7de7572
18+
commit: 384c714206e192e743e3c6de50a74f29fd62cf4e
1919

2020
- git: https://github.com/Taiji-pipeline/Taiji-ATAC-seq.git
21-
commit: e33ca8295342412ee4d32bfa4f0a7815db4221ce
21+
commit: fd5df5fa73946d4e4e836bb46d539248f983cd4d
2222

2323
- git: https://github.com/Taiji-pipeline/Taiji-scRNA-seq.git
24-
commit: 6043a6572730ce02ee535119c35b22c5f227518a
24+
commit: b5d02b0aef22b11f60997f4e86ff67e512d4aa2f
2525

2626
- git: https://github.com/Taiji-pipeline/Taiji-scATAC-seq.git
27-
commit: 0079329d422dec161dfbbfd6e44b94942bdbd077
27+
commit: 75b79eb117251dc595712d41ef2f310f8301d5a1
2828

2929
- git: https://github.com/kaizhang/haskell-igraph.git
3030
commit: e9db8aad4ca005257a464a5eff0e5ff15aa761b2
3131

3232
- git: https://github.com/kaizhang/HsHTSLib.git
3333
commit: c116cfa29e33d3142a6cb502f1dc4c02066d0aa9
3434

35-
- bioinformatics-toolkit-0.9.0
35+
- bioinformatics-toolkit-0.9.1
3636

3737
- bbi-0.1.1
3838
- clustering-0.4.1
@@ -47,7 +47,7 @@ extra-deps:
4747
- distributed-process-monad-control-0.5.1.3
4848

4949
- git: https://github.com/kaizhang/SciFlow.git
50-
commit: ca5f37411e73c9066f67f7fe65f4a341946c7dfd
50+
commit: 2b88b7f99f8c4555919a9746782984545d319006
5151
subdirs:
5252
- SciFlow
5353
- SciFlow-app

0 commit comments

Comments
 (0)