Skip to content

Commit

Permalink
fix: Redis version upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
Bhargav Dodla committed Mar 22, 2024
1 parent ce7df35 commit 55b4ef8
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion sdk/python/requirements/py3.10-ci-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ pyzmq==25.1.0
# ipykernel
# jupyter-client
# jupyter-server
redis==4.2.2
redis==4.6.0
# via eg-feast (setup.py)
referencing==0.30.0
# via
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/requirements/py3.8-ci-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ pyzmq==25.1.0
# jupyter-server
# nbclassic
# notebook
redis==4.2.2
redis==4.6.0
# via feast (setup.py)
regex==2023.5.5
# via feast (setup.py)
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/requirements/py3.9-ci-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ pyzmq==25.1.0
# ipykernel
# jupyter-client
# jupyter-server
redis==4.2.2
redis==4.6.0
# via eg-feast (setup.py)
referencing==0.30.0
# via
Expand Down
20 changes: 12 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
]

REDIS_REQUIRED = [
"redis==4.2.2",
"redis==4.6.0",
"hiredis>=2.0.0,<3",
]

Expand Down Expand Up @@ -148,10 +148,7 @@
]


MILVUS_REQUIRED = [
"pymilvus==2.3.0",
"bidict==0.22.1"
]
MILVUS_REQUIRED = ["pymilvus==2.3.0", "bidict==0.22.1"]

ELASTICSEARCH_REQUIRED = [
"elasticsearch==8.8",
Expand Down Expand Up @@ -240,7 +237,9 @@
# Add Support for parsing tags that have a prefix containing '/' (ie 'sdk/go') to setuptools_scm.
# Regex modified from default tag regex in:
# https://github.com/pypa/setuptools_scm/blob/2a1b46d38fb2b8aeac09853e660bcd0d7c1bc7be/src/setuptools_scm/config.py#L9
TAG_REGEX = re.compile(r"^(?:[\/\w-]+)?(?P<version>[vV]?\d+(?:\.\d+){0,2}[^\+]*)(?:\+.*)?$")
TAG_REGEX = re.compile(
r"^(?:[\/\w-]+)?(?P<version>[vV]?\d+(?:\.\d+){0,2}[^\+]*)(?:\+.*)?$"
)

# Only set use_scm_version if git executable exists (setting this variable causes pip to use git under the hood)
if shutil.which("git"):
Expand Down Expand Up @@ -354,7 +353,9 @@ def _ensure_go_and_proto_toolchain():

try:
subprocess.check_call(["protoc-gen-go", "--version"], env={"PATH": path_val})
subprocess.check_call(["protoc-gen-go-grpc", "--version"], env={"PATH": path_val})
subprocess.check_call(
["protoc-gen-go-grpc", "--version"], env={"PATH": path_val}
)
except Exception as e:
raise RuntimeError("Unable to find go/grpc extensions for protoc") from e

Expand Down Expand Up @@ -440,7 +441,10 @@ def finalize_options(self) -> None:
self.extensions = [e for e in self.extensions if not self._is_go_ext(e)]

def _is_go_ext(self, ext: Extension):
return any(source.endswith(".go") or source.startswith("github") for source in ext.sources)
return any(
source.endswith(".go") or source.startswith("github")
for source in ext.sources
)

def build_extension(self, ext: Extension):
print(f"Building extension {ext}")
Expand Down

0 comments on commit 55b4ef8

Please sign in to comment.