Skip to content

Commit

Permalink
Make ntEdit a dependency
Browse files Browse the repository at this point in the history
* Because there are no longer any compiled components of ntRoot, remove meson build system
* Limit dependencies to those specific for ntRoot (remove dependencies of ntEdit)
* Update installation instructions
  • Loading branch information
lcoombe committed Apr 10, 2024
1 parent d089003 commit e02b749
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 48 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "subprojects/ntEdit"]
path = subprojects/ntEdit
url = https://github.com/bcgsc/ntEdit.git
11 changes: 2 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,15 @@ Installing ntRoot from the source code:
```
git clone --recurse-submodules https://github.com/bcgsc/ntRoot.git
cd ntRoot
meson setup build --prefix=/path/to/install/directory
cd build
ninja install
```
ntRoot and all required scripts will be installed to: /path/to/install/directory
No compilation is required for ntRoot (only the dependencies), so simply add the ntRoot repository to your PATH.

### Dependencies <a name=dependencies></a>
- python 3.9+
- perl
- [meson](https://mesonbuild.com/)
- [ninja](https://ninja-build.org/)
- [ntEdit 2.0.0+](https://github.com/bcgsc/ntEdit)
- [snakemake](https://snakemake.readthedocs.io/en/stable/)
- [btllib](https://github.com/bcgsc/btllib)
- [boost](https://www.boost.org/doc/libs/1_61_0/more/getting_started/unix-variants.html)
- [ntCard](https://github.com/bcgsc/ntCard)
- [ntHits](https://github.com/bcgsc/ntHits)
- [samtools](https://www.htslib.org/)


Expand Down
22 changes: 4 additions & 18 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,12 @@ jobs:
- script: |
source activate ntroot_CI
conda install --yes --name ntroot_CI -c conda-forge -c bioconda python=3.9 mamba
mamba install --yes -c conda-forge -c bioconda meson ninja snakemake perl btllib compilers boost-cpp ntcard nthits
mamba install --yes -c conda-forge -c bioconda meson ninja snakemake perl 'ntedit>=2.0.0'
displayName: Install Conda packages
- script: |
source activate ntroot_CI
meson setup build --prefix=$(pwd)/test_build
cd build
ninja install
displayName: Compile ntRoot
- script: |
source activate ntroot_CI
export PATH=$(pwd)/test_build/bin:$PATH
export PATH=$(pwd):$PATH
which ntroot
cd demo
./run_ntroot_demo.sh
Expand All @@ -55,19 +48,12 @@ jobs:
- script: |
source activate ntroot_CI
conda install --yes --name ntroot_CI -c conda-forge -c bioconda python=3.9 mamba
mamba install --yes -c conda-forge -c bioconda meson ninja snakemake perl btllib compilers boost-cpp ntcard nthits
mamba install --yes -c conda-forge -c bioconda snakemake perl 'ntedit>=2.0.0'
displayName: Install Conda packages
- script: |
source activate ntroot_CI
meson setup build --prefix=$(pwd)/test_build
cd build
ninja install
displayName: Compile ntRoot
- script: |
source activate ntroot_CI
export PATH=$(pwd)/test_build/bin:$PATH
export PATH=$(pwd):$PATH
which ntroot
cd demo
./run_ntroot_demo.sh
Expand Down
5 changes: 0 additions & 5 deletions bin/meson.build

This file was deleted.

12 changes: 0 additions & 12 deletions meson.build

This file was deleted.

File renamed without changes.
1 change: 0 additions & 1 deletion subprojects/ntEdit
Submodule ntEdit deleted from ed506f

0 comments on commit e02b749

Please sign in to comment.