Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
ee04a58
Have ability to run without HPC job
andrew-e Mar 26, 2026
1535611
Adding steps and code to finemap in
andrew-e Apr 10, 2026
9cae5f1
Making standardise gwas more flexible
andrew-e Apr 10, 2026
7dec23a
Adding finemap tests
andrew-e Apr 10, 2026
d824012
Updating dockerfile for R version compatability
andrew-e Apr 25, 2026
d23b8d8
explicity conda acceptance
andrew-e Apr 25, 2026
cdde9a2
Saving this for now
andrew-e Apr 27, 2026
5d99410
Adding coloc pipeline
andrew-e Apr 27, 2026
ba5e62f
Adding and fixing R tests
andrew-e Apr 27, 2026
50dda93
Resolving R path stuff
andrew-e Apr 27, 2026
2e2c320
Fixing chrbp to rsid stuff
andrew-e Apr 27, 2026
c4772db
Updating documentation
andrew-e Apr 27, 2026
83d9942
more documentation
andrew-e Apr 27, 2026
bc568c5
one more documentation fix :/
andrew-e Apr 27, 2026
4d21ced
adding more things to ignore R build
andrew-e Apr 27, 2026
d32d0cf
fixing import i guess, i dunno
andrew-e Apr 27, 2026
e8dfd15
adding tests back in to R
andrew-e Apr 27, 2026
dab7d50
Adding coloc html result file, updating README
andrew-e Apr 28, 2026
08e9254
update readme with gsutil data
andrew-e Apr 29, 2026
88fbeb7
Changing from json input files to yaml input files
andrew-e Apr 29, 2026
e1aacf0
Removing idea of RDFS_DIR, or BACKUP_DIR, too complicated
andrew-e Apr 29, 2026
12edc45
Moving profiles around, making them more generic
andrew-e Apr 29, 2026
ae0e7f3
Fixing slurm config
andrew-e Apr 29, 2026
6798a1e
Decent assumption of slurm partition
andrew-e Apr 29, 2026
547fc5c
binding additional directories
andrew-e Apr 29, 2026
4f3acb3
Adding other standardisations back in
andrew-e Apr 29, 2026
b0cac60
Updating 1000genomes dir
andrew-e Apr 30, 2026
d04695a
make fixes to sif build in run_pipeline
andrew-e Apr 30, 2026
4f4a276
Changes to finemap rule
andrew-e Apr 30, 2026
e2f0fdf
ensuring --unlock still works
andrew-e Apr 30, 2026
20681e2
Upping limits for finemap
andrew-e Apr 30, 2026
62228d0
Making clumping more performant
andrew-e Apr 30, 2026
059ae1d
fixing stuff
andrew-e Apr 30, 2026
45bc407
Fixing eaf population
andrew-e May 1, 2026
3f728ba
Reworking eaf population entirely
andrew-e May 1, 2026
8e3e6aa
small updates
andrew-e May 1, 2026
4cf4216
fixing core detection
andrew-e May 1, 2026
f3822ca
Updating standardise gwas tests
andrew-e May 1, 2026
3ba0b94
Fixing ggplot error in heritability graph
andrew-e May 6, 2026
b9cd498
fixing slurm env vars
andrew-e May 8, 2026
8813b19
Capping size of plot so it works
andrew-e May 8, 2026
ece1366
Updating differences with compare gwas output
andrew-e May 8, 2026
81e5506
Updating so finemap isn't rerun
andrew-e May 11, 2026
912660f
fixing qtl mr smk
andrew-e May 11, 2026
2896aa7
fixing finemap
andrew-e May 11, 2026
660145c
Adding missing function
andrew-e May 11, 2026
633ba8f
Simplifying env input
andrew-e May 15, 2026
6324cc6
Changing clumping rule so it isn't rerun
andrew-e May 16, 2026
6e83609
Adding study_type
andrew-e May 16, 2026
1291fdd
removing study categories
andrew-e May 16, 2026
600ac6c
updating output
andrew-e May 22, 2026
67d994f
fixing smaller number of rows
andrew-e May 22, 2026
e50516e
add locus zoom functionality
andrew-e May 24, 2026
c3ccb3e
fixes for locus zoom
andrew-e May 25, 2026
bcc01af
updating rule completion logic
andrew-e May 28, 2026
f35474a
Fixing finemap issues
andrew-e May 29, 2026
94ee6af
fixing docker version resolution
andrew-e May 29, 2026
ff2c2f3
simplifying docker image bullshit
andrew-e May 29, 2026
89e7f96
Hard failing locus zoom
andrew-e May 30, 2026
f01584d
changing locus zoom copletion dir
andrew-e May 30, 2026
725fbe3
Adding headers
andrew-e May 30, 2026
2ad3393
adding headers for real this time
andrew-e May 30, 2026
17bf1a4
adding some spacing from headers
andrew-e May 30, 2026
ed08585
Reworking parallelism calculations for local run
andrew-e Jun 2, 2026
392eef8
fixing building apptainer
andrew-e Jun 2, 2026
9769fa3
Adding max of 10 CPUs for parallel rsid population
andrew-e Jun 2, 2026
78482d9
Adding max of 10 CPUs for parallel finemapping
andrew-e Jun 2, 2026
3879a04
fix max parallel with rsid
andrew-e Jun 2, 2026
2e305ff
better calculate_parallelism
andrew-e Jun 3, 2026
ae8f100
No more creating Rplot.pdf files
andrew-e Jun 3, 2026
15d886b
removing Rfast from imports and descriptions
andrew-e Jun 3, 2026
6d87b58
Fixing tests and other things found by check()
andrew-e Jun 3, 2026
9419b0b
Adding e2e test check to pipeline
andrew-e Jun 4, 2026
26b6fea
Testing complete
andrew-e Jun 4, 2026
04e392a
Fixing github action error
andrew-e Jun 4, 2026
f30e25e
Adding new functionality that allows users to fine multi ancestry fin…
andrew-e Jun 5, 2026
56ddb10
Updating multi susie to include variance
andrew-e Jun 5, 2026
253bc10
Making changes to multi susie
andrew-e Jun 5, 2026
0402c4e
Adding parallelism
andrew-e Jun 6, 2026
00ffa13
Ading dockerignore
andrew-e Jun 6, 2026
ee46745
Fixing bugs with mismatching matrix sizes
andrew-e Jun 6, 2026
a3f3ac3
Making BETA floats
andrew-e Jun 6, 2026
90e1c3b
More checks
andrew-e Jun 6, 2026
a4a479f
Improving documentaiton / md
andrew-e Jun 8, 2026
bc7d451
Adding instructions to cut new release
andrew-e Jun 8, 2026
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
11 changes: 9 additions & 2 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ environment.yml
run_pipeline.sh
scripts
snakemake
tests
venv
.idea
.env_example
.env_example
.env
.cache
^\.github$
^\.lintr$
^PLATFORM_SETUP\.md$
^\.git$
^\.gitignore$
^\.cursorrules$
29 changes: 29 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
.git
.github
.cursorrules
.snakemake
.genehackman
.cache
pipeline_logs
.ipynb_checkpoints
.env
.env_example
*.sif
build
build.log
README.pdf
tests/testthat/data
venv
__pycache__
*.pyc
.pytest_cache
.quarto
**/*.quarto_ipynb
*input.yaml
*input.json
.Rproj.user
.DS_Store
ieugwasr_oauth
PLATFORM_SETUP.md
extract_by_range.r
input_for_project.yaml
18 changes: 10 additions & 8 deletions .env_example
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
DATA_DIR=
RESULTS_DIR=
RDFS_DIR=
GENOMIC_DATA_DIR=/mnt/storage/private/mrcieu/data/genomic_data/
THOUSAND_GENOMES_DIR=/mnt/storage/private/mrcieu/data/genomic_data/1000genomes/b37_dbsnp156/
LDSC_DIR=/mnt/storage/private/mrcieu/data/LDSCORE/b37_dbsnp156/
QTL_DIRECTORY=/mnt/storage/private/mrcieu/data/qtl_datasets/
DOCKER_VERSION=
#Mandatory variables
PIPELINE_DATA_DIR=
PROJECT_DIR=
DOCKER_VERSION=1.1.0
# Optional variables
QTL_DATA_DIR=
SNAKEMAKE_PROFILE=snakemake/profiles/local/
APPTAINER_MODULE=
SLURM_PARTITION=
SLURM_ACCOUNT=
37 changes: 37 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: CI/CD

on:
push:
branches:
- main
pull_request:
types: [opened, reopened, ready_for_review, synchronize]

jobs:
devtools_check:
runs-on: ubuntu-latest
container:
image: mrcieu/genehackman:develop
env:
R_LIBS_SITE: /usr/lib/R/site-library
steps:
- uses: actions/checkout@v4

- name: Run devtools::check()
run: Rscript -e "devtools::check()"
end_to_end_tests_run:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Check that end-to-end tests have been run successfully
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
run: |
if [ ! -f tests/testing_complete.txt ]; then
echo "Tests have not been run successfully, please run ./tests/e2e_tests/run_test_pipelines.sh and commit the results"
exit 1
fi
if [ "$BRANCH_NAME" != "main" ] && ! grep -q "$BRANCH_NAME" tests/testing_complete.txt; then
echo "Tests have not been run successfully for branch: $BRANCH_NAME, please run Rscript tests/testthat/run_tests.R and commit the results"
exit 1
fi
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
.Rproj.user
.cursorrules
.snakemake/
.genehackman/
pipeline_logs/
.cache/
.ipynb_checkpoints/
*input.yaml
*input.json
.env
.bashrc
.DS_Store
ieugwasr_oauth
__pycache__/

/.quarto/
**/*.quarto_ipynb
5 changes: 5 additions & 0 deletions .lintr
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
linters: with_defaults(
line_length_linter = line_length_linter(120),
quotes_linter = NULL,
object_name_linter = NULL
)
Loading
Loading