Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Merge main into develop #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 26, 2022
Merged

Merge main into develop #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions .conda/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ pip install pykalman==0.9.5
pip install segmentation-models==1.0.1
pip install rich==10.16.1
pip install certifi==2021.10.8
pip install pynwb
pip install ndx-pose

rem # Use and update environment.yml call to install pip dependencies. This is slick.
rem # While environment.yml contains the non pip dependencies, the only thing left
Expand Down
2 changes: 2 additions & 0 deletions .conda/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ pip install pykalman==0.9.5
pip install segmentation-models==1.0.1
pip install rich==10.16.1
pip install certifi==2021.10.8
pip install pynwb
pip install ndx-pose

pip install setuptools-scm

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
copyright = f"2019–{date.today().year}, Talmo Lab"

# The short X.Y version
version = "1.2.5"
version = "1.2.6"

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

# Release should be the full branch name
release = "v1.2.5"
release = "v1.2.6"

html_title = f"SLEAP ({release})"
html_short_title = "SLEAP"
Expand Down
4 changes: 2 additions & 2 deletions docs/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ On Windows, our personal preference is to use alternative terminal apps like [Cm
### `conda` package

```bash
conda create -y -n sleap -c sleap -c nvidia -c conda-forge sleap=1.2.5
conda create -y -n sleap -c sleap -c nvidia -c conda-forge sleap=1.2.6
```

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

```bash
pip install sleap==1.2.5
pip install sleap==1.2.6
```

This works on **any OS** and on **Google Colab**.
Expand Down
2 changes: 1 addition & 1 deletion sleap/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"""


__version__ = "1.2.5"
__version__ = "1.2.6"


def versions():
Expand Down