Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: khanlab/scattr
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.1.1
Choose a base ref
...
head repository: khanlab/scattr
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: refs/heads/main
Choose a head ref
Loading
Showing 437 changed files with 7,908 additions and 3,037 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@ Briefly describe the issue you are experiencing (or feature you want to see adde
## Environment

* Operating System
* DBSC version
* SCATTR version
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ Describe the changes implemented in this pull request. If the changes fix a bug
What types of changes does your code introduce? Put an `x` in the boxes that apply

- [ ] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionalitiy)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Other (if none of the other choices apply)

6 changes: 1 addition & 5 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
@@ -4,18 +4,14 @@ addReviewers: true

# Set to true to add assignees to pull requests
addAssignees: author

# A list of reviewers to be added to pull requests (GitHub user name)
reviewers:
- kaitj
- tkkuehn
- arunthurai
- ataha24
- Bradley-karat

# A number of reviewers added to the pull request
# Set 0 to add all the reviewers (default: 0)
numberOfReviewers: 0

# A list of assignees, overrides reviewers if set
# assignees:
# - assigneeA
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version: 2
updates:
- package-ecosystem: "github-actions"
# Workflow files stored in the default location of `.github/workflows`.
# (You don't need to specify `/.github/workflows` for `directory`.
# You can use `directory: "/"`.)
directory: "/"
# Run on first of each month
schedule:
interval: "monthly"
# Group to submit a single PR if possible
groups:
github-actions:
patterns:
- "*"
31 changes: 7 additions & 24 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -2,44 +2,27 @@
name-template: $RESOLVED_VERSION
tag-template: v$RESOLVED_VERSION
filter-by-commitish: true

template: |
## Changes
$CHANGES
categories:
- title: 🚀 Features
labels:
- breaking
- enhancement
labels: [breaking, enhancement]
- title: 🐛 Bug Fixes
labels:
- bug
labels: [bug]
- title: 🧰 Maintenance
labels:
- maintenance
- test
labels: [maintenance, test]
- title: 📝 Documentation
labels:
- documentation

exclude-labels:
- skip_changelog

labels: [documentation]
exclude-labels: [skip_changelog]
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
change-title-escapes: \<*_& # You can add # and @ to disable mentions, and add ` to disable code blocks.

version-resolver:
# major:
# labels:
# - 'breaking'
minor:
labels:
- breaking
- enhancement
labels: [breaking, enhancement]
patch:
labels:
- maintenance
- bug
- test
- documentation
labels: [maintenance, bug, test, documentation]
default: patch
13 changes: 2 additions & 11 deletions .github/workflows/assign_reviewers.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
---
name: Assign reviewer

on:
pull_request_target:
types: [opened, ready_for_review]

jobs:
assign:
runs-on: ubuntu-latest
if: github.event.pull_request.assignee == null

steps:
- name: Assign reviewer
uses: kentaro-m/auto-assign-action@v1.2.4
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
assign-reviewer:
uses: khanlab/actions/.github/workflows/workflow-pr_task-assignReviewer.yml@v0.3.6
85 changes: 11 additions & 74 deletions .github/workflows/bump_version.yml
Original file line number Diff line number Diff line change
@@ -1,74 +1,11 @@
---
name: Bump version
on:
pull_request_target:
types: [closed]
jobs:
build:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- name: Checkout master branch
uses: actions/checkout@master
with:
ref: ${{ github.event.pull_request.base.ref }}

- name: Update changelog
uses: release-drafter/release-drafter@v5
id: release-drafter
with:
commitish: ${{ github.event.pull_request.base.ref }}
env:
GITHUB_TOKEN: ${{ secrets.BP_PAT_TOKEN }}

- name: Get previous release version
run: |
echo "PREV_VER=$(cat pyproject.toml | grep -o -E '(version\s=\s)([[:punct:]])([0-9]+\.[0-9]+\.[0-9]+.+)([[:punct:]])' | cut -d ' ' -f 3 | tr -d '"')" >> $GITHUB_ENV
- name: Get previous bump version
env:
PREV_VER: ${{ env.PREV_VER }}
run: |
if [[ "$PREV_VER" != *"-pre."* ]]; then
echo "OLD_BUMP=0" >> $GITHUB_ENV
else
echo "OLD_BUMP=$(echo $PREV_VER | cut -d '.' -f 4)" >> $GITHUB_ENV
fi
- name: Bump version
env:
BUMP_VER: ${{ env.OLD_BUMP }}
run: |
echo "NEW_BUMP=$(($BUMP_VER + 1))" >> $GITHUB_ENV
- name: Set new release version
env:
RD_RELEASE: ${{ steps.release-drafter.outputs.name }}
run: |
if [ ! -z "$RD_RELEASE" ]; then
echo "NEW_RELEASE=$RD_RELEASE" >> $GITHUB_ENV
else
echo "NEW_RELEASE=0.1.0" >> $GITHUB_ENV
fi
- name: Update version in pyproject.toml
uses: jacobtomlinson/gha-find-replace@master
with:
include: pyproject.toml
find: version = "(?:([0-9]+\.[0-9]+\.[0-9]+.+)|([0-9]+\.[0-9]+\.[0-9]+))"
replace: version = "${{ env.NEW_RELEASE }}-pre.${{ env.NEW_BUMP }}"

