Skip to content

Commit a904740

Browse files
authored
Merge pull request #6 from FNNDSC/update
Update actions and Python versions
2 parents 1e9e879 + 2b785e6 commit a904740

3 files changed

Lines changed: 19 additions & 21 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
test:
2121
name: Unit tests
2222
if: false # delete this line to enable automatic testing
23-
runs-on: ubuntu-22.04
23+
runs-on: ubuntu-24.04
2424
steps:
2525
- uses: actions/checkout@v4
26-
- uses: docker/setup-buildx-action@v3
26+
- uses: docker/setup-buildx-action@v4
2727
- name: Build
28-
uses: docker/build-push-action@v5
28+
uses: docker/build-push-action@v7
2929
with:
3030
build-args: extras_require=dev
3131
context: .
@@ -44,7 +44,7 @@ jobs:
4444
if: false # delete this line and uncomment the line below to enable automatic builds
4545
# if: github.event_name == 'push' || github.event_name == 'release'
4646
# needs: [ test ] # uncomment to require passing tests
47-
runs-on: ubuntu-22.04
47+
runs-on: ubuntu-24.04
4848

4949
steps:
5050
- name: Decide image tags
@@ -85,19 +85,19 @@ jobs:
8585
for k, v in outputs.items():
8686
out.write(f'{k}={v}\n')
8787
88-
- uses: actions/checkout@v4
88+
- uses: actions/checkout@v6
8989
# QEMU is used for non-x86_64 builds
90-
- uses: docker/setup-qemu-action@v3
90+
- uses: docker/setup-qemu-action@v4
9191
# buildx adds additional features to docker build
92-
- uses: docker/setup-buildx-action@v3
92+
- uses: docker/setup-buildx-action@v4
9393
with:
9494
driver-opts: network=host
9595

9696
# Here, we want to do the docker build twice:
9797
# The first build pushes to our local registry for testing.
9898
# The second build pushes to Docker Hub and ghcr.io
9999
- name: Build (local only)
100-
uses: docker/build-push-action@v3
100+
uses: docker/build-push-action@v7
101101
id: docker_build
102102
with:
103103
context: .
@@ -138,19 +138,19 @@ jobs:
138138
139139
- name: Login to DockerHub
140140
if: (github.event_name == 'push' || github.event_name == 'release') && contains(steps.info.outputs.tags_csv, 'docker.io')
141-
uses: docker/login-action@v3
141+
uses: docker/login-action@v4
142142
with:
143143
username: ${{ secrets.DOCKERHUB_USERNAME }}
144144
password: ${{ secrets.DOCKERHUB_PASSWORD }}
145145
- name: Login to GitHub Container Registry
146146
if: (github.event_name == 'push' || github.event_name == 'release') && contains(steps.info.outputs.tags_csv, 'ghcr.io')
147-
uses: docker/login-action@v3
147+
uses: docker/login-action@v4
148148
with:
149149
registry: ghcr.io
150150
username: ${{ github.repository_owner }}
151151
password: ${{ secrets.GITHUB_TOKEN }}
152152
- name: Build and push
153-
uses: docker/build-push-action@v5
153+
uses: docker/build-push-action@v7
154154
if: (github.event_name == 'push' || github.event_name == 'release')
155155
with:
156156
context: .
@@ -174,8 +174,7 @@ jobs:
174174

175175
- name: Update DockerHub description
176176
if: steps.upload.outcome == 'success'
177-
uses: peter-evans/dockerhub-description@v3
178-
continue-on-error: true # it is not crucial that this works
177+
uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa #v5.0.0
179178
with:
180179
username: ${{ secrets.DOCKERHUB_USERNAME }}
181180
password: ${{ secrets.DOCKERHUB_PASSWORD }}

.github/workflows/src.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ on:
1111
jobs:
1212
local:
1313
name: Local test
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-24.04
1515
strategy:
1616
matrix:
17-
python-version: [ '3.8.2', '3.9', '3.10', '3.11', '3.12' ]
17+
python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
1818
steps:
19-
- uses: actions/checkout@v4
20-
- uses: actions/setup-python@v4
19+
- uses: actions/checkout@v6
20+
- uses: actions/setup-python@v6
2121
with:
2222
python-version: ${{ matrix.python-version }}
2323
- name: Configure git
@@ -50,7 +50,7 @@ jobs:
5050
name: Integration tests
5151
runs-on: ubuntu-latest
5252
steps:
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v6
5454
- name: Edit code
5555
run: |
5656
git config --global user.email "dev@babyMRI.org"
@@ -103,7 +103,7 @@ jobs:
103103
needs: [ local, integration ]
104104
steps:
105105
- name: Git checkout
106-
uses: actions/checkout@v4
106+
uses: actions/checkout@v6
107107
with:
108108
persist-credentials: false
109109
fetch-depth: 0
@@ -134,7 +134,7 @@ jobs:
134134
135135
git commit --no-edit
136136
- name: Push to main
137-
uses: ad-m/github-push-action@552c074ed701137ebd2bf098e70c394ca293e87f
137+
uses: ad-m/github-push-action@4cc74773234f74829a8c21bc4d69dd4be9cfa599 #v1.1.0
138138
with:
139139
github_token: ${{ secrets.GITHUB_TOKEN }}
140140
branch: main

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ def get_version(rel_path: str) -> str:
3434
]
3535
},
3636
classifiers=[
37-
'License :: OSI Approved :: MIT License',
3837
'Topic :: Scientific/Engineering',
3938
'Topic :: Scientific/Engineering :: Bio-Informatics',
4039
'Topic :: Scientific/Engineering :: Medical Science Apps.'

0 commit comments

Comments
 (0)