Skip to content

Commit c0e6084

Browse files
authored
Merge branch 'main' into enh/context
2 parents bfb3e11 + a40bf21 commit c0e6084

8 files changed

+76
-726
lines changed

.all-contributorsrc

-482
This file was deleted.

.github/workflows/build-test-deploy.yml

+9-14
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ jobs:
4747
fail-fast: false
4848
matrix:
4949
os: [ubuntu-latest, macos-latest, windows-latest]
50-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
50+
python-version: ['3.9', '3.10', '3.11', '3.12']
5151
dependencies: ['full', 'pre']
5252
include:
5353
- os: ubuntu-latest
54-
python-version: '3.8'
54+
python-version: '3.9'
5555
dependencies: 'min'
5656
exclude:
5757
# Skip pre-release tests for Pythons out of SPEC0
58-
- python-version: 3.8
58+
- python-version: '3.9'
5959
dependencies: pre
60-
- python-version: 3.9
60+
- python-version: '3.10'
6161
dependencies: pre
6262

6363
env:
@@ -70,12 +70,8 @@ jobs:
7070
git config --global user.email "[email protected]"
7171
git config --global user.name "bids-maintenance"
7272
73-
- name: Set up Python ${{ matrix.python-version }} via conda
74-
uses: conda-incubator/setup-miniconda@v3
75-
if: matrix.os == 'ubuntu-latest'
76-
with:
77-
auto-update-conda: true
78-
python-version: ${{ matrix.python-version }}
73+
- name: Install the latest version of uv
74+
uses: astral-sh/setup-uv@v5
7975

8076
- name: Set up Python ${{ matrix.python-version }}
8177
uses: actions/setup-python@v5
@@ -86,7 +82,7 @@ jobs:
8682

8783
- name: Install git-annex ubuntu
8884
if: matrix.os == 'ubuntu-latest'
89-
run: conda install -c conda-forge git-annex
85+
run: sudo apt-get update && sudo apt-get install git-annex
9086

9187
- name: Install git-annex macos
9288
if: matrix.os == 'macos-latest'
@@ -106,13 +102,12 @@ jobs:
106102
107103
- name: Install tox
108104
run: |
109-
python -m pip install --upgrade pip
110-
python -m pip install tox tox-gh-actions
105+
uv tool install --with=tox-uv --with=tox-gh-actions tox
111106
- name: Show tox config
112107
run: tox c
113108
- name: Run tox
114109
run: tox -v --exit-and-dump-after 1200
115-
- uses: codecov/codecov-action@v4
110+
- uses: codecov/codecov-action@v5
116111
if: ${{ always() }}
117112
with:
118113
token: ${{ secrets.CODECOV_TOKEN }}

.pre-commit-config.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.4.0
3+
rev: v5.0.0
44
hooks:
55
- id: trailing-whitespace
66
- id: end-of-file-fixer
@@ -9,10 +9,8 @@ repos:
99
- id: check-toml
1010
- id: check-added-large-files
1111
- repo: https://github.com/astral-sh/ruff-pre-commit
12-
rev: v0.4.3
12+
rev: v0.11.0
1313
hooks:
1414
- id: ruff
1515
args: [ --fix ]
1616
- id: ruff-format
17-
- id: ruff
18-
args: [ --select, ISC001, --fix ]

CONTRIBUTING.md

-168
This file was deleted.

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
1717
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
1818
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
1919
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)