Skip to content

Commit a0f32bb

Browse files
authored
SLEAP v1.3.0 (#1231)
1 parent d792b2d commit a0f32bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1386
-343
lines changed

.conda/bld.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ pip install attrs==21.2.0
2121
pip install cattrs==1.1.1
2222
pip install jsonpickle==1.2
2323
pip install networkx
24+
pip install nixio>=1.5.3
2425
@REM pip install tensorflow>=2.6.3,<=2.7.1
2526
@REM pip install h5py>=3.1.0,<=3.6.0
2627
pip install python-rapidjson
@@ -36,6 +37,7 @@ pip install imgaug==0.4.0
3637
pip install scikit-image
3738
pip install scikit-learn==1.0.*
3839
pip install scikit-video
40+
pip install tensorflow-hub
3941
pip install imgstore==0.2.9
4042
pip install qimage2ndarray==1.9.0
4143
pip install jsmin

.conda/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pip install attrs==21.2.0
1818
pip install cattrs==1.1.1
1919
pip install jsonpickle==1.2
2020
pip install networkx
21+
pip install nixio>=1.5.3
2122
# pip install tensorflow>=2.6.3,<=2.7.1
2223
# pip install h5py>=3.1.0,<=3.6.0
2324
pip install python-rapidjson
@@ -33,6 +34,7 @@ pip install imgaug==0.4.0
3334
pip install scikit-image
3435
pip install scikit-learn==1.0.*
3536
pip install scikit-video
37+
pip install tensorflow-hub
3638
pip install imgstore==0.2.9
3739
pip install qimage2ndarray==1.9.0
3840
pip install jsmin

.conda/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ about:
1616
summary: {{ data.get('description') }}
1717

1818
build:
19-
number: 1
19+
number: 4
2020

2121
source:
2222
path: ../

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Please include information about how you installed.
2828
- OS:
2929
<!-- [e.g. ubuntu 20.04, macOS 11.0] -->
3030
- Version(s):
31-
<!-- e.g. [SLEAP v1.3.0a0, python 3.8] --->
31+
<!-- e.g. [SLEAP v1.3.0, python 3.8] --->
3232
- SLEAP installation method (listed [here](https://sleap.ai/installation.html#)):
3333
- [ ] [Conda from package](https://sleap.ai/installation.html#conda-package)
3434
- [ ] [Conda from source](https://sleap.ai/installation.html#conda-from-source)

.github/workflows/website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
# 'main' triggers updates to 'sleap.ai', all others to 'sleap.ai/develop'
99
- main
1010
- develop
11-
- liezl/docs-apple-silicon
11+
- liezl/1.3.0-build-cleanup
1212
paths:
1313
- "docs/**"
1414
- "README.rst"

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
:alt: Coverage
1212

1313
.. |Documentation| image::
14-
https://img.shields.io/github/workflow/status/talmolab/sleap/Build%20website?label=Documentation
14+
https://img.shields.io/badge/Documentation-sleap.ai-lightgrey
1515
:target: https://sleap.ai
1616
:alt: Documentation
1717

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
copyright = f"2019–{date.today().year}, Talmo Lab"
2929

3030
# The short X.Y version
31-
version = "1.3.0a0"
31+
version = "1.3.0"
3232

3333
# Get the sleap version
3434
# with open("../sleap/version.py") as f:
3535
# version_file = f.read()
3636
# version = re.search("\d.+(?=['\"])", version_file).group(0)
3737

3838
# Release should be the full branch name
39-
release = "v1.3.0a0"
39+
release = "v1.3.0"
4040

4141
html_title = f"SLEAP ({release})"
4242
html_short_title = "SLEAP"

docs/installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ On Windows, our personal preference is to use alternative terminal apps like [Cm
6464
### `conda` package
6565

6666
```bash
67-
conda create -y -n sleap -c sleap -c nvidia -c conda-forge sleap=1.2.9
67+
conda create -y -n sleap -c sleap -c nvidia -c conda-forge sleap=1.3.0
6868
```
6969

7070
**This is the recommended installation method**. Works on **Windows** and **Linux**.
@@ -113,7 +113,7 @@ conda create -y -n sleap -c sleap -c nvidia -c conda-forge sleap=1.2.9
113113
### `pip` package
114114

115115
```bash
116-
pip install sleap==1.2.9
116+
pip install sleap==1.3.0
117117
```
118118

119119
This works on **any OS except Apple silicon** and on **Google Colab**.

environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- conda-forge::pyside2>=5.13.2,<=5.14.1
88
- conda-forge::h5py=3.1.0
99
- conda-forge::scipy>=1.4.1,<=1.7.3
10-
- pillow=8.4.0
10+
- conda-forge::pillow=8.4.0
1111
- shapely=1.7.1
1212
- conda-forge::pandas
1313
- ffmpeg
@@ -17,7 +17,7 @@ dependencies:
1717
# - sleap::tensorflow=2.7.0
1818
# - sleap::pyside2=5.14.1
1919
- qtpy>=2.0.1
20-
- conda-forge::pip!=22.0.4
20+
- conda-forge::pip
2121
- pip:
2222
- "--editable=."
2323
- "--requirement=./dev_requirements.txt"

environment_build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies:
1414
# - cudatoolkit=11.3.1
1515
# - cudnn=8.2.1
1616
# - nvidia::cuda-nvcc=11.3
17+
- protobuf=3.20.* # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
1718
- qtpy>=2.0.1
1819
- conda-build=3.21.7
1920
- anaconda-client

0 commit comments

Comments
 (0)