- name: Commit updates
env:
SNAKEBIDS_VERSION: ${{ env.NEW_RELEASE }}-pre.${{ env.NEW_BUMP }}
run: |
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
git diff-index --quiet HEAD || git commit -m "Bump version to $SNAKEBIDS_VERSION" -a
- name: Push changes
uses: CasperWA/push-protected@v2
with:
branch: ${{ github.event.pull_request.base.ref }}
token: ${{ secrets.BP_PAT_TOKEN }}
unprotect_reviews: true
---
name: Bump version
on:
pull_request_target:
types: [closed]
jobs:
bump-version:
if: github.event.pull_request.merged == true
uses: khanlab/actions/.github/workflows/workflow-version_task-semverGithub.yml@v0.3.6
secrets:
BP_PAT: ${{ secrets.BP_PAT_TOKEN }}
14 changes: 14 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Deploy packages
on:
workflow_dispatch:
push:
tags: [v*]
jobs:
deploy_docker:
uses: khanlab/actions/.github/workflows/workflow-release_task-deployDocker.yml@v0.3.6
with:
maximize_space: true
secrets:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
39 changes: 0 additions & 39 deletions .github/workflows/deploy_docker.yml

This file was deleted.

84 changes: 8 additions & 76 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,84 +1,16 @@
---
name: Release package

on:
workflow_dispatch:
inputs:
comments:
description: "Comments"
description: Comments
required: false

jobs:
release_changelog:
runs-on: ubuntu-latest

steps:
- name: Print author
run: |
echo "Author: ${{ github.triggering_actor }}"
echo "Comments: ${{ github.event.inputs.comments }}"
- name: Extract branch name
shell: bash
id: extract_branch
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"

- uses: actions/checkout@master
with:
ref: ${{ steps.extract_branch.outputs.branch }}

- name: Draft change log
uses: release-drafter/release-drafter@v5
id: release-drafter
with:
commitish: ${{ steps.extract_branch.outputs.branch }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Set new release version
env:
RD_RELEASE: ${{ steps.release-drafter.outputs.name }}
run: |
if [ ! -z "$RD_RELEASE" ]; then
echo "NEW_RELEASE=$RD_RELEASE" >> $GITHUB_ENV
else
echo "NEW_RELEASE=0.1.0" >> $GITHUB_ENV
fi
- name: Update pipeline description
uses: jacobtomlinson/gha-find-replace@master
with:
include: 'scattr/pipeline_description.json'
find: '"Version": "(?:([0-9]+\.[0-9]+\.[0-9]+.+)|([0-9]+\.[0-9]+\.[0-9]+))"'
replace: '"Version": "${{ env.NEW_RELEASE }}"'

- name: Update version in pyproject.toml
uses: jacobtomlinson/gha-find-replace@master
with:
include: pyproject.toml
find: version = "(?:([0-9]+\.[0-9]+\.[0-9]+.+)|([0-9]+\.[0-9]+\.[0-9]+))"
replace: version = "${{ env.NEW_RELEASE }}"

- name: Commit updates
env:
LATEST_VERSION: ${{ env.NEW_RELEASE }}
run: |
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
git diff-index --quiet HEAD || git commit -m "Bump version to $LATEST_VERSION" -a
- name: Push changes
uses: CasperWA/push-protected@v2
with:
token: ${{ secrets.BP_PAT_TOKEN }}
unprotect_reviews: true

- name: Publish change log
uses: release-drafter/release-drafter@v5
with:
commitish: ${{ steps.extract_branch_outputs.branch }}
publish: true
name: ${{ env.NEW_RELEASE }}
tag: "v${{ env.NEW_RELEASE }}"
env:
GITHUB_TOKEN: ${{ secrets.BP_PAT_TOKEN }}
release_package:
uses: khanlab/actions/.github/workflows/workflow-release_task-publishGithub.yml@v0.3.6
with:
comments: ${{ github.event.inputs.comments }}
pipeline-description: true
secrets:
BP_PAT: ${{ secrets.BP_PAT_TOKEN }}
Loading