Skip to content

Commit

Permalink
update workflows, remove not working conda env
Browse files Browse the repository at this point in the history
  • Loading branch information
akhanf committed Feb 14, 2024
1 parent 81eba9a commit 1a611ca
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 27 deletions.
6 changes: 0 additions & 6 deletions .github/snakebids_action_requirements.txt

This file was deleted.

24 changes: 11 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,23 @@ jobs:
- name: Install dependencies
run: |
conda install -c conda-forge mamba
- name: Lint with flake8
run: |
mamba install flake8
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Setup snakemake
# - name: Lint with flake8
# run: |
# mamba install flake8
# # stop the build if there are Python syntax errors or undefined names
# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
# flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Setup snakemake and workflow dependencies
run: |
mamba install -c conda-forge -c bioconda pytest snakemake singularity snakefmt
pip install .
- name: Lint with snakemake and snakefmt
run: |
snakemake --lint
snakefmt workflow
- name: Unit tests
run: |
pytest .tests/unit
- name: Integration test
- name: Integration dry-run test
run: |
pytest .tests/integration
snakemake -np
Empty file added spimprep/__init__.py
Empty file.
4 changes: 2 additions & 2 deletions workflow/Snakefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json
from snakebids import bids, set_bids_spec
from pathlib import Path
from snakebids import bids, set_bids_spec
import pandas as pd
import os

Expand All @@ -9,7 +9,7 @@ configfile: "config/config.yml"


container: config["containers"]["spimprep"]
conda: config["conda_envs"]["global"]


# use expandvars so we can use e.g. '$SLURM_TMPDIR'
root = os.path.expandvars(config["root"])
Expand Down
6 changes: 0 additions & 6 deletions workflow/envs/global.yml

This file was deleted.

0 comments on commit 1a611ca

Please sign in to comment.