Skip to content

Commit 08cd205

Browse files
Merge branch 'CCBR:main' into main
2 parents 2f4b6ad + bede344 commit 08cd205

11 files changed

Lines changed: 630 additions & 160 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
## ASPEN development version
22

3+
## ASPEN 1.4.0
4+
5+
- Add structured pipeline state tracking: a `pipeline.status.json` sidecar and `pipeline.{running,completed,failed,canceled}` marker files are now written to `WORKDIR` during `run`, with a live progress monitor that periodically updates `pipeline.running` with a step-completion percentage; a best-effort `jobby` TSV summary (`snakemake.log.jobby`) is now also generated when Slurm submission fails before Snakemake starts. Consolidated shared logging/banner/version-tag helper functions into a new staged library (`workflow/scripts/ccbr_pipeline_logging.sh`, slated for future migration to `ccbr_tools`); redesigned the `--version`/banner output. (#119, @kopardev)
6+
- Fix a bug where a fully successful run could be reported as `failed`: the Snakemake `onsuccess`/`onerror` telemetry hook (`jobby`/`spooker`) could crash on a stale `jobby` inherited from the submitting shell's environment, which Snakemake treated as fatal even though every rule had already completed. `submit_script.sbatch` now starts from a clean module environment (`module purge`) and the telemetry hook explicitly loads the pinned `ccbr_tools` install (fixing both `PATH` and `PYTHONPATH`) and is now non-fatal. `pipeline.{running,completed,failed,canceled}` marker files are also now human-readable instead of empty. (#144, @kopardev)
7+
- Fix the `Genome:` line in the run summary to reflect the genome configured in the workdir's `config.yaml` instead of the `-g`/`--genome` CLI flag or its default, which only apply to `init`/`reconfig`. (@kopardev)
8+
- Remove a leftover ASCII-art banner in `init.smk` that duplicated the redesigned `--version`/banner output on every Snakemake invocation. (@kopardev)
9+
310
## ASPEN 1.3.0
411

512
- Generate Tn5 nicking-site and read counts matrices, and the corresponding DiffATAC/DESeq2 results, from both `dedup.bam` (PCR/optical duplicates removed) and `filtered.bam` (duplicates retained, labeled `nondedup`), written to separate `dedup`/`nondedup` output subfolders under `visualization/` and `peaks/{peakcaller}/{fixed_width/counts,DiffATAC}/`; previously only the duplicate-retaining `filtered.bam` was used. `dedup` is recommended for standard differential accessibility testing. (#138, @kopardev)

‎CITATION.cff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ identifiers:
2929
type: doi
3030
value: 10.5281/zenodo.13755867
3131
doi: 10.5281/zenodo.13755867
32-
version: v1.3.0
33-
date-released: "2026-09-17"
32+
version: v1.4.0
33+
date-released: "2026-09-21"

‎README.md‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
## QuickStart guide
1111

1212
```bash
13-
module load ccbrpipeliner/7
13+
module load ccbrpipeliner
1414
```
1515

16+
> **Note**: This is illustrative example output captured at doc-writing time — exact values (e.g. `pipeline_home`, `git commit/tag`, `aspen_version`) will differ depending on which ASPEN version/branch is installed at your site. Run `aspen --help` yourself to see the current values for your installation.
17+
1618
```bash
1719
aspen --help
1820
```
@@ -21,11 +23,13 @@ aspen --help
2123
##########################################################################################
2224

2325
Welcome to
24-
____ ____ ___ ____ _ _
25-
|__| [__ |__] |___ |\ |
26-
| | ___] | |___ | \| v1.2.0
2726

28-
A_TAC_S_eq A_nalysis P_ip_E_li_N_e
27+
╔══════════════════════════════════╗
28+
║ ASPEN PIPELINE ║
29+
║ v1.3.0 ║
30+
╚══════════════════════════════════╝
31+
32+
ATAC-Seq Analysis Pipeline
2933

3034
##########################################################################################
3135

@@ -41,14 +45,16 @@ Here is a list of genome supported by aspen:
4145
* mm10 [Mouse]
4246
* mmul10 [Macaca mulatta(Rhesus monkey) or rheMac10]
4347
* bosTau9 [Bos taurus(cattle)]
48+
* hs1 [Human T2T-CHM13]
49+
* hs1_chrR [Human T2T-CHM13 + chrR rDNA unit]
4450

4551
aspen calls peaks using the following tools:
4652

4753
* MACS2
4854
* Genrich [RECOMMENDED FOR USE]
4955

5056
USAGE:
51-
bash /data/CCBR_Pipeliner/Pipelines/ASPEN/release/1.2.0/aspen -w/--workdir=<WORKDIR> -m/--runmode=<RUNMODE>
57+
bash /data/CCBR_Pipeliner/Pipelines/ASPEN/release/1.3.0/aspen -w/--workdir=<WORKDIR> -m/--runmode=<RUNMODE>
5258

5359
Required Arguments:
5460
1. WORKDIR : [Type: String]: Absolute or relative path to the output folder with write permissions.
@@ -72,18 +78,18 @@ Optional Arguments:
7278
--help|-h : print this help
7379

7480
Example commands:
75-
bash /data/CCBR_Pipeliner/Pipelines/ASPEN/release/1.2.0/aspen -w=/my/output/folder -m=init
76-
bash /data/CCBR_Pipeliner/Pipelines/ASPEN/release/1.2.0/aspen -w=/my/output/folder -m=dryrun
77-
bash /data/CCBR_Pipeliner/Pipelines/ASPEN/release/1.2.0/aspen -w=/my/output/folder -m=run
81+
bash /data/CCBR_Pipeliner/Pipelines/ASPEN/release/1.3.0/aspen -w=/my/output/folder -m=init
82+
bash /data/CCBR_Pipeliner/Pipelines/ASPEN/release/1.3.0/aspen -w=/my/output/folder -m=dryrun
83+
bash /data/CCBR_Pipeliner/Pipelines/ASPEN/release/1.3.0/aspen -w=/my/output/folder -m=run
7884

7985
##########################################################################################
8086

8187
VersionInfo:
8288
python : python/3.10
8389
snakemake : snakemake
84-
pipeline_home : /data/CCBR_Pipeliner/Pipelines/ASPEN/release/1.2.0
85-
git commit/tag : 4ab396420595c4ccf15416a4c11b523b2d0db862 v1.2.0
86-
aspen_version : v1.2.0
90+
pipeline_home : /data/CCBR_Pipeliner/Pipelines/ASPEN/release/1.3.0
91+
git commit/tag : 8d197d39927be3f60558911bd8b2756f36835deb v1.3.0
92+
aspen_version : v1.3.0
8793

8894
##########################################################################################
8995
```

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.0-dev
1+
1.4.0-dev

0 commit comments

Comments
 (0)