Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update github actions to node v20 #51

Merged
merged 4 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/autoblack_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
black-code:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
- run: pip install black
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:
docs-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ammaraskar/sphinx-action@0.4
with:
docs-folder: "docs/"

docs-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ammaraskar/sphinx-action@0.4
with:
docs-folder: "docs/"
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v3
- uses: mamba-org/setup-micromamba@v1.4.3
uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@v1.8.0
with:
environment-name: deeprvat-gh-action
environment-file: ${{ github.workspace }}/deeprvat_env_no_gpu.yml
Expand Down Expand Up @@ -41,8 +41,8 @@ jobs:
needs: DeepRVAT-Pipeline-Smoke-Tests
steps:
- name: Check out repository code
uses: actions/checkout@v3
- uses: mamba-org/setup-micromamba@v1.4.3
uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@v1.8.0
with:
environment-name: deeprvat-gh-action
environment-file: ${{ github.workspace }}/deeprvat_env_no_gpu.yml
Expand Down Expand Up @@ -82,8 +82,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v3
- uses: mamba-org/setup-micromamba@v1.4.3
uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@v1.8.0
with:
environment-name: deeprvat-preprocess-gh-action
environment-file: ${{ github.workspace }}/deeprvat_preprocessing_env.yml
Expand Down Expand Up @@ -115,8 +115,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v3
- uses: mamba-org/setup-micromamba@v1.4.3
uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@v1.8.0
with:
environment-name: deeprvat-preprocess-gh-action
environment-file: ${{ github.workspace }}/deeprvat_preprocessing_env.yml
Expand All @@ -135,8 +135,8 @@ jobs:
needs: DeepRVAT-Preprocessing-Pipeline-Smoke-Tests
steps:
- name: Check out repository code
uses: actions/checkout@v3
- uses: mamba-org/setup-micromamba@v1.4.3
uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@v1.8.0
with:
environment-name: deeprvat-preprocess-gh-action
environment-file: ${{ github.workspace }}/deeprvat_preprocessing_env.yml
Expand All @@ -149,7 +149,7 @@ jobs:

- name: Cache Fasta file
id: cache-fasta
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: example/preprocess/workdir/reference
key: ${{ runner.os }}-reference-fasta
Expand All @@ -176,8 +176,8 @@ jobs:
steps:

- name: Check out repository code
uses: actions/checkout@v3
- uses: mamba-org/setup-micromamba@v1.4.3
uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@v1.8.0
with:
environment-name: deeprvat-preprocess-gh-action
environment-file: ${{ github.workspace }}/deeprvat_preprocessing_env.yml
Expand All @@ -190,7 +190,7 @@ jobs:

- name: Cache Fasta file
id: cache-fasta
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: example/preprocess/workdir/reference
key: ${{ runner.os }}-reference-fasta
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v3
- uses: mamba-org/setup-micromamba@v1.4.3
uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@v1.8.0
with:
environment-name: deeprvat-preprocess-gh-action
environment-file: ${{ github.workspace }}/deeprvat_env_no_gpu.yml
Expand All @@ -27,8 +27,8 @@ jobs:
steps:

- name: Check out repository code
uses: actions/checkout@v3
- uses: mamba-org/setup-micromamba@v1.4.3
uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@v1.8.0
with:
environment-name: deeprvat-preprocess-gh-action
environment-file: ${{ github.workspace }}/deeprvat_preprocessing_env.yml
Expand Down
8 changes: 5 additions & 3 deletions deeprvat/deeprvat/evaluate.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,11 @@ def get_pvals(results, method_mapping=None, phenotype_mapping={}):

if phenotype_mapping is not None:
pvals["phenotype"] = pvals["phenotype"].apply(
lambda x: phenotype_mapping[x]
if x in phenotype_mapping
else " ".join(x.split("_"))
lambda x: (
phenotype_mapping[x]
if x in phenotype_mapping
else " ".join(x.split("_"))
)
)

return pvals
Expand Down
12 changes: 6 additions & 6 deletions deeprvat/seed_gene_discovery/seed_gene_discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,9 @@ def update_config(
if variant_type is not None:
logger.info(f"Variant type is {variant_type}")
if variant_type == "missense":
rare_threshold_config[
"Consequence_missense_variant"
] = "Consequence_missense_variant == 1"
rare_threshold_config["Consequence_missense_variant"] = (
"Consequence_missense_variant == 1"
)
elif variant_type == "plof":
rare_threshold_config["is_plof"] = "is_plof == 1"
elif variant_type == "all":
Expand All @@ -517,9 +517,9 @@ def update_config(
if rare_maf is not None:
logger.info(f"setting association testing maf to {rare_maf}")
config["data"]["dataset_config"]["min_common_af"][maf_column] = rare_maf
rare_threshold_config[
maf_column
] = f"{maf_column} < {rare_maf} and {maf_column} > 0"
rare_threshold_config[maf_column] = (
f"{maf_column} < {rare_maf} and {maf_column} > 0"
)

logger.info(f"Rare variant thresholds: {rare_threshold_config}")
with open(new_config_file, "w") as f:
Expand Down