Skip to content

Commit

Permalink
Support python 3.12 (#1772)
Browse files Browse the repository at this point in the history
Signed-off-by: Sachidanand Alle <[email protected]>
  • Loading branch information
SachidanandAlle authored Nov 4, 2024
1 parent 9e7a5e2 commit 029e9ac
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
strategy:
matrix:
os: [windows-latest, ubuntu-latest]
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v4
- name: Set up Python
Expand All @@ -50,7 +50,7 @@ jobs:
MONAI_ZOO_AUTH_TOKEN: ${{ github.token }}
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v4
- name: Set up Python
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
MONAI_ZOO_AUTH_TOKEN: ${{ github.token }}
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v4
with:
Expand Down
11 changes: 5 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,18 @@
# to use different version of MONAI pass `--build-arg MONAI_IMAGE=...`

ARG MONAI_IMAGE=projectmonai/monai:1.4.0

ARG NODE_IMAGE=node:slim

FROM ${NODE_IMAGE} as ohifbuild
ADD . /opt/monailabel
FROM ${NODE_IMAGE} AS ohifbuild
ADD ./plugins/ohifv3 /opt/ohifv3
RUN apt update -y && apt install -y git
RUN cd /opt/monailabel/plugins/ohifv3 && ./build.sh
RUN cd /opt/ohifv3 && ./build.sh /opt/ohifv3/release

FROM ${MONAI_IMAGE} as build
FROM ${MONAI_IMAGE} AS build
LABEL maintainer="[email protected]"

ADD . /opt/monailabel/
COPY --from=ohifbuild /opt/monailabel/monailabel/endpoints/static/ohif /opt/monailabel/monailabel/endpoints/static/ohif
COPY --from=ohifbuild /opt/ohifv3/release /opt/monailabel/monailabel/endpoints/static/ohif
RUN python -m pip install --upgrade --no-cache-dir pip setuptools wheel twine \
&& cd /opt/monailabel \
&& BUILD_OHIF=false python setup.py sdist bdist_wheel --build-number $(date +'%Y%m%d%H%M')
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pydicom==2.4.4
pydicom-seg==0.4.1
pynetdicom==2.0.2
pynrrd==1.0.0
numpymaxflow==0.0.6
numpymaxflow==0.0.7
girder-client==3.2.3
ninja==1.11.1.1
einops==0.7.0
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ install_requires =
pydicom-seg>=0.4.1
pynetdicom>=2.0.2
pynrrd>=1.0.0
numpymaxflow>=0.0.6
numpymaxflow>=0.0.7
girder-client>=3.2.3
ninja>=1.11.1.1
einops>=0.7.0
Expand Down

0 comments on commit 029e9ac

Please sign in to comment.