Skip to content

Commit

Permalink
Merge branch 'master' into maint/3.13_only
Browse files Browse the repository at this point in the history
  • Loading branch information
Remi-Gau authored Oct 8, 2024
2 parents d10b438 + eb2f926 commit 88fb314
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest', 'macos-latest']
python-version: [3.8, 3.9, '3.10', '3.11', '3.12', '3.13']
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
dependencies: ['full', 'pre']
include:
- os: ubuntu-latest
python-version: 3.8
python-version: '3.9'
dependencies: min
exclude:
# Drop pre tests for SPEC-0-unsupported Python versions
# See https://scientific-python.org/specs/spec-0000/
- python-version: '3.8'
dependencies: pre
- python-version: '3.9'
dependencies: pre
- python-version: '3.10'
dependencies: pre
fail-fast: false

env:
Expand Down
12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
name = "pybids"
description = "bids: interface with datasets conforming to BIDS"
readme = "README.md"
requires-python = ">=3.8"
requires-python = ">=3.9"
license = { file="LICENSE" }
authors = [
{ name = "PyBIDS Developers", email = "[email protected]" },
Expand All @@ -23,13 +23,13 @@ classifiers = [
"Topic :: Scientific/Engineering",
]
dependencies = [
"numpy >=1.19", # NEP29 + 1yr
"scipy >=1.5", # Scientific Python SPEC 0 + 1yr
"nibabel >=3.0",
"pandas >=0.25.2", # First with Py38 wheel
"numpy >=1.22", # SPEC 0 + 1yr (3yr)
"scipy >=1.8", # SPEC 0 + 1yr (3yr)
"nibabel >=4.0", # SPEC 0 + 1yr (3yr)
"pandas >=1.4.0", # SPEC 0 + 1yr (3yr)
"formulaic >=0.2.4, <0.6", # Tested on 0.2.4-0.5.2
"sqlalchemy >=1.3.16",
"bids-validator>=1.11", # Keep up-to-date to ensure support for recent modalities
"bids-validator>=1.14.7", # Keep up-to-date to ensure support for recent modalities
"num2words >=0.5.5",
"click >=8.0",
"universal_pathlib >=0.2.2",
Expand Down
13 changes: 6 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
requires =
tox>=4
envlist =
py3{8,9,10,11,12,13}-{full,pre}
py38-min
py3{9,10,11,12,13}-{full,pre}
py39-min
skip_missing_interpreters = true

# Configuration that allows us to split tests across GitHub runners effectively
[gh-actions]
python =
3.8: py38
3.9: py39
3.10: py310
3.11: py311
Expand Down Expand Up @@ -41,10 +40,10 @@ pass_env =
CLICOLOR_FORCE
extras = test
deps =
min: numpy ==1.19
min: scipy ==1.5
min: nibabel ==3.0
min: pandas ==0.25.2
min: numpy ==1.22
min: scipy ==1.8
min: nibabel ==4.0
min: pandas ==1.2.0
# Tested on 0.2.4-0.5.2
min: formulaic ==0.2.4
min: sqlalchemy ==1.3.16
Expand Down

0 comments on commit 88fb314

Please sign in to comment.