From 2127786bb5c4872f70614ae4c56d564af35ff186 Mon Sep 17 00:00:00 2001 From: henrykironde Date: Wed, 9 Oct 2024 15:55:24 -0400 Subject: [PATCH 1/5] Automatically create a git tag and commit after the version update Add final release rule and omit the pre_l and pre_n parts --- .bumpversion.toml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.bumpversion.toml b/.bumpversion.toml index a99bac56..b4c4b44b 100644 --- a/.bumpversion.toml +++ b/.bumpversion.toml @@ -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" @@ -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" From 0e559eb635a1321b391fbb6198d03357dca3865e Mon Sep 17 00:00:00 2001 From: henrykironde Date: Wed, 9 Oct 2024 18:12:17 -0400 Subject: [PATCH 2/5] Release verion update --- .bumpversion.toml | 2 +- CONTRIBUTING.rst | 2 +- deepforest/_version.py | 2 +- setup.py | 2 +- version_switcher.json | 11 ++++++++--- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.bumpversion.toml b/.bumpversion.toml index b4c4b44b..ec907b32 100644 --- a/.bumpversion.toml +++ b/.bumpversion.toml @@ -1,5 +1,5 @@ [tool.bumpversion] -current_version = "1.4.0-dev0" +current_version = "1.4.0" parse = """(?x) (?P0|[1-9]\\d*)\\. diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index ec3b6356..14ae2de4 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -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. diff --git a/deepforest/_version.py b/deepforest/_version.py index b77530a1..d600007d 100644 --- a/deepforest/_version.py +++ b/deepforest/_version.py @@ -1 +1 @@ -__version__ = '1.4.0-dev0' +__version__ = '1.4.0' diff --git a/setup.py b/setup.py index 05d35564..f935c61d 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.command.build_ext import build_ext as DistUtilsBuildExt NAME = 'deepforest' -VERSION = '1.4.0-dev0' +VERSION = '1.4.0' DESCRIPTION = 'Tree crown prediction using deep learning retinanets' URL = 'https://github.com/Weecology/DeepForest' AUTHOR = 'Ben Weinstein' diff --git a/version_switcher.json b/version_switcher.json index 427e844d..9c377c61 100644 --- a/version_switcher.json +++ b/version_switcher.json @@ -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.0 (stable)", + "version": "1.4.0", + "url": "https://deepforest.readthedocs.io/en/v1.4.0/", "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", From 96af35c2ac7f83e5f24a6ec1ba81fd61c92cfe64 Mon Sep 17 00:00:00 2001 From: henrykironde Date: Thu, 10 Oct 2024 18:59:10 -0400 Subject: [PATCH 3/5] Release verion update 1.4.1 --- .bumpversion.toml | 2 +- deepforest/_version.py | 3 ++- setup.py | 2 +- version_switcher.json | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.bumpversion.toml b/.bumpversion.toml index ec907b32..cb7fdbed 100644 --- a/.bumpversion.toml +++ b/.bumpversion.toml @@ -1,5 +1,5 @@ [tool.bumpversion] -current_version = "1.4.0" +current_version = "1.4.1" parse = """(?x) (?P0|[1-9]\\d*)\\. diff --git a/deepforest/_version.py b/deepforest/_version.py index d600007d..d3c6dce3 100644 --- a/deepforest/_version.py +++ b/deepforest/_version.py @@ -1 +1,2 @@ -__version__ = '1.4.0' +__version__ = '1.4.1' +# Version updated using bump-my-version diff --git a/setup.py b/setup.py index f935c61d..ba31f7ff 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.command.build_ext import build_ext as DistUtilsBuildExt NAME = 'deepforest' -VERSION = '1.4.0' +VERSION = '1.4.1' DESCRIPTION = 'Tree crown prediction using deep learning retinanets' URL = 'https://github.com/Weecology/DeepForest' AUTHOR = 'Ben Weinstein' diff --git a/version_switcher.json b/version_switcher.json index 9c377c61..78129b4e 100644 --- a/version_switcher.json +++ b/version_switcher.json @@ -5,9 +5,9 @@ "url": "https://deepforest.readthedocs.io/en/latest/" }, { - "name": "1.4.0 (stable)", - "version": "1.4.0", - "url": "https://deepforest.readthedocs.io/en/v1.4.0/", + "name": "1.4.1 (stable)", + "version": "1.4.1", + "url": "https://deepforest.readthedocs.io/en/v1.4.1/", "preferred": true }, { From d15208787d00cffaaf7ec87fe3d40cf2e2cec587 Mon Sep 17 00:00:00 2001 From: henrykironde Date: Fri, 11 Oct 2024 14:54:37 -0400 Subject: [PATCH 4/5] Use deepforest.__version__ --- deepforest/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/deepforest/__init__.py b/deepforest/__init__.py index e4907e77..74223c1e 100644 --- a/deepforest/__init__.py +++ b/deepforest/__init__.py @@ -4,6 +4,7 @@ __email__ = 'ben.weinstein@weecology.org' import os +from ._version import __version__ from pytorch_lightning.utilities import disable_possible_user_warnings _ROOT = os.path.abspath(os.path.dirname(__file__)) From 101ef180957c420a565a4e0cff992ebf60826ce7 Mon Sep 17 00:00:00 2001 From: henrykironde Date: Mon, 14 Oct 2024 02:21:32 -0400 Subject: [PATCH 5/5] Fall back to ubuntu-22.04 vs Ubuntu 24.04(latest) Ubuntu 24.04 has some bugs at the moment --- .github/workflows/Conda-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Conda-app.yml b/.github/workflows/Conda-app.yml index 8dab462c..882eca36 100644 --- a/.github/workflows/Conda-app.yml +++ b/.github/workflows/Conda-app.yml @@ -19,7 +19,7 @@ jobs: - "3.10" os: - - "ubuntu-latest" + - "ubuntu-22.04" runs-on: "${{ matrix.os }}"