Skip to content

Commit

Permalink
Bump version to 1.4.1 (#2062)
Browse files Browse the repository at this point in the history
* Bump version to 1.4.1

* Trigger conda/pypi builds (no upload)

* Trigger website build

* Add dev channel to installation instructions

---------

Co-authored-by: Talmo Pereira <talmo@salk.edu>
  • Loading branch information
roomrys and talmo authored Dec 19, 2024
1 parent 47a0efa commit 1729ca7
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
16 changes: 8 additions & 8 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ Tell us a little about the system you're using.
Please include information about how you installed.
-->

- OS:
- OS:
<!-- [e.g. ubuntu 20.04, macOS 11.0] -->
- Version(s):
<!-- e.g. [SLEAP v1.4.1a2, python 3.8] --->
- SLEAP installation method (listed [here](https://sleap.ai/installation.html#)):
- [ ] [Conda from package](https://sleap.ai/installation.html#conda-package)
- [ ] [Conda from source](https://sleap.ai/installation.html#conda-from-source)
- [ ] [pip package](https://sleap.ai/installation.html#pip-package)
- [ ] [Apple Silicon Macs](https://sleap.ai/installation.html#apple-silicon-macs)
- Version(s):
<!-- e.g. [SLEAP v1.4.1, python 3.8] --->
- SLEAP installation method (listed [here](https://sleap.ai/installation.html#)):
- [ ] [Conda from package](https://sleap.ai/installation.html#conda-package)
- [ ] [Conda from source](https://sleap.ai/installation.html#conda-from-source)
- [ ] [pip package](https://sleap.ai/installation.html#pip-package)
- [ ] [Apple Silicon Macs](https://sleap.ai/installation.html#apple-silicon-macs)

<details><summary>Environment packages</summary>
<!-- For reproduction, it's useful to have the full environment. For example, the output of `pip freeze` or `conda list` --->
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_conda_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- "requirements.txt"
- "dev_requirements.txt"
- "environment_build.yml"
- ".github/workflows/build_conda_ci.yml"
- ".github/workflows/build_conda_ci.yml" # Run!

# If RUN_BUILD_JOB is set to true, then RUN_ID will be overwritten to the current run id
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_pypi_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- "jupyter_requirements.txt"
- "pypi_requirements.txt"
- "environment_build.yml"
- ".github/workflows/build_pypi_ci.yml"
- ".github/workflows/build_pypi_ci.yml" # Run!

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
# 'main' triggers updates to 'sleap.ai', all others to 'sleap.ai/develop'
- main
- develop
- liezl/add-channels-for-pip-conda-env
- liezl/bump-to-1.4.1
paths:
- "docs/**"
- "README.rst"
Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
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.4.1a2"
version = "1.4.1"

# 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.4.1a2"
release = "v1.4.1"

html_title = f"SLEAP ({release})"
html_short_title = "SLEAP"
Expand Down Expand Up @@ -178,7 +178,7 @@ def linkcode_resolve(domain, info):
# These paths are either relative to html_static_path
# or fully qualified paths (eg. https://...)
html_css_files = [
'css/tabs.css',
"css/tabs.css",
]

# Custom sidebar templates, must be a dictionary that maps document names
Expand Down
10 changes: 5 additions & 5 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ SLEAP can be installed as a Python package on Windows, Linux, and Mac OS. For qu
````{tabs}
```{group-tab} Windows and Linux
```bash
conda create -y -n sleap -c conda-forge -c nvidia -c sleap -c anaconda sleap=1.4.1a2
conda create -y -n sleap -c conda-forge -c nvidia -c sleap/label/dev -c sleap -c anaconda sleap=1.4.1
```
```
```{group-tab} Mac OS
```bash
conda create -y -n sleap -c conda-forge -c anaconda -c sleap sleap=1.4.1a2
conda create -y -n sleap -c conda-forge -c anaconda -c sleap sleap=1.4.1
```
```
````
Expand Down Expand Up @@ -146,7 +146,7 @@ SLEAP can be installed three different ways: via {ref}`conda package<condapackag
````{tabs}
```{group-tab} Windows and Linux
```bash
conda create -y -n sleap -c conda-forge -c nvidia -c sleap -c anaconda sleap=1.4.1a2
conda create -y -n sleap -c conda-forge -c nvidia -c sleap -c anaconda sleap=1.4.1
```
```{note}
- This comes with CUDA to enable GPU support. All you need is to have an NVIDIA GPU and [updated drivers](https://nvidia.com/drivers).
Expand All @@ -156,7 +156,7 @@ SLEAP can be installed three different ways: via {ref}`conda package<condapackag
```
```{group-tab} Mac OS
```bash
conda create -y -n sleap -c conda-forge -c anaconda -c sleap sleap=1.4.1a2
conda create -y -n sleap -c conda-forge -c anaconda -c sleap sleap=1.4.1
```
```{note}
This will also work in CPU mode if you don't have a GPU on your machine.
Expand Down Expand Up @@ -239,7 +239,7 @@ SLEAP can be installed three different ways: via {ref}`conda package<condapackag
```
3. Finally, we can perform the `pip install`:
```bash
pip install sleap[pypi]==1.4.1a2
pip install sleap[pypi]==1.4.1
```
```{note}
The pypi distributed package of SLEAP ships with the following extras:
Expand Down
2 changes: 1 addition & 1 deletion sleap/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Must be a semver string, "aN" should be appended for alpha releases.
"""

__version__ = "1.4.1a2"
__version__ = "1.4.1"


def versions():
Expand Down

0 comments on commit 1729ca7

Please sign in to comment.