diff --git a/.github/snakebids_action_requirements.txt b/.github/snakebids_action_requirements.txt deleted file mode 100644 index bcfaa15..0000000 --- a/.github/snakebids_action_requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -snakebids @ git+https://github.com/khanlab/snakebids#8acbd9f -typing-extensions = ">=3.10.0" -attrs = ">=21.2.0" -boutiques = "^0.5.25" -more-itertools = ">=8" -pvandyken-deprecated = "0.0.4" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a9475b2..a272261 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/spimprep/__init__.py b/spimprep/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/workflow/Snakefile b/workflow/Snakefile index d7d0f8c..eeb58e5 100644 --- a/workflow/Snakefile +++ b/workflow/Snakefile @@ -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 @@ -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"]) diff --git a/workflow/envs/global.yml b/workflow/envs/global.yml deleted file mode 100644 index 698153c..0000000 --- a/workflow/envs/global.yml +++ /dev/null @@ -1,6 +0,0 @@ -channels: - - nodefaults -dependencies: - - pip: - - snakebids=0.10.2 -