Skip to content

Commit ca37400

Browse files
authored
Merge pull request #1 from TissueImageAnalytics/develop
Merge develop
2 parents 32cae0b + f385ced commit ca37400

File tree

77 files changed

+7613
-6810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+7613
-6810
lines changed

.github/workflows/conda-env-create.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
cp ./requirements/requirements*.txt /tmp/
4141
mkdir /tmp/docs/
4242
cp ./docs/requirements*.txt /tmp/docs/
43-
- uses: mamba-org/provision-with-micromamba@main
43+
- uses: mamba-org/setup-micromamba@v1
4444
with:
4545
environment-name: tiatoolbox
4646
environment-file: ${{ matrix.requirements }}

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ env:
66
REGISTRY: ghcr.io
77
IMAGE_NAME: TissueImageAnalytics/tiatoolbox
88
image: ghcr.io/tissueimageanalytics/tiatoolbox
9-
TOOLBOX_VER: 1.5.1
9+
TOOLBOX_VER: 1.6.0
1010

1111
jobs:
1212
build-and-push-image:

.github/workflows/python-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
sudo apt update
3131
sudo apt-get install -y libopenslide-dev openslide-tools libopenjp2-7 libopenjp2-tools
3232
python -m pip install --upgrade pip
33-
python -m pip install ruff==0.7.4 pytest pytest-cov pytest-runner
33+
python -m pip install ruff==0.8.2 pytest pytest-cov pytest-runner
3434
pip install -r requirements/requirements.txt
3535
- name: Cache tiatoolbox static assets
3636
uses: actions/cache@v3

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,6 @@ ENV/
116116

117117
# vim/vi generated
118118
*.swp
119+
120+
# output zarr generated
121+
*.zarr

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repos:
2323
- mdformat-black
2424
- mdformat-myst
2525
- repo: https://github.com/executablebooks/mdformat
26-
rev: 0.7.18
26+
rev: 0.7.21
2727
hooks:
2828
- id: mdformat
2929
# Optionally add plugins
@@ -60,7 +60,7 @@ repos:
6060
- id: rst-inline-touching-normal # Detect mistake of inline code touching normal text in rst.
6161
- repo: https://github.com/astral-sh/ruff-pre-commit
6262
# Ruff version.
63-
rev: v0.7.4
63+
rev: v0.8.6
6464
hooks:
6565
- id: ruff
6666
args: [--fix, --exit-non-zero-on-fix]

AUTHORS.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@
1111
- Mostafa Jahanifar \<@mostafajahanifar>
1212
- David Epstein \<@DavidBAEpstein>
1313
- Adam Shephard \<@adamshephard>
14-
- Ruqayya Awan \<@ruqayya>
1514
- Abdullah Alsalemi \<@Abdol>
15+
- Ruqayya Awan \<@ruqayya>
16+
- Jiaqi Lv \<@Jiaqi-Lv>
1617
- Dmitrii Blaginin \<@blaginin>
1718
- Srijay Deshpande \<@Srijay-lab>
18-
- Jiaqi Lv\<@Jiaqi-Lv>
1919
- George Hadjigeorgiou \<@ghadjigeorghiou>
2020
- Abishekraj Vinayagar Gnanasambandam \<@AbishekRajVG>
2121
- Wenqi Lu \<@wenqi006>
2222
- Saad Bashir \<@rajasaad>
2323

2424
## Contributors
2525

26+
- George Batchkala \<@GeorgeBatch>
2627
- Rob Jewsbury \<@R-J96>
2728
- Mohsin Bilal \<@mbhahsmi>
2829
- Fayyaz Minhas \<@foxtrotmike>

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ authors:
4444
given-names: "Shan E Ahmed"
4545
orcid: "https://orcid.org/0000-0002-1097-1738"
4646
title: "TIAToolbox as an end-to-end library for advanced tissue image analytics"
47-
version: 1.5.1 # TIAToolbox version
47+
version: 1.6.0 # TIAToolbox version
4848
doi: 10.5281/zenodo.5802442
4949
date-released: 2022-10-20
5050
url: "https://github.com/TissueImageAnalytics/tiatoolbox"

0 commit comments

Comments
 (0)