From b444b18bf3bb7235b25a621dcbf9a1bedb70a669 Mon Sep 17 00:00:00 2001 From: Caroline Bridge Date: Wed, 3 Jan 2024 11:26:23 -0500 Subject: [PATCH] adds auto pub action to be triggered by auto deploy --- .github/bump.yml | 38 ++++++++++++++++++++++++++++++++++ .github/workflows/auto_pub.yml | 30 +++++++++++++++++++++++++++ .gitignore | 2 +- jbrowse_jupyter/tracks.py | 1 - 4 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 .github/bump.yml create mode 100644 .github/workflows/auto_pub.yml diff --git a/.github/bump.yml b/.github/bump.yml new file mode 100644 index 0000000..db1bfb4 --- /dev/null +++ b/.github/bump.yml @@ -0,0 +1,38 @@ +release: + title-prefix: 'v' + title-postfix: '' + body-title: '' + body-when-empty-changes: 'No changes' + initial-version: '1.5.9' + tag-prefix: 'v' + tag-postfix: '' +branch: + base-branch: 'main' + version-branch-prefix: 'v' + version-branch-postfix: '' + create-major-version-branch: false + create-minor-version-branch: true + bump-version-commit-prefix: 'v' + bump-version-commit-postfix: '' +categories: + - title: '' + commits: + - 'Upgrading JBrowse version' + changes-prefix: 'Automatic JBrowse dependency upgrade: ' +bump: + default: 'minor' + major: + labels: + - 'major' + commits: + - 'major:' + minor: + labels: + - 'minor' + commits: + - 'minor: JBrowse version bump' + patch: + labels: + - 'patch' + commits: + - 'patch:' \ No newline at end of file diff --git a/.github/workflows/auto_pub.yml b/.github/workflows/auto_pub.yml new file mode 100644 index 0000000..d9b9460 --- /dev/null +++ b/.github/workflows/auto_pub.yml @@ -0,0 +1,30 @@ +name: Receive dispatch (publish) + +on: + repository_dispatch: + types: + - auto_publish + +jobs: + upgrade: # upgrades package files with new JBrowse version + runs-on: ubuntu-latest + steps: + - name: Upgrade dash_jbrowse version + uses: actions/checkout@v4 + - run: | + sed -i 's|.*dash-jbrowse.*| "dash-jbrowse>=${{github.event.client_payload.version}}",|' requirements.txt + - name: Commit and push changes + run : | + git config --global user.name "cmdcolin" + git config --global user.email "colin.diesh@gmail.com" + git add -A + git commit -m "Upgrading dash_jbrowse version" + git push + - name: Bump version + uses: MeilCli/bump-release-action@v1 + with: + config_path: '.github/bump.yml' + bump: 'patch' + release: + needs: upgrade + uses: ./.github/workflows/release.yml \ No newline at end of file diff --git a/.gitignore b/.gitignore index eef2b81..10861df 100644 --- a/.gitignore +++ b/.gitignore @@ -128,7 +128,7 @@ dmypy.json # Pyre type checker .pyre/ - +.DS_Store .vscode GRCh37_latest_genomic.sort.gff.gz diff --git a/jbrowse_jupyter/tracks.py b/jbrowse_jupyter/tracks.py index a5a627d..4c574f4 100644 --- a/jbrowse_jupyter/tracks.py +++ b/jbrowse_jupyter/tracks.py @@ -529,7 +529,6 @@ def get_track_data(df): df["additional"] = "" if "score" in df: required.append("score") - # if df.dtypes["score"] != int: if isinstance(df.dtypes["score"], numbers.Number): raise TypeError("Score column must be a number.") filtered = df[required]