Skip to content

Commit

Permalink
Merge branch 'develop' into dev-update-wsidicom
Browse files Browse the repository at this point in the history
  • Loading branch information
shaneahmed committed Feb 20, 2024
2 parents c812c6a + 5c00381 commit 6c487fe
Show file tree
Hide file tree
Showing 34 changed files with 2,850 additions and 2,781 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ jobs:
fail-fast: true
matrix:
include:
- dockerfile: ./docker/3.8/Debian/Dockerfile
mtag: py3.8-debian
- dockerfile: ./docker/3.9/Debian/Dockerfile
mtag: py3.9-debian
- dockerfile: ./docker/3.9/Ubuntu/Dockerfile
Expand All @@ -25,7 +23,15 @@ jobs:
mtag: py3.10-debian
- dockerfile: ./docker/3.10/Ubuntu/Dockerfile
mtag: py3.10-ubuntu
- dockerfile: ./docker/3.10/Ubuntu/Dockerfile
- dockerfile: ./docker/3.11/Debian/Dockerfile
mtag: py3.11-debian
- dockerfile: ./docker/3.11/Ubuntu/Dockerfile
mtag: py3.11-ubuntu
- dockerfile: ./docker/3.12/Debian/Dockerfile
mtag: py3.12-debian
- dockerfile: ./docker/3.12/Ubuntu/Dockerfile
mtag: py3.12-ubuntu
- dockerfile: ./docker/3.12/Ubuntu/Dockerfile
mtag: latest
permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mypy-type-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]

steps:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pip-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: true
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
os: [ubuntu-22.04, windows-latest, macos-latest]
steps:
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: true
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Prepare a computer as a convenient platform for further development of the Pytho
5. Create virtual environment for TIAToolbox using

```sh
$ conda create -n tiatoolbox-dev python=3.8 # select version of your choice
$ conda create -n tiatoolbox-dev python=3.9 # select version of your choice
$ conda activate tiatoolbox-dev
$ pip install -r requirements/requirements_dev.txt
```
Expand Down
Loading

0 comments on commit 6c487fe

Please sign in to comment.