From 23ddb07fc73150dc9207e4dd105c2db7b4b2ca51 Mon Sep 17 00:00:00 2001 From: Eran Hadad Date: Tue, 3 Sep 2024 05:51:43 +0000 Subject: [PATCH 1/6] change ramp-packer to 2.5.8 by default --- bin/getrmpytools | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/getrmpytools b/bin/getrmpytools index 637a344..4bcf2fc 100755 --- a/bin/getrmpytools +++ b/bin/getrmpytools @@ -77,7 +77,7 @@ class RMPyToolsSetup(paella.Setup): def common_last(self): self.install("git") if self.reinstall: - self.pip_uninstall("redis redis-py-cluster ramp-packer RLTest") + self.pip_uninstall("redis redis-py-cluster ramp-packer=2.5.8 RLTest") if self.master: self.redispy_org = 'redis' @@ -140,7 +140,7 @@ class RMPyToolsSetup(paella.Setup): def _install_ramp(self): if self.ramp_version is None: - self.pip_install(f"--no-cache-dir ramp-packer~=2.5.6") + self.pip_install(f"--no-cache-dir ramp-packer=2.5.8") else: (source, version) = self.get_version(self.ramp_version) if source == 'pypi': @@ -160,7 +160,7 @@ class RMPyToolsSetup(paella.Setup): class RMPyToolsUninstall(paella.Setup): def __init__(self, args): paella.Setup.__init__(self, nop=args.nop) - self.pip_uninstall("redis redis-py-cluster ramp-packer RLTest") + self.pip_uninstall("redis redis-py-cluster ramp-packer=2.5.8 RLTest") #---------------------------------------------------------------------------------------------- From 992e10fb57ab33412badf7025f6343b23ed0ca34 Mon Sep 17 00:00:00 2001 From: Eran Hadad Date: Tue, 3 Sep 2024 05:56:32 +0000 Subject: [PATCH 2/6] change ramp-packer to 2.5.8 by default --- bin/getrmpytools | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/getrmpytools b/bin/getrmpytools index 4bcf2fc..fad95e6 100755 --- a/bin/getrmpytools +++ b/bin/getrmpytools @@ -77,7 +77,7 @@ class RMPyToolsSetup(paella.Setup): def common_last(self): self.install("git") if self.reinstall: - self.pip_uninstall("redis redis-py-cluster ramp-packer=2.5.8 RLTest") + self.pip_uninstall("redis redis-py-cluster ramp-packer==2.5.8 RLTest") if self.master: self.redispy_org = 'redis' @@ -140,7 +140,7 @@ class RMPyToolsSetup(paella.Setup): def _install_ramp(self): if self.ramp_version is None: - self.pip_install(f"--no-cache-dir ramp-packer=2.5.8") + self.pip_install(f"--no-cache-dir ramp-packer==2.5.8") else: (source, version) = self.get_version(self.ramp_version) if source == 'pypi': @@ -160,7 +160,7 @@ class RMPyToolsSetup(paella.Setup): class RMPyToolsUninstall(paella.Setup): def __init__(self, args): paella.Setup.__init__(self, nop=args.nop) - self.pip_uninstall("redis redis-py-cluster ramp-packer=2.5.8 RLTest") + self.pip_uninstall("redis redis-py-cluster ramp-packer==2.5.8 RLTest") #---------------------------------------------------------------------------------------------- From 0ff96b5e90cfa2bb402bac0bc1be979cbfa23f6e Mon Sep 17 00:00:00 2001 From: Eran Hadad Date: Tue, 3 Sep 2024 06:05:09 +0000 Subject: [PATCH 3/6] enforce ramp 2.5.8!! --- bin/getrmpytools | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/getrmpytools b/bin/getrmpytools index fad95e6..1eef6f4 100755 --- a/bin/getrmpytools +++ b/bin/getrmpytools @@ -77,8 +77,8 @@ class RMPyToolsSetup(paella.Setup): def common_last(self): self.install("git") if self.reinstall: - self.pip_uninstall("redis redis-py-cluster ramp-packer==2.5.8 RLTest") - + self.pip_uninstall("redis redis-py-cluster ramp-packer=2.5.8 RLTest") + if self.master: self.redispy_org = 'redis' self.redispy_version = 'master' @@ -107,7 +107,7 @@ class RMPyToolsSetup(paella.Setup): else: self.redispy_org = "redis" self.redispy_version = verspec[0] - + (source, version) = self.get_version(self.redispy_version) if source == 'pypi': self.pip_install(f"--no-cache-dir redis=={version}") @@ -140,27 +140,27 @@ class RMPyToolsSetup(paella.Setup): def _install_ramp(self): if self.ramp_version is None: - self.pip_install(f"--no-cache-dir ramp-packer==2.5.8") + self.pip_install(f"--no-cache-dir ramp-packer=2.5.8") else: (source, version) = self.get_version(self.ramp_version) if source == 'pypi': - self.pip_install(f"--no-cache-dir ramp-packer=={version}") + self.pip_install(f"--no-cache-dir ramp-packer==2.5.8") else: - self.pip_install(f"--no-cache-dir git+https://github.com/RedisLabs/RAMP@{version}") - + self.pip_install(f"--no-cache-dir git+https://github.com/RedisLabs/RAMP@2.5.8") + def get_version(self, verspec): if verspec.startswith('pypi:'): return ('pypi', verspec[5:]) if verspec.startswith('github:'): return ('github', verspec[7:]) return ('pypi' if self.pypi else 'github', verspec) - + #---------------------------------------------------------------------------------------------- class RMPyToolsUninstall(paella.Setup): def __init__(self, args): paella.Setup.__init__(self, nop=args.nop) - self.pip_uninstall("redis redis-py-cluster ramp-packer==2.5.8 RLTest") + self.pip_uninstall("redis redis-py-cluster ramp-packer=2.5.8 RLTest") #---------------------------------------------------------------------------------------------- From af2b1feea64f0486614f775d7702bbf15c7d297b Mon Sep 17 00:00:00 2001 From: Eran Hadad Date: Tue, 3 Sep 2024 06:09:02 +0000 Subject: [PATCH 4/6] enforce ramp 2.5.8!! --- bin/getrmpytools | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/getrmpytools b/bin/getrmpytools index 1eef6f4..7c5de95 100755 --- a/bin/getrmpytools +++ b/bin/getrmpytools @@ -77,7 +77,7 @@ class RMPyToolsSetup(paella.Setup): def common_last(self): self.install("git") if self.reinstall: - self.pip_uninstall("redis redis-py-cluster ramp-packer=2.5.8 RLTest") + self.pip_uninstall("redis redis-py-cluster ramp-packer==2.5.8 RLTest") if self.master: self.redispy_org = 'redis' @@ -140,7 +140,7 @@ class RMPyToolsSetup(paella.Setup): def _install_ramp(self): if self.ramp_version is None: - self.pip_install(f"--no-cache-dir ramp-packer=2.5.8") + self.pip_install(f"--no-cache-dir ramp-packer==2.5.8") else: (source, version) = self.get_version(self.ramp_version) if source == 'pypi': @@ -160,7 +160,7 @@ class RMPyToolsSetup(paella.Setup): class RMPyToolsUninstall(paella.Setup): def __init__(self, args): paella.Setup.__init__(self, nop=args.nop) - self.pip_uninstall("redis redis-py-cluster ramp-packer=2.5.8 RLTest") + self.pip_uninstall("redis redis-py-cluster ramp-packer==2.5.8 RLTest") #---------------------------------------------------------------------------------------------- From d40f9991c582e3b72ae12ceaece24b61a145fcab Mon Sep 17 00:00:00 2001 From: nafraf Date: Tue, 17 Dec 2024 07:08:00 -0500 Subject: [PATCH 5/6] Merge pull request #140 from RedisLabsModules/nafraf_add-macos-sequoia Add Sequoia to macos.defs (cherry picked from commit a409fef72be689508e15fcf8059b495c4fbc4293) --- mk/macos.defs | 4 +++- paella/platform.py | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mk/macos.defs b/mk/macos.defs index 10d17f4..87ab2e3 100644 --- a/mk/macos.defs +++ b/mk/macos.defs @@ -8,7 +8,9 @@ ifeq ($(OS),macos) #---------------------------------------------------------------------------------------------- -ifeq ($(OSNICK),sonoma) +ifeq ($(OSNICK),sequoia) +OSX_MIN_SDK_VER=15.0 +else ifeq ($(OSNICK),sonoma) OSX_MIN_SDK_VER=14.0 else ifeq ($(OSNICK),ventura) OSX_MIN_SDK_VER=13.0 diff --git a/paella/platform.py b/paella/platform.py index c5dca6b..127040a 100755 --- a/paella/platform.py +++ b/paella/platform.py @@ -66,6 +66,7 @@ "monterey": "12", "ventura": "13", "sonoma": "14", + "sequoia": "15", } DARWIN_VERSIONS = { @@ -89,6 +90,7 @@ "monterey": "21", "ventura": "22", "sonoma": "23", + "sequoia": "24", } MACOS_VERSIONS_NICKS = {v: k for k, v in MACOS_VERSIONS.items()} From 3ff18c42aed8c06d01b7903ef2dcdb0dd8d8d735 Mon Sep 17 00:00:00 2001 From: Eran Hadad Date: Wed, 1 Jan 2025 11:49:28 +0200 Subject: [PATCH 6/6] skip install_ravan as part of getepel script for rocky8/9 (#141) (cherry picked from commit e67ded6441e59537f3b95a3aa77523c8fc1e0d0c) --- bin/getepel | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/getepel b/bin/getepel index aabce58..5a44a4b 100755 --- a/bin/getepel +++ b/bin/getepel @@ -346,7 +346,11 @@ if is_command dnf; then # xinstall --allowerasing https://dl.fedoraproject.org/pub/epel/epel-release-latest-${EPEL}.noarch.rpm fi - install_raven + # install_raven comments: + # The URL https://pkgs.dyn.su/el${EPEL}/base/x86_64/raven-release.el${EPEL}.noarch.rpm is no longer available. + # We may need to find an alternative source. However, for the context of JSONHDT, it is not needed. + # Therefore, it has been commented out + # install_raven install_remi # install_centos_stream_repos