Skip to content

Commit

Permalink
Merge branch 'develop' into dev-define-engines-abc
Browse files Browse the repository at this point in the history
  • Loading branch information
shaneahmed authored Sep 19, 2024
2 parents ca355aa + 03e7491 commit 05b1b1d
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 10 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
4 changes: 2 additions & 2 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 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
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

0 comments on commit 05b1b1d

Please sign in to comment.