From 71831802269314b1bd370b0089fba0c1cb2e64b9 Mon Sep 17 00:00:00 2001 From: xyg123 <33658607+xyg123@users.noreply.github.com> Date: Mon, 12 Feb 2024 10:55:29 +0000 Subject: [PATCH] fix: merge dev (#485) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(finemapping): ingest finngen r10 finemapping w/ airflow (#435) * feat: ingest finngen r10 finemapping w/ airflow * fix: addressed comments from PR #394 * fix: address comments from PR * Update config/step/ot_finngen_finemapping_ingestion.yaml Co-authored-by: Irene López <45119610+ireneisdoomed@users.noreply.github.com> * Update config/step/ot_finngen_finemapping_ingestion.yaml Co-authored-by: Irene López <45119610+ireneisdoomed@users.noreply.github.com> * chore: remove unnecessary config --------- Co-authored-by: Yakov Co-authored-by: David Ochoa Co-authored-by: Irene López <45119610+ireneisdoomed@users.noreply.github.com> Co-authored-by: David Ochoa * docs: susie inf method reloacated with the rest of the methods * ci(release): add action to open pr that triggers release weekly (#474) * chore: add action to open pr that triggers release weekly * fix: make yamllint interpret on keyword as string * fix: adapt time to gmt * chore: update to run at 4pm * fix: update github token variable (#476) * ci: exclude changelog.md from precommit (#479) --------- Co-authored-by: Yakov Co-authored-by: David Ochoa Co-authored-by: Irene López <45119610+ireneisdoomed@users.noreply.github.com> Co-authored-by: David Ochoa --- .github/workflows/pr_release_trigger.yaml | 22 +++++++++++++++++++ .pre-commit-config.yaml | 2 ++ .../{method => methods}/susie_inf.md | 4 +++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/pr_release_trigger.yaml rename docs/python_api/{method => methods}/susie_inf.md (86%) diff --git a/.github/workflows/pr_release_trigger.yaml b/.github/workflows/pr_release_trigger.yaml new file mode 100644 index 000000000..27c4d7dec --- /dev/null +++ b/.github/workflows/pr_release_trigger.yaml @@ -0,0 +1,22 @@ +name: PR to trigger release + +"on": + schedule: + - cron: "15 16 * * 4" + +jobs: + pull-request: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: pull-request + uses: diillson/auto-pull-request@v1.0.1 + with: + source_branch: "dev" + destination_branch: "main" + pr_title: "chore: trigger release process" + pr_body: ":warning: *This PR requires a MERGE or REBASE COMMIT (Don't squash!)*" + pr_label: "auto-pr" + pr_draft: false + pr_allow_empty: true + github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c5330c4fe..29e6a2ec7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,6 +13,7 @@ repos: hooks: - id: trailing-whitespace - id: end-of-file-fixer + exclude: "CHANGELOG.md" - id: debug-statements - id: check-merge-conflict - id: check-case-conflict @@ -49,6 +50,7 @@ repos: rev: "v4.0.0-alpha.8" hooks: - id: prettier + exclude: "CHANGELOG.md" - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook rev: v9.11.0 diff --git a/docs/python_api/method/susie_inf.md b/docs/python_api/methods/susie_inf.md similarity index 86% rename from docs/python_api/method/susie_inf.md rename to docs/python_api/methods/susie_inf.md index c373c502d..38845f36e 100644 --- a/docs/python_api/method/susie_inf.md +++ b/docs/python_api/methods/susie_inf.md @@ -1,7 +1,9 @@ --- -title: SuSiE-inf - Fine-mapping with infinitesimal effects v1.1 +title: SuSiE-inf --- +# SuSiE-inf - Fine-mapping with infinitesimal effects v1.1 + This is an implementation of the SuSiE-inf method found here: https://github.com/FinucaneLab/fine-mapping-inf https://www.nature.com/articles/s41588-023-01597-3