Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
python-ver: ['3.9', '3.13']
python-ver: ['3.10', '3.13']

steps:
- uses: actions/checkout@v6
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/docker-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ jobs:
with:
submodules: 'recursive'
- name: Log in to Docker Hub
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
username: ${{ vars.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Build image and push to Docker Hub
run: |
docker build -t ${{ vars.DOCKER_USERNAME }}/neurocaps:${{ github.ref_name }} -f docker/Dockerfile . &&
docker push ${{ vars.DOCKER_USERNAME }}/neurocaps:${{ github.ref_name }}
docker push ${{ vars.DOCKER_USERNAME }}/neurocaps:${{ github.ref_name }} &&
docker tag ${{ vars.DOCKER_USERNAME }}/neurocaps:${{ github.ref_name }} ${{ vars.DOCKER_USERNAME }}/neurocaps:latest &&
docker push ${{ vars.DOCKER_USERNAME }}/neurocaps:latest
2 changes: 1 addition & 1 deletion .github/workflows/minimum_dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
python-ver: ['3.9']
python-ver: ['3.10']

name: Python ${{ matrix.python-ver }} check on ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v6
with:
python-version: '3.9'
python-version: '3.10'

- name: Install precommit
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: '3.9'
python-version: '3.10'

- name: Install dependencies
run: |
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
shell: bash

- name: Install pytest-forked for Ubuntu Python 3.11+
if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-ver != '3.9' && matrix.python-ver != '3.10' }}
if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-ver != '3.10' }}
run: pip install pytest-forked
shell: bash

Expand All @@ -64,19 +64,12 @@ jobs:
run: pytest tests/ --cov neurocaps -v

- name: Run tests without coverage for Ubuntu on Python 3.11-3.14 (forked)
if: ${{ matrix.os == 'ubuntu-latest' && (matrix.python-ver == '3.11' || matrix.python-ver == '3.12' || matrix.python-ver == '3.13' || matrix.python-ver == '3.14') }}
if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-ver != '3.10' }}
uses: coactions/setup-xvfb@v1
with:
options: -screen 0 1600x1200x24
run: pytest tests/ --forked -v

- name: Run tests without coverage for Ubuntu on Python 3.9
if: ${{ matrix.os == 'ubuntu-latest' && (matrix.python-ver == '3.9') }}
uses: coactions/setup-xvfb@v1
with:
options: -screen 0 1600x1200x24
run: pytest tests/ -v

- name: Run tests without coverage for Mac
if: ${{ matrix.os == 'macos-latest' }}
run: pytest . -v
Expand All @@ -91,6 +84,6 @@ jobs:

- name: Upload coverage reports to Codecov for Ubuntu
if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-ver == '3.10' }}
uses: codecov/codecov-action@v5.5.2
uses: codecov/codecov-action@v6.0.0
with:
token: ${{ secrets.CODECOV_TOKEN }}
9 changes: 5 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
rev: v6.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -12,7 +12,7 @@ repos:
- id: mixed-line-ending

- repo: https://github.com/psf/black
rev: 25.1.0
rev: 26.3.1
hooks:
- id: black
args: [--line-length=100]
Expand All @@ -21,15 +21,16 @@ repos:
- black[jupyter]

- repo: https://github.com/adamchainz/blacken-docs
rev: 1.19.1
rev: 1.20.0
hooks:
- id: blacken-docs
args: [--line-length=90]
exclude: 'archives/'
additional_dependencies:
- black

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.11.6
rev: v0.15.8
hooks:
- id: ruff
# Ensure no print statements are in the codebase; only logging allowed
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ noted in the changelog (e.g., new functions or parameters, changes in parameter
improvements/enhancements. All fixes and modifications are backwards compatible.
- *.postN* : Consists of documentation changes or metadata-related updates, such as modifications to type hints.

## [0.37.4] - 2026-05-09
### ♻ Changed
- ``high_pass`` is now automatically set to ``None`` with a warning when cosine regressors are detected in user-specified `confound_names`, preventing multicollinearity between nilearn's DCT basis functions and fMRIPrep's cosine regressors.

## [0.37.3] - 2026-04-16
### ♻ Changed
- Added support for the ``NEUROCAPS_DATA`` environment variable to override the default data directory location used by fetch_preset_parcel_approach. Defaults to "~/neurocaps_data" when unset.
- Dropped Python 3.9 support

## [0.37.2] - 2026-02-19
### 💻 Metadata
- Update metadata on Pypi
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Latest Version](https://img.shields.io/pypi/v/neurocaps.svg)](https://pypi.python.org/pypi/neurocaps/)
[![Python Versions](https://img.shields.io/pypi/pyversions/neurocaps.svg)](https://pypi.python.org/pypi/neurocaps/)
[![DOI](https://img.shields.io/badge/DOI-10.5281%2Fzenodo.11642615-teal)](https://doi.org/10.5281/zenodo.18529846)
[![DOI](https://img.shields.io/badge/DOI-10.5281%2Fzenodo.11642615-teal)](https://doi.org/10.5281/zenodo.19602764)
[![Test Status](https://github.com/donishadsmith/neurocaps/actions/workflows/testing.yaml/badge.svg)](https://github.com/donishadsmith/neurocaps/actions/workflows/testing.yaml)
[![Documentation Status](https://readthedocs.org/projects/neurocaps/badge/?version=stable)](http://neurocaps.readthedocs.io/en/stable/?badge=stable)
[![codecov](https://codecov.io/github/donishadsmith/neurocaps/branch/main/graph/badge.svg?token=WS2V7I16WF)](https://codecov.io/github/donishadsmith/neurocaps)
Expand All @@ -18,7 +18,7 @@ k-means clustering on BOLD timeseries data [^1].
</p>

## Installation
**Requires Python 3.9-3.14.**
**Requires Python 3.10-3.14.**

### Standard Installation
```bash
Expand Down
Loading
Loading