Skip to content

Commit

Permalink
Merge branch 'main' into add_bioformats
Browse files Browse the repository at this point in the history
  • Loading branch information
weiglszonja authored Jun 4, 2024
2 parents bf1b80d + 967aaca commit cb55905
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 11 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/deploy_pr_tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Deploy PR Tests

on:
workflow_dispatch:
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
update-testing-data:
uses: ./.github/workflows/update-testing-data.yml

run-tests:
needs: update-testing-data
uses: ./.github/workflows/run-tests.yml

dev-tests:
needs: update-testing-data
uses: ./.github/workflows/dev-testing.yaml
6 changes: 1 addition & 5 deletions .github/workflows/dev-testing.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
name: Dev Testing
on:
pull_request:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
workflow_call:

jobs:
run:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
name: Full Tests
on:
pull_request:
workflow_dispatch:
workflow_call:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
run:
name: Full tests on ${{ matrix.os }} with Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-testing-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- if: steps.cache-ophys-datasets.outputs.cache-hit == false
name: Install and configure AWS CLI
run: |
pip install awscli==1.29.56
pip install awscli
aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
- if: steps.cache-ophys-datasets.outputs.cache-hit == false
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* Remove unnecessary `scipy` import error handling: [#315](https://github.com/catalystneuro/roiextractors/pull/315)
* Fixed the typing returned by the `InscopixImagingExtractor.get_dtype` method: [#326](https://github.com/catalystneuro/roiextractors/pull/326)
* Detect Changelog Updates was moved to its own dedicated workflow to avoid daily testing failures: [#336](https://github.com/catalystneuro/roiextractors/pull/336)
* Fixed the Update Testing Data Workflow by unpinning the version of awscli: [#339](https://github.com/catalystneuro/roiextractors/pull/339)

### Improvements

Expand Down

0 comments on commit cb55905

Please sign in to comment.