Skip to content

Commit

Permalink
Merge branch 'develop' into enhance-torch-compile
Browse files Browse the repository at this point in the history
  • Loading branch information
shaneahmed authored Sep 19, 2024
2 parents 14c9409 + 03e7491 commit a086195
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mypy-type-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

build:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

strategy:
matrix:
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 @@ -13,7 +13,7 @@ jobs:
fail-fast: true
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
os: [ubuntu-22.04, windows-latest, macos-latest]
os: [ubuntu-24.04, windows-latest, macos-latest]
steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
build:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: true
matrix:
Expand All @@ -30,7 +30,7 @@ jobs:
sudo apt update
sudo apt-get install -y libopenslide-dev openslide-tools libopenjp2-7 libopenjp2-tools
python -m pip install --upgrade pip
python -m pip install ruff==0.6.2 pytest pytest-cov pytest-runner
python -m pip install ruff==0.6.5 pytest pytest-cov pytest-runner
pip install -r requirements/requirements.txt
- name: Cache tiatoolbox static assets
uses: actions/cache@v3
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
fail-ci-on-error: false

release:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 15
needs: build
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/pre-release' || startsWith(github.ref, 'refs/tags/v')
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ repos:
- id: rst-inline-touching-normal # Detect mistake of inline code touching normal text in rst.
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.6.2
rev: v0.6.5
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
6 changes: 1 addition & 5 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-22.04
os: ubuntu-24.04
tools:
python: "3.10"
apt_packages:
Expand All @@ -19,10 +19,6 @@ build:
sphinx:
configuration: docs/conf.py

# Optionally build your docs in additional formats such as PDF
formats:
- pdf

# Optionally set the version of Python and requirements required to build your docs
python:
install:
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defusedxml>=0.7.1
filelock>=3.9.0
flask>=2.2.2
flask-cors>=4.0.0
glymur>=0.12.1, ~=0.12.6 # 0.12.6 is incompatible due to a private attribute
glymur>=0.12.7
imagecodecs>=2022.9.26
joblib>=1.1.1
jupyterlab>=3.5.2
Expand Down
3 changes: 1 addition & 2 deletions requirements/requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-r ../docs/requirements.txt
coverage>=7.0.0
docutils>=0.18.1
jinja2>=3.0.3, <3.1.0
mypy>=1.6.1
pip>=22.3
poetry-bumpversion>=0.3.1
Expand All @@ -11,7 +10,7 @@ pytest>=7.2.0
pytest-cov>=4.0.0
pytest-runner>=6.0
pytest-xdist[psutil]
ruff==0.6.2 # This will be updated by pre-commit bot to latest version
ruff==0.6.5 # This will be updated by pre-commit bot to latest version
toml>=0.10.2
twine>=4.0.1
wheel>=0.37.1

0 comments on commit a086195

Please sign in to comment.