Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bin/getepel
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 9 additions & 9 deletions bin/getrmpytools
Original file line number Diff line number Diff line change
Expand Up @@ -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 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'
Expand Down Expand Up @@ -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}")
Expand Down Expand Up @@ -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.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':
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 RLTest")
self.pip_uninstall("redis redis-py-cluster ramp-packer==2.5.8 RLTest")

#----------------------------------------------------------------------------------------------

Expand Down
4 changes: 3 additions & 1 deletion mk/macos.defs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions paella/platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"monterey": "12",
"ventura": "13",
"sonoma": "14",
"sequoia": "15",
}

DARWIN_VERSIONS = {
Expand All @@ -89,6 +90,7 @@
"monterey": "21",
"ventura": "22",
"sonoma": "23",
"sequoia": "24",
}

MACOS_VERSIONS_NICKS = {v: k for k, v in MACOS_VERSIONS.items()}
Expand Down