Skip to content

Commit

Permalink
Merge branch 'main' into elizabeth/test-new-convex-hull-traits
Browse files Browse the repository at this point in the history
  • Loading branch information
eberrigan authored May 13, 2024
2 parents a869f9d + 97c69a0 commit 5289138
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.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@v4
with:
python-version: 3.9
python-version: 3.11

- name: Install dependencies
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.11

- name: Install dependencies
run: |
Expand All @@ -58,7 +58,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-22.04", "windows-2022"]
python: [3.9]
python: [3.11]

name: Tests (${{ matrix.os }}, Python ${{ matrix.python }})
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -91,20 +91,20 @@ jobs:
pip freeze
- name: Test with pytest
if: ${{ !(startsWith(matrix.os, 'ubuntu') && matrix.python == 3.9) }}
if: ${{ !(startsWith(matrix.os, 'ubuntu') && matrix.python == 3.11) }}
shell: bash -l {0}
run: |
pytest
- name: Test with pytest (with coverage)
if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.python == 3.9 }}
if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.python == 3.11 }}
shell: bash -l {0}
run: |
pytest --cov=sleap_roots --cov-report=xml tests/
- name: Upload coverage
uses: codecov/codecov-action@v4
if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.python == 3.9 }}
if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.python == 3.11 }}
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pip install sleap-roots

If you are using conda (recommended):
```
conda create -n sleap-roots python=3.9
conda create -n sleap-roots python=3.11
conda activate sleap-roots
pip install sleap-roots
```
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channels:
- defaults

dependencies:
- python=3.9
- python=3.11
- numpy
- matplotlib
- seaborn
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ license = {text = "BSD-3-Clause"}
classifiers = [
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9"
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11"
]
dependencies = [
"numpy",
Expand Down
2 changes: 1 addition & 1 deletion sleap_roots/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@

# Define package version.
# This is read dynamically by setuptools in pyproject.toml to determine the release version.
__version__ = "0.0.9"
__version__ = "0.1.0"

0 comments on commit 5289138

Please sign in to comment.