From 7d8e816a33cab59f737fa899708c53f7d8dfc66d Mon Sep 17 00:00:00 2001 From: Thomas Werkmeister Date: Fri, 17 Nov 2023 15:43:15 +0100 Subject: [PATCH 1/3] adjusted release script to work with public remote (#12953) (#12955) --- scripts/release.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/release.py b/scripts/release.py index f215f4bd0138..1fc3d2cc9e50 100644 --- a/scripts/release.py +++ b/scripts/release.py @@ -30,6 +30,10 @@ RELEASE_BRANCH_PATTERN = re.compile(r"^\d+\.\d+\.x$") +PUBLIC_REMOTE = "public" +DEFAULT_REMOTE = "origin" +FIRST_CALM_VERSION = "3.7.0" + def create_argument_parser() -> argparse.ArgumentParser: """Parse all the command line arguments for the release script.""" @@ -244,9 +248,9 @@ def create_commit(version: Version) -> None: check_call(["git", "commit", "-m", f"prepared release of version {version}"]) -def push_changes() -> None: - """Pushes the current branch to origin.""" - check_call(["git", "push", "origin", "HEAD"]) +def push_changes(remote: str = DEFAULT_REMOTE) -> None: + """Pushes the current branch to the specified remote.""" + check_call(["git", "push", remote, "HEAD"]) def ensure_clean_git() -> None: @@ -334,10 +338,11 @@ def main(args: argparse.Namespace) -> None: # never update changelog on a prerelease version generate_changelog(version) + remote = PUBLIC_REMOTE if str(version) < FIRST_CALM_VERSION else DEFAULT_REMOTE # alpha workflow on feature branch when a version bump is required if version.is_alpha and not git_current_branch_is_main_or_release(): create_commit(version) - push_changes() + push_changes(remote) print_done_message_same_branch(version) else: @@ -345,7 +350,7 @@ def main(args: argparse.Namespace) -> None: branch = create_release_branch(version) create_commit(version) - push_changes() + push_changes(remote) print_done_message(branch, base, version) From fe1b5398d89748c34ce76765ec62cc5065bd3d1b Mon Sep 17 00:00:00 2001 From: sancharigr Date: Tue, 5 Dec 2023 14:51:50 +0100 Subject: [PATCH 2/3] prepared release of version 3.5.17 --- CHANGELOG.mdx | 8 ++++++++ changelog/12851.improvement.md | 1 - changelog/1493.improvement.md | 1 - pyproject.toml | 2 +- rasa/version.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 changelog/12851.improvement.md delete mode 100644 changelog/1493.improvement.md diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx index cd0f169829dd..a37977b912d7 100644 --- a/CHANGELOG.mdx +++ b/CHANGELOG.mdx @@ -16,6 +16,14 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . --> +## [3.5.17] - 2023-12-05 + +Rasa 3.5.17 (2023-12-05) +### Improvements +- [#12851](https://github.com/rasahq/rasa/issues/12851): Added `username` to the connection parameters for `RedisLockStore` and `RedisTrackerStore` +- [#1493](https://github.com/rasahq/rasa/issues/1493): Telemetry data is only send for licensed users. + + ## [3.5.16] - 2023-08-30 Rasa 3.5.16 (2023-08-30) diff --git a/changelog/12851.improvement.md b/changelog/12851.improvement.md deleted file mode 100644 index 0fea8ac19d52..000000000000 --- a/changelog/12851.improvement.md +++ /dev/null @@ -1 +0,0 @@ -Added `username` to the connection parameters for `RedisLockStore` and `RedisTrackerStore` \ No newline at end of file diff --git a/changelog/1493.improvement.md b/changelog/1493.improvement.md deleted file mode 100644 index f2b43d85714f..000000000000 --- a/changelog/1493.improvement.md +++ /dev/null @@ -1 +0,0 @@ -Telemetry data is only send for licensed users. diff --git a/pyproject.toml b/pyproject.toml index 7ac463e8f321..f81a76aecdc2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ exclude = "((.eggs | .git | .pytest_cache | build | dist))" [tool.poetry] name = "rasa" -version = "3.5.16" +version = "3.5.17" description = "Open source machine learning framework to automate text- and voice-based conversations: NLU, dialogue management, connect to Slack, Facebook, and more - Create chatbots and voice assistants" authors = [ "Rasa Technologies GmbH ",] maintainers = [ "Tom Bocklisch ",] diff --git a/rasa/version.py b/rasa/version.py index 4772ad3c8ae1..3e07bfa6efb2 100644 --- a/rasa/version.py +++ b/rasa/version.py @@ -1,3 +1,3 @@ # this file will automatically be changed, # do not add anything but the version number here! -__version__ = "3.5.16" +__version__ = "3.5.17" From 5f8cf76252413a16e7e760d592a6bd04bd0a3c41 Mon Sep 17 00:00:00 2001 From: sancharigr Date: Tue, 5 Dec 2023 16:03:07 +0100 Subject: [PATCH 3/3] Fix graphviz error --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8b39c1d1c925..bb30d27384ab 100644 --- a/Makefile +++ b/Makefile @@ -135,7 +135,7 @@ prepare-tests-windows: # It will retry the installation 5 times if it fails # See: https://github.com/actions/virtual-environments/blob/main/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 prepare-tests-windows-gha: - powershell -command "Choco-Install wget graphviz" + powershell -command "Install-ChocoPackage wget graphviz" test: clean # OMP_NUM_THREADS can improve overall performance using one thread by process (on tensorflow), avoiding overload