Merge pull request #93 from khanlab/maint/dep-updates

Update project and actions dependencies

.github/workflows/assign_reviewers.yml

@@ -5,4 +5,4 @@ on:
     types: [opened, ready_for_review]
 jobs:
   assign-reviewer:
-    uses: khanlab/actions/.github/workflows/workflow-pr_task-assignReviewer.yml@v0.2.1
+    uses: khanlab/actions/.github/workflows/workflow-pr_task-assignReviewer.yml@v0.3.0

.github/workflows/bump_version.yml

@@ -6,6 +6,6 @@ on:
 jobs:
   bump-version:
     if: github.event.pull_request.merged == true
-    uses: khanlab/actions/.github/workflows/workflow-version_task-semverGithub.yml@v0.2.1
+    uses: khanlab/actions/.github/workflows/workflow-version_task-semverGithub.yml@v0.3.0
     secrets:
-      BP-PAT: ${{ secrets.BP_PAT_TOKEN }}
+      BP_PAT: ${{ secrets.BP_PAT_TOKEN }}

.github/workflows/deploy.yml

@@ -6,7 +6,7 @@ on:
     tags: [v*]
 jobs:
   deploy_docker:
-    uses: khanlab/actions/.github/workflows/workflow-release_task-deployDocker.yml@v0.2.1
+    uses: khanlab/actions/.github/workflows/workflow-release_task-deployDocker.yml@v0.3.0
     with:
       maximize_space: true
     secrets:

.github/workflows/release.yml

@@ -8,9 +8,9 @@ on:
         required: false
 jobs:
   release_package:
-    uses: khanlab/actions/.github/workflows/workflow-release_task-publishGithub.yml@v0.2.1
+    uses: khanlab/actions/.github/workflows/workflow-release_task-publishGithub.yml@v0.3.0
     with:
       comments: ${{ github.event.inputs.comments }}
       pipeline-description: true
     secrets:
-      BP-PAT: ${{ secrets.BP_PAT_TOKEN }}
+      BP_PAT: ${{ secrets.BP_PAT_TOKEN }}

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Python environment
-        uses: khanlab/actions/.github/actions/action-setup_task-installPyProject@v0.2.1
+        uses: khanlab/actions/.github/actions/action-setup_task-installPyProject@v0.3.0
         with:
           python-version: "3.10"
       - name: yamlfix
@@ -33,7 +33,7 @@ jobs:
         python-version: ["3.8", "3.9", "3.10"]
     steps:
       - name: Setup Python environments
-        uses: khanlab/actions/.github/actions/action-setup_task-installPyProject@v0.2.1
+        uses: khanlab/actions/.github/actions/action-setup_task-installPyProject@v0.3.0
         with:
           python-version: ${{ matrix.python-version }}
           install-library: true

pyproject.toml

@@ -11,9 +11,7 @@ authors = [
 ]
 readme = "README.md"
 documentation = "https://scattr.readthedocs.io"
-packages = [
-    { include = "scattr" }
-]
+packages = [{ include = "scattr" }]
 
 [tool.poetry.dependencies]
 python = ">=3.8, <3.11"
@@ -22,7 +20,7 @@ nibabel = "^3.2.2"
 nilearn = "^0.10.0"
 numpy = "^1.22.3"
 scipy = "^1.8.0"
-labelmerge = {git = "https://github.com/khanlab/labelmerge.git", rev = "v0.4.5"}
+labelmerge = "^v0.4.6"
 matplotlib = "^3.7.1"
 niworkflows = "^1.7.9"
 pygments = "^2.15.1"
@@ -70,7 +68,7 @@ test = [
     "test_dwi",
     "test_labelmerge",
     "test_skip_labelmerge",
-    "test_sessions"
+    "test_sessions",
 ]
 
 [tool.poe.tasks.test_base]
@@ -156,7 +154,7 @@ line-length = 79
 
 [tool.ruff]
 line-length = 79
-builtins = [ "snakemake" ]
+builtins = ["snakemake"]
 
 [tool.snakefmt]
 line_length = 79

scattr/config/snakebids.yml

@@ -273,6 +273,6 @@ freesurfer:
 
 # Containers
 singularity:
-  scattr: "docker://khanlab/scattr:v0.2.1"
+  scattr: "docker://khanlab/scattr:v0.3.2"
 
 fs_license: /path/to/fs/license