Merge branch '3.5.x' into ATO-1959-patch-security-vulnerabilities-3.5.x

RasaHQ · Jan 2, 2024 · 6029681 · 6029681
2 parents 2d97ac5 + a97753d
commit 6029681
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx
@@ -16,6 +16,14 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->
 
 <!-- TOWNCRIER -->
 
+## [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/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

diff --git a/changelog/12851.improvement.md b/changelog/12851.improvement.md
diff --git a/changelog/1493.improvement.md b/changelog/1493.improvement.md
diff --git 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 <[email protected]>",]
 maintainers = [ "Tom Bocklisch <[email protected]>",]

diff --git 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"
diff --git 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,18 +338,19 @@ 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:
         base = git_current_branch()
         branch = create_release_branch(version)
 
         create_commit(version)
-        push_changes()
+        push_changes(remote)
 
         print_done_message(branch, base, version)