Skip to content

Commit

Permalink
Merge pull request #804 from henrykironde/bumpversion
Browse files Browse the repository at this point in the history
Release version update
  • Loading branch information
henrykironde authored Oct 14, 2024
2 parents c3bb328 + 101ef18 commit 99d0cfb
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 14 deletions.
12 changes: 5 additions & 7 deletions .bumpversion.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.bumpversion]
current_version = "1.4.0-dev0"
current_version = "1.4.1"

parse = """(?x)
(?P<major>0|[1-9]\\d*)\\.
Expand All @@ -12,9 +12,10 @@ parse = """(?x)
)? # pre-release section is optional
"""
serialize = [
"{major}.{minor}.{patch}-{pre_l}{pre_n}",
"{major}.{minor}.{patch}",
"{major}.{minor}.{patch}-{pre_l}{pre_n}"
]

[tool.bumpversion.parts.pre_l]
values = ["dev", "rc", "final"]
optional_value = "final"
Expand All @@ -24,17 +25,14 @@ replace = "{new_version}"
regex = false
ignore_missing_version = false
ignore_missing_files = false
tag = false
tag = true
sign_tags = false
tag_name = "v{new_version}"
tag_message = "Bump version: {current_version} → {new_version}"
allow_dirty = false
commit = false
commit = true # Commit after bumping the version
message = "Bump version: {current_version} → {new_version}"
commit_args = ""
setup_hooks = []
pre_commit_hooks = []
post_commit_hooks = []

[[tool.bumpversion.files]]
filename = "setup.py"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Conda-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- "3.10"

os:
- "ubuntu-latest"
- "ubuntu-22.04"

runs-on: "${{ matrix.os }}"

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ Start
1. **Run the tests** – seriously, run them now.
2. Ensure `HISTORY.rst` is up to date with all changes since the last release.
3. Use `bump-my-version show-bump` to determine the appropriate version bump.
4. Update the version for release: `bump-my-version bump [minor | patch | pre_l | pre_n]`.
4. Update the version for release: `bump-my-version bump [minor | patch | pre_l | pre_n]`. If show-bump does not have the right option, we can manually set it `bump-my-version bump --new-version 1.4.0`
5. Publish the release to PyPi and update the Conda package.
6. Post-release, update the version to the next development iteration:
- Run `bump-my-version show-bump` to check the target version.
Expand Down
1 change: 1 addition & 0 deletions deepforest/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
__email__ = '[email protected]'

import os
from ._version import __version__
from pytorch_lightning.utilities import disable_possible_user_warnings

_ROOT = os.path.abspath(os.path.dirname(__file__))
Expand Down
3 changes: 2 additions & 1 deletion deepforest/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
__version__ = '1.4.0-dev0'
__version__ = '1.4.1'
# Version updated using bump-my-version
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from distutils.command.build_ext import build_ext as DistUtilsBuildExt

NAME = 'deepforest'
VERSION = '1.4.0-dev0'
VERSION = '1.4.1'
DESCRIPTION = 'Tree crown prediction using deep learning retinanets'
URL = 'https://github.com/Weecology/DeepForest'
AUTHOR = 'Ben Weinstein'
Expand Down
11 changes: 8 additions & 3 deletions version_switcher.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@
"url": "https://deepforest.readthedocs.io/en/latest/"
},
{
"name": "1.3.3 (stable)",
"version": "1.3.3",
"url": "https://deepforest.readthedocs.io/en/v1.3.3/",
"name": "1.4.1 (stable)",
"version": "1.4.1",
"url": "https://deepforest.readthedocs.io/en/v1.4.1/",
"preferred": true
},
{
"name": "1.3.3",
"version": "1.3.3",
"url": "https://deepforest.readthedocs.io/en/v1.3.3/"
},
{
"name": "1.3.2",
"version": "1.3.2",
Expand Down

0 comments on commit 99d0cfb

Please sign in to comment.