Skip to content

Commit

Permalink
Merge branch 'main' into henryiii/chore/pcup
Browse files Browse the repository at this point in the history
  • Loading branch information
HDembinski committed Oct 9, 2024
2 parents f9d222a + be3d5c1 commit ea69d6f
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 14 deletions.
30 changes: 17 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,35 @@ jobs:

strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest]
# version number must be string, otherwise 3.10 becomes 3.1
python-version: ["3.8", "3.10", "3.13"]
include:
# version number must be string, otherwise 3.10 becomes 3.1
- os: windows-latest
python-version: "3.12"
- os: ubuntu-latest
python-version: "3.10"
- os: macos-latest
python-version: "3.9"
- os: macos-13
python-version: "3.11"
fail-fast: false
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- run: python -m pip install --upgrade pip
- run: python -m pip install -e .[test]
allow-prereleases: true

- if: ${{ matrix.os != 'ubuntu-latest' }}
- uses: astral-sh/setup-uv@v3

- run: uv pip install --system -e .[test]

- if: matrix.os != 'ubuntu-latest'
run: python -m pytest

# toml is needed only by coveralls
- if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
python -m pip install toml
JUPYTER_PLATFORM_DIRS=1 coverage run -m pytest
- if: ${{ matrix.os == 'ubuntu-latest' }}
- if: matrix.os == 'ubuntu-latest'
env:
JUPYTER_PLATFORM_DIRS: 1
run: coverage run -m pytest

- if: matrix.os == 'ubuntu-latest'
uses: coverallsapp/github-action@v2
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ classifiers = [
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def test_resample_3d_parametric_normal_raises():


def test_resample_equal_along_axis():
data = np.reshape(np.tile([0, 1, 2], 3), newshape=(3, 3))
data = np.reshape(np.tile([0, 1, 2], 3), (3, 3))
for b in resample(data, size=2):
assert_equal(data, b)

Expand Down

0 comments on commit ea69d6f

Please sign in to comment.