From dd52cbcd060e0c3e7e11930c93e9d0f726a5bf9d Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 28 Jun 2022 17:03:05 -0700 Subject: [PATCH 01/31] Test Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index b578501b59..bb9eadf9c3 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -69,7 +69,7 @@ jobs: CIBW_SKIP: "cp36-* *-musllinux_x86_64 cp310-macosx_x86_64" CIBW_ARCHS: "native" CIBW_ENVIRONMENT: > - COMPILE_GO=True PATH=$PATH:/usr/local/go/bin + COMPILE_GO=True PATH=$PATH:/usr/local/go/bin _PYTHON_HOST_PLATFORM=macosx-10.15-x86_64 CIBW_BEFORE_ALL_LINUX: | curl -o go.tar.gz https://dl.google.com/go/go1.18.2.linux-amd64.tar.gz tar -C /usr/local -xzf go.tar.gz @@ -218,7 +218,6 @@ jobs: echo "$TEST_SCRIPT" > run-and-wait.sh bash run-and-wait.sh feast serve bash run-and-wait.sh feast ui - # We disable this test for the Python 3.10 binary since it does not include Go. - name: Smoke test with go if: matrix.python-version != '3.10' || matrix.os == 'ubuntu-latest' From 2f6fbc28c5905d8319c9973a73cc59c4e154b79f Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 28 Jun 2022 17:45:01 -0700 Subject: [PATCH 02/31] Fix Signed-off-by: Kevin Zhang --- test.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 test.sh diff --git a/test.sh b/test.sh new file mode 100755 index 0000000000..aa35c30e5b --- /dev/null +++ b/test.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +REGEX='^Feast SDK Version: "feast [0-9]+\.[0-9]+\.[0-9]"$' +OUT=$(feast version) +echo $OUT +if echo $OUT | grep -E "$REGEX" &>/dev/null ; then + echo "gay" +else + echo "not gay" +fi + + +echo 'Feast SDK Version: "feast 0.21.3"' | grep -e "$REGEX" From 9fa6cd5e2845a01a6d12c1ede4d813a2db2b73cf Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 28 Jun 2022 18:35:18 -0700 Subject: [PATCH 03/31] Fix workflow Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index bb9eadf9c3..7b033229ae 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -211,6 +211,8 @@ jobs: echo "$VERSION_OUTPUT from installed wheel is not in the correct format or doesn't have the right version $VERSION." fi - name: Smoke test + env: + VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }} run: | feast init test_repo cd test_repo/ From b7b2c11c14bfc2c8b718007e7fc78fafc180235d Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 28 Jun 2022 18:37:00 -0700 Subject: [PATCH 04/31] Fix workflow Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 3 +++ test.sh | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 7b033229ae..bc8d7928bb 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -199,6 +199,8 @@ jobs: run: brew install coreutils # Validate that the feast version installed is not development and is the correct version of the tag we ran it off of. - name: Validate Feast Version + env: + VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }} run: | VERSION_REGEX='[0-9]+\.[0-9]+\.[0-9]+' OUTPUT_REGEX='^Feast SDK Version: "$VERSION_REGEX"$' @@ -209,6 +211,7 @@ jobs: echo "Correct Feast Version Installed" else echo "$VERSION_OUTPUT from installed wheel is not in the correct format or doesn't have the right version $VERSION." + exit 1 fi - name: Smoke test env: diff --git a/test.sh b/test.sh index aa35c30e5b..1a26200f87 100755 --- a/test.sh +++ b/test.sh @@ -1,12 +1,12 @@ -#!/usr/bin/env bash -REGEX='^Feast SDK Version: "feast [0-9]+\.[0-9]+\.[0-9]"$' -OUT=$(feast version) -echo $OUT -if echo $OUT | grep -E "$REGEX" &>/dev/null ; then - echo "gay" -else - echo "not gay" +VERSION_REGEX='[0-9]+\.[0-9]+\.[0-9]+' +OUTPUT_REGEX='^Feast SDK Version: "$VERSION_REGEX"$' +VERSION_OUTPUT=$(feast version) +VERSION=$(echo $VERSION_OUTPUT | grep -oE "$VERSION_REGEX") +VERSION_WITHOUT_PREFIX='0.19.3' +OUTPUT=$(echo $VERSION_OUTPUT | grep -E "$REGEX") +if [ -n "$OUTPUT" ] &&[ "$VERSION" = "$VERSION_WITHOUT_PREFIX" ]; then + echo "Correct Feast Version Installed" +else + echo "$VERSION_OUTPUT is not in the correct format" + exit 1 fi - - -echo 'Feast SDK Version: "feast 0.21.3"' | grep -e "$REGEX" From 7c0e9726d1504701bdf2d2625d277a0177eb0cfb Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 28 Jun 2022 19:12:04 -0700 Subject: [PATCH 05/31] Test Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index bc8d7928bb..7f404b1bf6 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -52,7 +52,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, macos-10.15 ] + # os: [ ubuntu-latest, macos-10.15 ] + os: [ macos-10.15 ] steps: - uses: actions/checkout@v2 - name: Setup Node @@ -143,8 +144,10 @@ jobs: needs: [build-python-wheel, build-source-distribution, get-version] strategy: matrix: - os: [ubuntu-latest, macos-10.15 ] - python-version: [ "3.7", "3.8", "3.9", "3.10"] + # os: [ubuntu-latest, macos-10.15 ] + # python-version: [ "3.7", "3.8", "3.9", "3.10"] + os: [macos-10.15 ] + python-version: [ "3.10"] from-source: [ True, False ] env: # this script is for testing servers From ad4706948fa678ed8598c7c00d53dc01103d4193 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 28 Jun 2022 19:41:15 -0700 Subject: [PATCH 06/31] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 7f404b1bf6..43adf88c32 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -142,6 +142,8 @@ jobs: verify-python-wheels: runs-on: ${{ matrix.os }} needs: [build-python-wheel, build-source-distribution, get-version] + env: + VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }} strategy: matrix: # os: [ubuntu-latest, macos-10.15 ] @@ -202,8 +204,6 @@ jobs: run: brew install coreutils # Validate that the feast version installed is not development and is the correct version of the tag we ran it off of. - name: Validate Feast Version - env: - VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }} run: | VERSION_REGEX='[0-9]+\.[0-9]+\.[0-9]+' OUTPUT_REGEX='^Feast SDK Version: "$VERSION_REGEX"$' @@ -217,8 +217,6 @@ jobs: exit 1 fi - name: Smoke test - env: - VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }} run: | feast init test_repo cd test_repo/ From 160c18e4b7204880758ca63fbe5ea4d728c4a530 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 28 Jun 2022 19:43:00 -0700 Subject: [PATCH 07/31] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 43adf88c32..dca4760fd7 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -142,8 +142,6 @@ jobs: verify-python-wheels: runs-on: ${{ matrix.os }} needs: [build-python-wheel, build-source-distribution, get-version] - env: - VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }} strategy: matrix: # os: [ubuntu-latest, macos-10.15 ] @@ -204,7 +202,7 @@ jobs: run: brew install coreutils # Validate that the feast version installed is not development and is the correct version of the tag we ran it off of. - name: Validate Feast Version - run: | + run: | VERSION_REGEX='[0-9]+\.[0-9]+\.[0-9]+' OUTPUT_REGEX='^Feast SDK Version: "$VERSION_REGEX"$' VERSION_OUTPUT=$(feast version) From f7824880a053e70a4ba2e55cffda7d6f6b9c8ba7 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 28 Jun 2022 19:44:12 -0700 Subject: [PATCH 08/31] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index dca4760fd7..591caee5db 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -202,7 +202,7 @@ jobs: run: brew install coreutils # Validate that the feast version installed is not development and is the correct version of the tag we ran it off of. - name: Validate Feast Version - run: | + run: | VERSION_REGEX='[0-9]+\.[0-9]+\.[0-9]+' OUTPUT_REGEX='^Feast SDK Version: "$VERSION_REGEX"$' VERSION_OUTPUT=$(feast version) From 985d6722fefc4bbf961bf384b11e8708ec712480 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 28 Jun 2022 22:48:41 -0700 Subject: [PATCH 09/31] test Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 591caee5db..eb98e1203b 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -52,8 +52,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # os: [ ubuntu-latest, macos-10.15 ] - os: [ macos-10.15 ] + os: [ ubuntu-latest, macos-10.15 ] steps: - uses: actions/checkout@v2 - name: Setup Node @@ -144,10 +143,10 @@ jobs: needs: [build-python-wheel, build-source-distribution, get-version] strategy: matrix: - # os: [ubuntu-latest, macos-10.15 ] - # python-version: [ "3.7", "3.8", "3.9", "3.10"] - os: [macos-10.15 ] - python-version: [ "3.10"] + os: [ubuntu-latest, macos-10.15 ] + python-version: [ "3.7", "3.8", "3.9", "3.10"] + # os: [macos-10.15 ] + # python-version: [ "3.10"] from-source: [ True, False ] env: # this script is for testing servers From 2fa19af3d149fb3acbe16d8eb9a5141a88a0ecc6 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 28 Jun 2022 23:33:47 -0700 Subject: [PATCH 10/31] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index eb98e1203b..e74d87b55f 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -69,7 +69,7 @@ jobs: CIBW_SKIP: "cp36-* *-musllinux_x86_64 cp310-macosx_x86_64" CIBW_ARCHS: "native" CIBW_ENVIRONMENT: > - COMPILE_GO=True PATH=$PATH:/usr/local/go/bin _PYTHON_HOST_PLATFORM=macosx-10.15-x86_64 + COMPILE_GO=True PATH=$PATH:/usr/local/go/bin CIBW_BEFORE_ALL_LINUX: | curl -o go.tar.gz https://dl.google.com/go/go1.18.2.linux-amd64.tar.gz tar -C /usr/local -xzf go.tar.gz @@ -85,7 +85,7 @@ jobs: git status git restore go.mod go.sum CIBW_BEFORE_TEST: "cd {project} && git status" - # py3.10 on MacOS does not work with Go so we have to install separately. Issue is tracked here: https://github.com/feast-dev/feast/issues/2881. + # py3.10 on MacOS does not work with Go so we have to install separately. Issue is tracked here: https://github.com/feast/dev/feast/issues/2881. - name: Build py310 specific wheels for macos if: matrix.os == 'macos-10.15' uses: pypa/cibuildwheel@v2.7.0 From fa91bea9271eb54434dcfa4a2205351539eacdfe Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 00:27:59 -0700 Subject: [PATCH 11/31] Fix Signed-off-by: Kevin Zhang --- test.sh | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100755 test.sh diff --git a/test.sh b/test.sh deleted file mode 100755 index 1a26200f87..0000000000 --- a/test.sh +++ /dev/null @@ -1,12 +0,0 @@ -VERSION_REGEX='[0-9]+\.[0-9]+\.[0-9]+' -OUTPUT_REGEX='^Feast SDK Version: "$VERSION_REGEX"$' -VERSION_OUTPUT=$(feast version) -VERSION=$(echo $VERSION_OUTPUT | grep -oE "$VERSION_REGEX") -VERSION_WITHOUT_PREFIX='0.19.3' -OUTPUT=$(echo $VERSION_OUTPUT | grep -E "$REGEX") -if [ -n "$OUTPUT" ] &&[ "$VERSION" = "$VERSION_WITHOUT_PREFIX" ]; then - echo "Correct Feast Version Installed" -else - echo "$VERSION_OUTPUT is not in the correct format" - exit 1 -fi From 8edd89d870414581b8b22d99f69aca901b7e723c Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 13:43:45 -0700 Subject: [PATCH 12/31] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index e74d87b55f..7ac08a6189 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: tags: - 'v*.*.*' - workflow_call: + jobs: get-version: From d5f200017115cedc89e57ccef32e34867ff1a43a Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 13:46:10 -0700 Subject: [PATCH 13/31] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 7ac08a6189..86230c9cbb 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -7,6 +7,7 @@ on: workflow_dispatch: tags: - 'v*.*.*' + workflow_call: jobs: From c24fee015edf43369c71a4d3a1ccf90a362f7c0c Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 13:47:33 -0700 Subject: [PATCH 14/31] test Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 86230c9cbb..3b9d2693eb 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -9,7 +9,6 @@ on: - 'v*.*.*' workflow_call: - jobs: get-version: runs-on: ubuntu-latest @@ -83,8 +82,8 @@ jobs: make install-protoc-dependencies make install-go-proto-dependencies make install-go-ci-dependencies - git status - git restore go.mod go.sum + # git status + # git restore go.mod go.sum CIBW_BEFORE_TEST: "cd {project} && git status" # py3.10 on MacOS does not work with Go so we have to install separately. Issue is tracked here: https://github.com/feast/dev/feast/issues/2881. - name: Build py310 specific wheels for macos @@ -146,8 +145,6 @@ jobs: matrix: os: [ubuntu-latest, macos-10.15 ] python-version: [ "3.7", "3.8", "3.9", "3.10"] - # os: [macos-10.15 ] - # python-version: [ "3.10"] from-source: [ True, False ] env: # this script is for testing servers From 0c7cb35e3c2d1f0f39151e728cfa5ad46fc54d33 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 15:35:03 -0700 Subject: [PATCH 15/31] Fix Signed-off-by: Kevin Zhang --- setup.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 55a715b53a..84e8ff983a 100644 --- a/setup.py +++ b/setup.py @@ -52,15 +52,15 @@ "fastavro>=1.1.0,<2", "google-api-core>=1.23.0,<3", "googleapis-common-protos>=1.52.*,<2", - "grpcio>=1.34.0,<2", - "grpcio-reflection>=1.34.0,<2", + "grpcio>=1.47.0,<2", + "grpcio-reflection>=1.47.0,<2", "Jinja2>=2,<4", "jsonschema", "mmh3", "numpy>=1.22,<2", "pandas>=1,<2", "pandavro==1.5.*", - "protobuf>=3.10,<3.20", + "protobuf>=3.10,<=3.20.1", "proto-plus==1.20.*", "pyarrow>=4,<7", "pydantic>=1,<2", @@ -131,8 +131,8 @@ "flake8", "black==19.10b0", "isort>=5,<6", - "grpcio-tools==1.44.0", - "grpcio-testing==1.44.0", + "grpcio-tools==1.47.0", + "grpcio-testing==1.47.0", "minio==7.1.0", "mock==2.0.0", "moto", @@ -514,8 +514,8 @@ def copy_extensions_to_source(self): use_scm_version=use_scm_version, setup_requires=[ "setuptools_scm", - "grpcio", - "grpcio-tools==1.44.0", + "grpcio==1.47.0", + "grpcio-tools==1.47.0", "mypy-protobuf==3.1", "pybindgen==0.22.0", "sphinx!=4.0.0", From 9027a59992a8a815933045bd9fa0f6574d30f63c Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 15:50:35 -0700 Subject: [PATCH 16/31] Fix protobuf pin version and add path variable Signed-off-by: Kevin Zhang --- sdk/python/feast/proto_json.py | 6 +++--- setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/python/feast/proto_json.py b/sdk/python/feast/proto_json.py index 44e004cb03..edc50a9fa1 100644 --- a/sdk/python/feast/proto_json.py +++ b/sdk/python/feast/proto_json.py @@ -70,7 +70,7 @@ def to_json_object(printer: _Printer, message: ProtoMessage) -> JsonObject: return value def from_json_object( - parser: _Parser, value: JsonObject, message: ProtoMessage, + parser: _Parser, value: JsonObject, message: ProtoMessage, path: str ) -> None: if value is None: message.null_val = 0 @@ -142,7 +142,7 @@ def to_json_object(printer: _Printer, message: ProtoMessage) -> JsonObject: return [printer._MessageToJsonObject(item) for item in message.val] def from_json_object( - parser: _Parser, value: JsonObject, message: ProtoMessage, + parser: _Parser, value: JsonObject, message: ProtoMessage, path: str ) -> None: array = value if isinstance(value, list) else value["val"] for item in array: @@ -183,7 +183,7 @@ def to_json_object(printer: _Printer, message: ProtoMessage) -> JsonObject: return list(message.val) def from_json_object( - parser: _Parser, value: JsonObject, message: ProtoMessage, + parser: _Parser, value: JsonObject, message: ProtoMessage, path: str ) -> None: array = value if isinstance(value, list) else value["val"] message.val.extend(array) diff --git a/setup.py b/setup.py index 84e8ff983a..5cb33efcc4 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ "numpy>=1.22,<2", "pandas>=1,<2", "pandavro==1.5.*", - "protobuf>=3.10,<=3.20.1", + "protobuf>=3.10,<4", "proto-plus==1.20.*", "pyarrow>=4,<7", "pydantic>=1,<2", From 1edb15c0e7ee19d4df4fd0b47c5756e5a51a5b1c Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 15:52:58 -0700 Subject: [PATCH 17/31] Revert setup Signed-off-by: Kevin Zhang --- setup.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 5cb33efcc4..c5ea35068f 100644 --- a/setup.py +++ b/setup.py @@ -52,8 +52,8 @@ "fastavro>=1.1.0,<2", "google-api-core>=1.23.0,<3", "googleapis-common-protos>=1.52.*,<2", - "grpcio>=1.47.0,<2", - "grpcio-reflection>=1.47.0,<2", + "grpcio>=1.34.0,<2", + "grpcio-reflection>=1.34.0,<2", "Jinja2>=2,<4", "jsonschema", "mmh3", @@ -131,8 +131,8 @@ "flake8", "black==19.10b0", "isort>=5,<6", - "grpcio-tools==1.47.0", - "grpcio-testing==1.47.0", + "grpcio-tools==1.44.0", + "grpcio-testing==1.44.0", "minio==7.1.0", "mock==2.0.0", "moto", @@ -514,8 +514,8 @@ def copy_extensions_to_source(self): use_scm_version=use_scm_version, setup_requires=[ "setuptools_scm", - "grpcio==1.47.0", - "grpcio-tools==1.47.0", + "grpcio", + "grpcio-tools==1.44.0", "mypy-protobuf==3.1", "pybindgen==0.22.0", "sphinx!=4.0.0", @@ -533,4 +533,4 @@ def copy_extensions_to_source(self): ["github.com/feast-dev/feast/go/embedded"], ) ], -) +) \ No newline at end of file From 25b090d8e7889cef83b498569def050a47d620a9 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 15:58:59 -0700 Subject: [PATCH 18/31] Update 3.8 Signed-off-by: Kevin Zhang --- .../requirements/py3.8-ci-requirements.txt | 50 +++++++++---------- .../requirements/py3.8-requirements.txt | 18 +++---- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/sdk/python/requirements/py3.8-ci-requirements.txt b/sdk/python/requirements/py3.8-ci-requirements.txt index 2be1e80464..5c261a21bd 100644 --- a/sdk/python/requirements/py3.8-ci-requirements.txt +++ b/sdk/python/requirements/py3.8-ci-requirements.txt @@ -94,7 +94,9 @@ botocore==1.23.24 bowler==0.9.0 # via feast (setup.py) build==0.8.0 - # via feast (setup.py) + # via + # feast (setup.py) + # pip-tools cachecontrol==0.12.11 # via firebase-admin cachetools==4.2.4 @@ -177,7 +179,7 @@ executing==0.8.3 # via stack-data fastapi==0.78.0 # via feast (setup.py) -fastavro==1.5.1 +fastavro==1.5.2 # via # feast (setup.py) # pandavro @@ -213,7 +215,7 @@ google-api-core[grpc]==1.31.6 # google-cloud-core # google-cloud-datastore # google-cloud-firestore -google-api-python-client==2.51.0 +google-api-python-client==2.52.0 # via firebase-admin google-auth==1.35.0 # via @@ -261,8 +263,6 @@ googleapis-common-protos==1.56.3 # tensorflow-metadata great-expectations==0.14.13 # via feast (setup.py) -greenlet==1.1.2 - # via sqlalchemy grpcio==1.47.0 # via # feast (setup.py) @@ -299,7 +299,7 @@ idna==3.3 # yarl imagesize==1.3.0 # via sphinx -importlib-metadata==4.11.4 +importlib-metadata==4.12.0 # via great-expectations importlib-resources==5.8.0 # via jsonschema @@ -328,7 +328,7 @@ jsonpatch==1.32 # via great-expectations jsonpointer==2.3 # via jsonpatch -jsonschema==4.6.0 +jsonschema==4.6.1 # via # altair # feast (setup.py) @@ -348,7 +348,7 @@ mccabe==0.6.1 # via flake8 minio==7.1.0 # via feast (setup.py) -mistune==2.0.2 +mistune==2.0.3 # via great-expectations mmh3==3.0.0 # via feast (setup.py) @@ -356,7 +356,7 @@ mock==2.0.0 # via feast (setup.py) moreorless==0.4.0 # via bowler -moto==3.1.14 +moto==3.1.16 # via feast (setup.py) msal==1.18.0 # via @@ -388,7 +388,7 @@ mysqlclient==2.1.1 # via feast (setup.py) nbformat==5.4.0 # via great-expectations -nodeenv==1.6.0 +nodeenv==1.7.0 # via pre-commit numpy==1.22.0 # via @@ -432,14 +432,12 @@ pathspec==0.9.0 pbr==5.9.0 # via mock pep517==0.12.0 - # via - # build - # pip-tools + # via build pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pip-tools==6.6.2 +pip-tools==6.7.0 # via feast (setup.py) platformdirs==2.5.2 # via virtualenv @@ -451,7 +449,7 @@ portalocker==2.4.0 # via msal-extensions pre-commit==2.19.0 # via feast (setup.py) -prompt-toolkit==3.0.29 +prompt-toolkit==3.0.30 # via ipython proto-plus==1.20.6 # via @@ -460,7 +458,7 @@ proto-plus==1.20.6 # google-cloud-bigquery-storage # google-cloud-datastore # google-cloud-firestore -protobuf==3.19.4 +protobuf==3.20.1 # via # feast (setup.py) # google-api-core @@ -594,7 +592,7 @@ redis==4.2.2 # via feast (setup.py) regex==2022.6.2 # via black -requests==2.28.0 +requests==2.28.1 # via # adal # adlfs @@ -673,7 +671,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -sqlalchemy[mypy]==1.4.38 +sqlalchemy[mypy]==1.4.39 # via feast (setup.py) sqlalchemy2-stubs==0.0.2a24 # via sqlalchemy @@ -732,17 +730,17 @@ types-protobuf==3.19.22 # mypy-protobuf types-python-dateutil==2.8.18 # via feast (setup.py) -types-pytz==2022.1.0 +types-pytz==2022.1.1 # via feast (setup.py) -types-pyyaml==6.0.8 +types-pyyaml==6.0.9 # via feast (setup.py) -types-redis==4.3.2 +types-redis==4.3.3 # via feast (setup.py) -types-requests==2.27.31 +types-requests==2.28.0 # via feast (setup.py) -types-setuptools==57.4.17 +types-setuptools==57.4.18 # via feast (setup.py) -types-tabulate==0.8.10 +types-tabulate==0.8.11 # via feast (setup.py) types-urllib3==1.26.15 # via types-requests @@ -769,11 +767,11 @@ urllib3==1.26.9 # minio # requests # responses -uvicorn[standard]==0.18.1 +uvicorn[standard]==0.18.2 # via feast (setup.py) uvloop==0.16.0 # via uvicorn -virtualenv==20.14.1 +virtualenv==20.15.1 # via pre-commit volatile==2.1.0 # via bowler diff --git a/sdk/python/requirements/py3.8-requirements.txt b/sdk/python/requirements/py3.8-requirements.txt index 8ba9f4c35d..2464c5f747 100644 --- a/sdk/python/requirements/py3.8-requirements.txt +++ b/sdk/python/requirements/py3.8-requirements.txt @@ -22,7 +22,7 @@ cachetools==5.2.0 # via google-auth certifi==2022.6.15 # via requests -charset-normalizer==2.0.12 +charset-normalizer==2.1.0 # via requests click==8.0.1 # via @@ -40,7 +40,7 @@ dill==0.3.5.1 # via feast (setup.py) fastapi==0.78.0 # via feast (setup.py) -fastavro==1.5.1 +fastavro==1.5.2 # via # feast (setup.py) # pandavro @@ -50,15 +50,13 @@ fsspec==2022.5.0 # via dask google-api-core==2.8.2 # via feast (setup.py) -google-auth==2.8.0 +google-auth==2.9.0 # via google-api-core googleapis-common-protos==1.56.3 # via # feast (setup.py) # google-api-core # tensorflow-metadata -greenlet==1.1.2 - # via sqlalchemy grpcio==1.47.0 # via # feast (setup.py) @@ -77,7 +75,7 @@ importlib-resources==5.8.0 # via jsonschema jinja2==3.1.2 # via feast (setup.py) -jsonschema==4.6.0 +jsonschema==4.6.1 # via feast (setup.py) locket==1.0.0 # via partd @@ -109,7 +107,7 @@ partd==1.2.0 # via dask proto-plus==1.20.6 # via feast (setup.py) -protobuf==3.19.4 +protobuf==3.20.1 # via # feast (setup.py) # google-api-core @@ -146,7 +144,7 @@ pyyaml==6.0 # dask # feast (setup.py) # uvicorn -requests==2.28.0 +requests==2.28.1 # via google-api-core rsa==4.8 # via google-auth @@ -158,7 +156,7 @@ six==1.16.0 # python-dateutil sniffio==1.2.0 # via anyio -sqlalchemy[mypy]==1.4.38 +sqlalchemy[mypy]==1.4.39 # via feast (setup.py) sqlalchemy2-stubs==0.0.2a24 # via sqlalchemy @@ -190,7 +188,7 @@ typing-extensions==4.2.0 # starlette urllib3==1.26.9 # via requests -uvicorn[standard]==0.18.1 +uvicorn[standard]==0.18.2 # via feast (setup.py) uvloop==0.16.0 # via uvicorn From 61e1aecd5e84cd6780c67a56b7746ba200469ced Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 16:01:36 -0700 Subject: [PATCH 19/31] Fix Signed-off-by: Kevin Zhang --- .../requirements/py3.9-ci-requirements.txt | 50 +++++++++---------- .../requirements/py3.9-requirements.txt | 18 +++---- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/sdk/python/requirements/py3.9-ci-requirements.txt b/sdk/python/requirements/py3.9-ci-requirements.txt index e0fbb8092d..39259c1740 100644 --- a/sdk/python/requirements/py3.9-ci-requirements.txt +++ b/sdk/python/requirements/py3.9-ci-requirements.txt @@ -90,7 +90,9 @@ botocore==1.23.24 bowler==0.9.0 # via feast (setup.py) build==0.8.0 - # via feast (setup.py) + # via + # feast (setup.py) + # pip-tools cachecontrol==0.12.11 # via firebase-admin cachetools==4.2.4 @@ -173,7 +175,7 @@ executing==0.8.3 # via stack-data fastapi==0.78.0 # via feast (setup.py) -fastavro==1.5.1 +fastavro==1.5.2 # via # feast (setup.py) # pandavro @@ -209,7 +211,7 @@ google-api-core[grpc]==1.31.6 # google-cloud-core # google-cloud-datastore # google-cloud-firestore -google-api-python-client==2.51.0 +google-api-python-client==2.52.0 # via firebase-admin google-auth==1.35.0 # via @@ -257,8 +259,6 @@ googleapis-common-protos==1.56.3 # tensorflow-metadata great-expectations==0.14.13 # via feast (setup.py) -greenlet==1.1.2 - # via sqlalchemy grpcio==1.47.0 # via # feast (setup.py) @@ -295,7 +295,7 @@ idna==3.3 # yarl imagesize==1.3.0 # via sphinx -importlib-metadata==4.11.4 +importlib-metadata==4.12.0 # via great-expectations iniconfig==1.1.1 # via pytest @@ -322,7 +322,7 @@ jsonpatch==1.32 # via great-expectations jsonpointer==2.3 # via jsonpatch -jsonschema==4.6.0 +jsonschema==4.6.1 # via # altair # feast (setup.py) @@ -342,7 +342,7 @@ mccabe==0.6.1 # via flake8 minio==7.1.0 # via feast (setup.py) -mistune==2.0.2 +mistune==2.0.3 # via great-expectations mmh3==3.0.0 # via feast (setup.py) @@ -350,7 +350,7 @@ mock==2.0.0 # via feast (setup.py) moreorless==0.4.0 # via bowler -moto==3.1.14 +moto==3.1.16 # via feast (setup.py) msal==1.18.0 # via @@ -382,7 +382,7 @@ mysqlclient==2.1.1 # via feast (setup.py) nbformat==5.4.0 # via great-expectations -nodeenv==1.6.0 +nodeenv==1.7.0 # via pre-commit numpy==1.22.0 # via @@ -426,14 +426,12 @@ pathspec==0.9.0 pbr==5.9.0 # via mock pep517==0.12.0 - # via - # build - # pip-tools + # via build pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pip-tools==6.6.2 +pip-tools==6.7.0 # via feast (setup.py) platformdirs==2.5.2 # via virtualenv @@ -445,7 +443,7 @@ portalocker==2.4.0 # via msal-extensions pre-commit==2.19.0 # via feast (setup.py) -prompt-toolkit==3.0.29 +prompt-toolkit==3.0.30 # via ipython proto-plus==1.20.6 # via @@ -454,7 +452,7 @@ proto-plus==1.20.6 # google-cloud-bigquery-storage # google-cloud-datastore # google-cloud-firestore -protobuf==3.19.4 +protobuf==3.20.1 # via # feast (setup.py) # google-api-core @@ -588,7 +586,7 @@ redis==4.2.2 # via feast (setup.py) regex==2022.6.2 # via black -requests==2.28.0 +requests==2.28.1 # via # adal # adlfs @@ -667,7 +665,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -sqlalchemy[mypy]==1.4.38 +sqlalchemy[mypy]==1.4.39 # via feast (setup.py) sqlalchemy2-stubs==0.0.2a24 # via sqlalchemy @@ -726,17 +724,17 @@ types-protobuf==3.19.22 # mypy-protobuf types-python-dateutil==2.8.18 # via feast (setup.py) -types-pytz==2022.1.0 +types-pytz==2022.1.1 # via feast (setup.py) -types-pyyaml==6.0.8 +types-pyyaml==6.0.9 # via feast (setup.py) -types-redis==4.3.2 +types-redis==4.3.3 # via feast (setup.py) -types-requests==2.27.31 +types-requests==2.28.0 # via feast (setup.py) -types-setuptools==57.4.17 +types-setuptools==57.4.18 # via feast (setup.py) -types-tabulate==0.8.10 +types-tabulate==0.8.11 # via feast (setup.py) types-urllib3==1.26.15 # via types-requests @@ -763,11 +761,11 @@ urllib3==1.26.9 # minio # requests # responses -uvicorn[standard]==0.18.1 +uvicorn[standard]==0.18.2 # via feast (setup.py) uvloop==0.16.0 # via uvicorn -virtualenv==20.14.1 +virtualenv==20.15.1 # via pre-commit volatile==2.1.0 # via bowler diff --git a/sdk/python/requirements/py3.9-requirements.txt b/sdk/python/requirements/py3.9-requirements.txt index da1a7f4345..76e2815ed5 100644 --- a/sdk/python/requirements/py3.9-requirements.txt +++ b/sdk/python/requirements/py3.9-requirements.txt @@ -22,7 +22,7 @@ cachetools==5.2.0 # via google-auth certifi==2022.6.15 # via requests -charset-normalizer==2.0.12 +charset-normalizer==2.1.0 # via requests click==8.0.1 # via @@ -40,7 +40,7 @@ dill==0.3.5.1 # via feast (setup.py) fastapi==0.78.0 # via feast (setup.py) -fastavro==1.5.1 +fastavro==1.5.2 # via # feast (setup.py) # pandavro @@ -50,15 +50,13 @@ fsspec==2022.5.0 # via dask google-api-core==2.8.2 # via feast (setup.py) -google-auth==2.8.0 +google-auth==2.9.0 # via google-api-core googleapis-common-protos==1.56.3 # via # feast (setup.py) # google-api-core # tensorflow-metadata -greenlet==1.1.2 - # via sqlalchemy grpcio==1.47.0 # via # feast (setup.py) @@ -75,7 +73,7 @@ idna==3.3 # requests jinja2==3.1.2 # via feast (setup.py) -jsonschema==4.6.0 +jsonschema==4.6.1 # via feast (setup.py) locket==1.0.0 # via partd @@ -107,7 +105,7 @@ partd==1.2.0 # via dask proto-plus==1.20.6 # via feast (setup.py) -protobuf==3.19.4 +protobuf==3.20.1 # via # feast (setup.py) # google-api-core @@ -144,7 +142,7 @@ pyyaml==6.0 # dask # feast (setup.py) # uvicorn -requests==2.28.0 +requests==2.28.1 # via google-api-core rsa==4.8 # via google-auth @@ -156,7 +154,7 @@ six==1.16.0 # python-dateutil sniffio==1.2.0 # via anyio -sqlalchemy[mypy]==1.4.38 +sqlalchemy[mypy]==1.4.39 # via feast (setup.py) sqlalchemy2-stubs==0.0.2a24 # via sqlalchemy @@ -188,7 +186,7 @@ typing-extensions==4.2.0 # starlette urllib3==1.26.9 # via requests -uvicorn[standard]==0.18.1 +uvicorn[standard]==0.18.2 # via feast (setup.py) uvloop==0.16.0 # via uvicorn From f75d9ab74a264676d8f6235c36b64ce6ce571262 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 16:06:53 -0700 Subject: [PATCH 20/31] Update 3.10 Signed-off-by: Kevin Zhang --- .../requirements/py3.10-ci-requirements.txt | 50 +++++++++---------- .../requirements/py3.10-requirements.txt | 18 +++---- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/sdk/python/requirements/py3.10-ci-requirements.txt b/sdk/python/requirements/py3.10-ci-requirements.txt index bcd1095d07..aab7df25fc 100644 --- a/sdk/python/requirements/py3.10-ci-requirements.txt +++ b/sdk/python/requirements/py3.10-ci-requirements.txt @@ -90,7 +90,9 @@ botocore==1.23.24 bowler==0.9.0 # via feast (setup.py) build==0.8.0 - # via feast (setup.py) + # via + # feast (setup.py) + # pip-tools cachecontrol==0.12.11 # via firebase-admin cachetools==4.2.4 @@ -173,7 +175,7 @@ executing==0.8.3 # via stack-data fastapi==0.78.0 # via feast (setup.py) -fastavro==1.5.1 +fastavro==1.5.2 # via # feast (setup.py) # pandavro @@ -209,7 +211,7 @@ google-api-core[grpc]==1.31.6 # google-cloud-core # google-cloud-datastore # google-cloud-firestore -google-api-python-client==2.51.0 +google-api-python-client==2.52.0 # via firebase-admin google-auth==1.35.0 # via @@ -257,8 +259,6 @@ googleapis-common-protos==1.56.3 # tensorflow-metadata great-expectations==0.14.13 # via feast (setup.py) -greenlet==1.1.2 - # via sqlalchemy grpcio==1.47.0 # via # feast (setup.py) @@ -295,7 +295,7 @@ idna==3.3 # yarl imagesize==1.3.0 # via sphinx -importlib-metadata==4.11.4 +importlib-metadata==4.12.0 # via great-expectations iniconfig==1.1.1 # via pytest @@ -322,7 +322,7 @@ jsonpatch==1.32 # via great-expectations jsonpointer==2.3 # via jsonpatch -jsonschema==4.6.0 +jsonschema==4.6.1 # via # altair # feast (setup.py) @@ -342,7 +342,7 @@ mccabe==0.6.1 # via flake8 minio==7.1.0 # via feast (setup.py) -mistune==2.0.2 +mistune==2.0.3 # via great-expectations mmh3==3.0.0 # via feast (setup.py) @@ -350,7 +350,7 @@ mock==2.0.0 # via feast (setup.py) moreorless==0.4.0 # via bowler -moto==3.1.14 +moto==3.1.16 # via feast (setup.py) msal==1.18.0 # via @@ -382,7 +382,7 @@ mysqlclient==2.1.1 # via feast (setup.py) nbformat==5.4.0 # via great-expectations -nodeenv==1.6.0 +nodeenv==1.7.0 # via pre-commit numpy==1.22.0 # via @@ -426,14 +426,12 @@ pathspec==0.9.0 pbr==5.9.0 # via mock pep517==0.12.0 - # via - # build - # pip-tools + # via build pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pip-tools==6.6.2 +pip-tools==6.7.0 # via feast (setup.py) platformdirs==2.5.2 # via virtualenv @@ -445,7 +443,7 @@ portalocker==2.4.0 # via msal-extensions pre-commit==2.19.0 # via feast (setup.py) -prompt-toolkit==3.0.29 +prompt-toolkit==3.0.30 # via ipython proto-plus==1.20.6 # via @@ -454,7 +452,7 @@ proto-plus==1.20.6 # google-cloud-bigquery-storage # google-cloud-datastore # google-cloud-firestore -protobuf==3.19.4 +protobuf==3.20.1 # via # feast (setup.py) # google-api-core @@ -588,7 +586,7 @@ redis==4.2.2 # via feast (setup.py) regex==2022.6.2 # via black -requests==2.28.0 +requests==2.28.1 # via # adal # adlfs @@ -665,7 +663,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -sqlalchemy[mypy]==1.4.38 +sqlalchemy[mypy]==1.4.39 # via feast (setup.py) sqlalchemy2-stubs==0.0.2a24 # via sqlalchemy @@ -724,17 +722,17 @@ types-protobuf==3.19.22 # mypy-protobuf types-python-dateutil==2.8.18 # via feast (setup.py) -types-pytz==2022.1.0 +types-pytz==2022.1.1 # via feast (setup.py) -types-pyyaml==6.0.8 +types-pyyaml==6.0.9 # via feast (setup.py) -types-redis==4.3.2 +types-redis==4.3.3 # via feast (setup.py) -types-requests==2.27.31 +types-requests==2.28.0 # via feast (setup.py) -types-setuptools==57.4.17 +types-setuptools==57.4.18 # via feast (setup.py) -types-tabulate==0.8.10 +types-tabulate==0.8.11 # via feast (setup.py) types-urllib3==1.26.15 # via types-requests @@ -759,11 +757,11 @@ urllib3==1.26.9 # minio # requests # responses -uvicorn[standard]==0.18.1 +uvicorn[standard]==0.18.2 # via feast (setup.py) uvloop==0.16.0 # via uvicorn -virtualenv==20.14.1 +virtualenv==20.15.1 # via pre-commit volatile==2.1.0 # via bowler diff --git a/sdk/python/requirements/py3.10-requirements.txt b/sdk/python/requirements/py3.10-requirements.txt index dc60ea1e70..d4a4425aec 100644 --- a/sdk/python/requirements/py3.10-requirements.txt +++ b/sdk/python/requirements/py3.10-requirements.txt @@ -22,7 +22,7 @@ cachetools==5.2.0 # via google-auth certifi==2022.6.15 # via requests -charset-normalizer==2.0.12 +charset-normalizer==2.1.0 # via requests click==8.0.1 # via @@ -40,7 +40,7 @@ dill==0.3.5.1 # via feast (setup.py) fastapi==0.78.0 # via feast (setup.py) -fastavro==1.5.1 +fastavro==1.5.2 # via # feast (setup.py) # pandavro @@ -50,15 +50,13 @@ fsspec==2022.5.0 # via dask google-api-core==2.8.2 # via feast (setup.py) -google-auth==2.8.0 +google-auth==2.9.0 # via google-api-core googleapis-common-protos==1.56.3 # via # feast (setup.py) # google-api-core # tensorflow-metadata -greenlet==1.1.2 - # via sqlalchemy grpcio==1.47.0 # via # feast (setup.py) @@ -75,7 +73,7 @@ idna==3.3 # requests jinja2==3.1.2 # via feast (setup.py) -jsonschema==4.6.0 +jsonschema==4.6.1 # via feast (setup.py) locket==1.0.0 # via partd @@ -107,7 +105,7 @@ partd==1.2.0 # via dask proto-plus==1.20.6 # via feast (setup.py) -protobuf==3.19.4 +protobuf==3.20.1 # via # feast (setup.py) # google-api-core @@ -144,7 +142,7 @@ pyyaml==6.0 # dask # feast (setup.py) # uvicorn -requests==2.28.0 +requests==2.28.1 # via google-api-core rsa==4.8 # via google-auth @@ -156,7 +154,7 @@ six==1.16.0 # python-dateutil sniffio==1.2.0 # via anyio -sqlalchemy[mypy]==1.4.38 +sqlalchemy[mypy]==1.4.39 # via feast (setup.py) sqlalchemy2-stubs==0.0.2a24 # via sqlalchemy @@ -187,7 +185,7 @@ typing-extensions==4.2.0 # sqlalchemy2-stubs urllib3==1.26.9 # via requests -uvicorn[standard]==0.18.1 +uvicorn[standard]==0.18.2 # via feast (setup.py) uvloop==0.16.0 # via uvicorn From 3b39aaac7d565827fd21074e79e16343533b1323 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 16:12:47 -0700 Subject: [PATCH 21/31] update Signed-off-by: Kevin Zhang --- .../requirements/py3.7-ci-requirements.txt | 806 ++++++++++++++++++ .../requirements/py3.7-requirements.txt | 202 +++++ setup.py | 14 +- 3 files changed, 1015 insertions(+), 7 deletions(-) create mode 100644 sdk/python/requirements/py3.7-ci-requirements.txt create mode 100644 sdk/python/requirements/py3.7-requirements.txt diff --git a/sdk/python/requirements/py3.7-ci-requirements.txt b/sdk/python/requirements/py3.7-ci-requirements.txt new file mode 100644 index 0000000000..bbdd12c5e4 --- /dev/null +++ b/sdk/python/requirements/py3.7-ci-requirements.txt @@ -0,0 +1,806 @@ +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# pip-compile --extra=ci --output-file=sdk/python/requirements/py3.7-ci-requirements.txt +# +absl-py==1.1.0 + # via tensorflow-metadata +adal==1.2.7 + # via + # azure-datalake-store + # msrestazure +adlfs==0.5.9 + # via feast (setup.py) +aiobotocore==2.1.2 + # via s3fs +aiohttp==3.8.1 + # via + # adlfs + # aiobotocore + # gcsfs + # s3fs +aioitertools==0.10.0 + # via aiobotocore +aiosignal==1.2.0 + # via aiohttp +alabaster==0.7.12 + # via sphinx +altair==4.2.0 + # via great-expectations +anyio==3.6.1 + # via + # starlette + # watchfiles +appdirs==1.4.4 + # via + # black + # fissix +appnope==0.1.3 + # via ipython +asn1crypto==1.5.1 + # via + # oscrypto + # snowflake-connector-python +assertpy==1.1 + # via feast (setup.py) +asttokens==2.0.5 + # via stack-data +async-timeout==4.0.2 + # via + # aiohttp + # redis +attrs==21.4.0 + # via + # aiohttp + # black + # bowler + # jsonschema + # pytest +avro==1.10.0 + # via feast (setup.py) +azure-core==1.24.1 + # via + # adlfs + # azure-identity + # azure-storage-blob + # msrest +azure-datalake-store==0.0.52 + # via adlfs +azure-identity==1.10.0 + # via adlfs +azure-storage-blob==12.12.0 + # via adlfs +babel==2.10.3 + # via sphinx +backcall==0.2.0 + # via ipython +backports-zoneinfo==0.2.1 + # via + # pytz-deprecation-shim + # tzlocal +black==19.10b0 + # via feast (setup.py) +boto3==1.20.23 + # via + # feast (setup.py) + # moto +botocore==1.23.24 + # via + # aiobotocore + # boto3 + # moto + # s3transfer +bowler==0.9.0 + # via feast (setup.py) +build==0.8.0 + # via + # feast (setup.py) + # pip-tools +cachecontrol==0.12.11 + # via firebase-admin +cachetools==4.2.4 + # via google-auth +certifi==2022.6.15 + # via + # minio + # msrest + # requests + # snowflake-connector-python +cffi==1.15.0 + # via + # azure-datalake-store + # cryptography + # snowflake-connector-python +cfgv==3.3.1 + # via pre-commit +charset-normalizer==2.0.12 + # via + # aiohttp + # requests + # snowflake-connector-python +click==8.0.1 + # via + # black + # bowler + # feast (setup.py) + # great-expectations + # moreorless + # pip-tools + # uvicorn +cloudpickle==2.1.0 + # via dask +colorama==0.4.5 + # via + # feast (setup.py) + # great-expectations +coverage[toml]==6.4.1 + # via pytest-cov +cryptography==35.0.0 + # via + # adal + # azure-identity + # azure-storage-blob + # feast (setup.py) + # great-expectations + # moto + # msal + # pyopenssl + # snowflake-connector-python +dask==2022.1.1 + # via feast (setup.py) +dataclasses==0.6 + # via great-expectations +decorator==5.1.1 + # via + # gcsfs + # ipython +deprecated==1.2.13 + # via redis +deprecation==2.1.0 + # via testcontainers +dill==0.3.5.1 + # via feast (setup.py) +distlib==0.3.4 + # via virtualenv +docker==5.0.3 + # via + # feast (setup.py) + # testcontainers +docutils==0.17.1 + # via + # sphinx + # sphinx-rtd-theme +entrypoints==0.4 + # via altair +execnet==1.9.0 + # via pytest-xdist +executing==0.8.3 + # via stack-data +fastapi==0.78.0 + # via feast (setup.py) +fastavro==1.5.2 + # via + # feast (setup.py) + # pandavro +fastjsonschema==2.15.3 + # via nbformat +filelock==3.7.1 + # via virtualenv +firebase-admin==4.5.2 + # via feast (setup.py) +fissix==21.11.13 + # via bowler +flake8==4.0.1 + # via feast (setup.py) +frozenlist==1.3.0 + # via + # aiohttp + # aiosignal +fsspec==2022.1.0 + # via + # adlfs + # dask + # gcsfs + # s3fs +gcsfs==2022.1.0 + # via feast (setup.py) +google-api-core[grpc]==1.31.6 + # via + # feast (setup.py) + # firebase-admin + # google-api-python-client + # google-cloud-bigquery + # google-cloud-bigquery-storage + # google-cloud-core + # google-cloud-datastore + # google-cloud-firestore +google-api-python-client==2.52.0 + # via firebase-admin +google-auth==1.35.0 + # via + # gcsfs + # google-api-core + # google-api-python-client + # google-auth-httplib2 + # google-auth-oauthlib + # google-cloud-core + # google-cloud-storage +google-auth-httplib2==0.1.0 + # via google-api-python-client +google-auth-oauthlib==0.5.2 + # via gcsfs +google-cloud-bigquery==2.34.4 + # via feast (setup.py) +google-cloud-bigquery-storage==2.13.2 + # via feast (setup.py) +google-cloud-core==1.7.2 + # via + # feast (setup.py) + # google-cloud-bigquery + # google-cloud-datastore + # google-cloud-firestore + # google-cloud-storage +google-cloud-datastore==2.7.1 + # via feast (setup.py) +google-cloud-firestore==2.5.3 + # via firebase-admin +google-cloud-storage==1.40.0 + # via + # feast (setup.py) + # firebase-admin + # gcsfs +google-crc32c==1.3.0 + # via google-resumable-media +google-resumable-media==1.3.3 + # via + # google-cloud-bigquery + # google-cloud-storage +googleapis-common-protos==1.56.3 + # via + # feast (setup.py) + # google-api-core + # tensorflow-metadata +great-expectations==0.14.13 + # via feast (setup.py) +grpcio==1.47.0 + # via + # feast (setup.py) + # google-api-core + # google-cloud-bigquery + # grpcio-reflection + # grpcio-testing + # grpcio-tools +grpcio-reflection==1.47.0 + # via feast (setup.py) +grpcio-testing==1.47.0 + # via feast (setup.py) +grpcio-tools==1.47.0 + # via feast (setup.py) +h11==0.13.0 + # via uvicorn +happybase==1.2.0 + # via feast (setup.py) +hiredis==2.0.0 + # via feast (setup.py) +httplib2==0.20.4 + # via + # google-api-python-client + # google-auth-httplib2 +httptools==0.4.0 + # via uvicorn +identify==2.5.1 + # via pre-commit +idna==3.3 + # via + # anyio + # requests + # snowflake-connector-python + # yarl +imagesize==1.3.0 + # via sphinx +importlib-metadata==4.12.0 + # via great-expectations +importlib-resources==5.8.0 + # via jsonschema +iniconfig==1.1.1 + # via pytest +ipython==8.4.0 + # via great-expectations +isodate==0.6.1 + # via msrest +isort==5.10.1 + # via feast (setup.py) +jedi==0.18.1 + # via ipython +jinja2==3.0.3 + # via + # altair + # feast (setup.py) + # great-expectations + # moto + # sphinx +jmespath==0.10.0 + # via + # boto3 + # botocore +jsonpatch==1.32 + # via great-expectations +jsonpointer==2.3 + # via jsonpatch +jsonschema==4.6.1 + # via + # altair + # feast (setup.py) + # great-expectations + # nbformat +jupyter-core==4.10.0 + # via nbformat +locket==1.0.0 + # via partd +markupsafe==2.1.1 + # via + # jinja2 + # moto +matplotlib-inline==0.1.3 + # via ipython +mccabe==0.6.1 + # via flake8 +minio==7.1.0 + # via feast (setup.py) +mistune==2.0.3 + # via great-expectations +mmh3==3.0.0 + # via feast (setup.py) +mock==2.0.0 + # via feast (setup.py) +moreorless==0.4.0 + # via bowler +moto==3.1.16 + # via feast (setup.py) +msal==1.18.0 + # via + # azure-identity + # msal-extensions +msal-extensions==1.0.0 + # via azure-identity +msgpack==1.0.4 + # via cachecontrol +msrest==0.7.1 + # via + # azure-storage-blob + # msrestazure +msrestazure==0.6.4 + # via adlfs +multidict==6.0.2 + # via + # aiohttp + # yarl +mypy==0.961 + # via + # feast (setup.py) + # sqlalchemy +mypy-extensions==0.4.3 + # via mypy +mypy-protobuf==3.1 + # via feast (setup.py) +mysqlclient==2.1.1 + # via feast (setup.py) +nbformat==5.4.0 + # via great-expectations +nodeenv==1.7.0 + # via pre-commit +numpy==1.21.6 + # via + # altair + # feast (setup.py) + # great-expectations + # pandas + # pandavro + # pyarrow + # scipy +oauthlib==3.2.0 + # via requests-oauthlib +oscrypto==1.3.0 + # via snowflake-connector-python +packaging==21.3 + # via + # build + # dask + # deprecation + # google-api-core + # google-cloud-bigquery + # great-expectations + # pytest + # redis + # sphinx +pandas==1.4.3 + # via + # altair + # feast (setup.py) + # great-expectations + # pandavro + # snowflake-connector-python +pandavro==1.5.2 + # via feast (setup.py) +parso==0.8.3 + # via jedi +partd==1.2.0 + # via dask +pathspec==0.9.0 + # via black +pbr==5.9.0 + # via mock +pep517==0.12.0 + # via build +pexpect==4.8.0 + # via ipython +pickleshare==0.7.5 + # via ipython +pip-tools==6.7.0 + # via feast (setup.py) +platformdirs==2.5.2 + # via virtualenv +pluggy==1.0.0 + # via pytest +ply==3.11 + # via thriftpy2 +portalocker==2.4.0 + # via msal-extensions +pre-commit==2.19.0 + # via feast (setup.py) +prompt-toolkit==3.0.30 + # via ipython +proto-plus==1.20.6 + # via + # feast (setup.py) + # google-cloud-bigquery + # google-cloud-bigquery-storage + # google-cloud-datastore + # google-cloud-firestore +protobuf==3.19.4 + # via + # feast (setup.py) + # google-api-core + # google-cloud-bigquery + # google-cloud-bigquery-storage + # google-cloud-datastore + # google-cloud-firestore + # googleapis-common-protos + # grpcio-reflection + # grpcio-testing + # grpcio-tools + # mypy-protobuf + # proto-plus + # tensorflow-metadata +psutil==5.9.0 + # via feast (setup.py) +psycopg2-binary==2.9.3 + # via feast (setup.py) +ptyprocess==0.7.0 + # via pexpect +pure-eval==0.2.2 + # via stack-data +py==1.11.0 + # via + # pytest + # pytest-forked +py-cpuinfo==8.0.0 + # via pytest-benchmark +py4j==0.10.9.5 + # via pyspark +pyarrow==6.0.1 + # via + # feast (setup.py) + # snowflake-connector-python +pyasn1==0.4.8 + # via + # pyasn1-modules + # rsa +pyasn1-modules==0.2.8 + # via google-auth +pybindgen==0.22.1 + # via feast (setup.py) +pycodestyle==2.8.0 + # via flake8 +pycparser==2.21 + # via cffi +pycryptodomex==3.15.0 + # via snowflake-connector-python +pydantic==1.9.1 + # via + # fastapi + # feast (setup.py) +pyflakes==2.4.0 + # via flake8 +pygments==2.12.0 + # via + # feast (setup.py) + # ipython + # sphinx +pyjwt[crypto]==2.4.0 + # via + # adal + # msal + # snowflake-connector-python +pyopenssl==22.0.0 + # via snowflake-connector-python +pyparsing==2.4.7 + # via + # great-expectations + # httplib2 + # packaging +pyrsistent==0.18.1 + # via jsonschema +pyspark==3.3.0 + # via feast (setup.py) +pytest==7.1.2 + # via + # feast (setup.py) + # pytest-benchmark + # pytest-cov + # pytest-forked + # pytest-lazy-fixture + # pytest-mock + # pytest-ordering + # pytest-timeout + # pytest-xdist +pytest-benchmark==3.4.1 + # via feast (setup.py) +pytest-cov==3.0.0 + # via feast (setup.py) +pytest-forked==1.4.0 + # via pytest-xdist +pytest-lazy-fixture==0.6.3 + # via feast (setup.py) +pytest-mock==1.10.4 + # via feast (setup.py) +pytest-ordering==0.6 + # via feast (setup.py) +pytest-timeout==1.4.2 + # via feast (setup.py) +pytest-xdist==2.5.0 + # via feast (setup.py) +python-dateutil==2.8.2 + # via + # adal + # botocore + # google-cloud-bigquery + # great-expectations + # moto + # pandas +python-dotenv==0.20.0 + # via uvicorn +pytz==2022.1 + # via + # babel + # google-api-core + # great-expectations + # moto + # pandas + # snowflake-connector-python + # trino +pytz-deprecation-shim==0.1.0.post0 + # via tzlocal +pyyaml==6.0 + # via + # dask + # feast (setup.py) + # pre-commit + # uvicorn +redis==4.2.2 + # via feast (setup.py) +regex==2022.6.2 + # via black +requests==2.28.1 + # via + # adal + # adlfs + # azure-core + # azure-datalake-store + # cachecontrol + # docker + # gcsfs + # google-api-core + # google-cloud-bigquery + # google-cloud-storage + # great-expectations + # moto + # msal + # msrest + # requests-oauthlib + # responses + # snowflake-connector-python + # sphinx + # trino +requests-oauthlib==1.3.1 + # via + # google-auth-oauthlib + # msrest +responses==0.21.0 + # via moto +rsa==4.8 + # via google-auth +ruamel-yaml==0.17.17 + # via great-expectations +ruamel-yaml-clib==0.2.6 + # via ruamel-yaml +s3fs==2022.1.0 + # via feast (setup.py) +s3transfer==0.5.2 + # via boto3 +scipy==1.8.1 + # via great-expectations +six==1.16.0 + # via + # azure-core + # azure-identity + # google-api-core + # google-auth + # google-auth-httplib2 + # google-cloud-core + # google-resumable-media + # grpcio + # happybase + # mock + # msrestazure + # pandavro + # python-dateutil + # virtualenv +sniffio==1.2.0 + # via anyio +snowballstemmer==2.2.0 + # via sphinx +snowflake-connector-python[pandas]==2.7.8 + # via feast (setup.py) +sphinx==4.3.2 + # via + # feast (setup.py) + # sphinx-rtd-theme +sphinx-rtd-theme==1.0.0 + # via feast (setup.py) +sphinxcontrib-applehelp==1.0.2 + # via sphinx +sphinxcontrib-devhelp==1.0.2 + # via sphinx +sphinxcontrib-htmlhelp==2.0.0 + # via sphinx +sphinxcontrib-jsmath==1.0.1 + # via sphinx +sphinxcontrib-qthelp==1.0.3 + # via sphinx +sphinxcontrib-serializinghtml==1.1.5 + # via sphinx +sqlalchemy[mypy]==1.4.39 + # via feast (setup.py) +sqlalchemy2-stubs==0.0.2a24 + # via sqlalchemy +stack-data==0.3.0 + # via ipython +starlette==0.19.1 + # via fastapi +tabulate==0.8.10 + # via feast (setup.py) +tenacity==8.0.1 + # via feast (setup.py) +tensorflow-metadata==1.9.0 + # via feast (setup.py) +termcolor==1.1.0 + # via great-expectations +testcontainers==3.6.0 + # via feast (setup.py) +thriftpy2==0.4.14 + # via happybase +toml==0.10.2 + # via + # black + # feast (setup.py) + # pre-commit +tomli==2.0.1 + # via + # build + # coverage + # mypy + # pep517 + # pytest +toolz==0.11.2 + # via + # altair + # dask + # partd +tqdm==4.64.0 + # via + # feast (setup.py) + # great-expectations +traitlets==5.3.0 + # via + # ipython + # jupyter-core + # matplotlib-inline + # nbformat +trino==0.313.0 + # via feast (setup.py) +typed-ast==1.5.4 + # via black +typeguard==2.13.3 + # via feast (setup.py) +types-protobuf==3.19.22 + # via + # feast (setup.py) + # mypy-protobuf +types-python-dateutil==2.8.18 + # via feast (setup.py) +types-pytz==2022.1.1 + # via feast (setup.py) +types-pyyaml==6.0.9 + # via feast (setup.py) +types-redis==4.3.3 + # via feast (setup.py) +types-requests==2.28.0 + # via feast (setup.py) +types-setuptools==57.4.18 + # via feast (setup.py) +types-tabulate==0.8.11 + # via feast (setup.py) +types-urllib3==1.26.15 + # via types-requests +typing-extensions==4.2.0 + # via + # aioitertools + # azure-core + # great-expectations + # mypy + # pydantic + # sqlalchemy2-stubs + # starlette +tzdata==2022.1 + # via pytz-deprecation-shim +tzlocal==4.2 + # via great-expectations +uritemplate==4.1.1 + # via google-api-python-client +urllib3==1.26.9 + # via + # botocore + # feast (setup.py) + # great-expectations + # minio + # requests + # responses +uvicorn[standard]==0.18.2 + # via feast (setup.py) +uvloop==0.16.0 + # via uvicorn +virtualenv==20.15.1 + # via pre-commit +volatile==2.1.0 + # via bowler +watchfiles==0.15.0 + # via uvicorn +wcwidth==0.2.5 + # via prompt-toolkit +websocket-client==1.3.3 + # via docker +websockets==10.3 + # via uvicorn +werkzeug==2.1.2 + # via moto +wheel==0.37.1 + # via pip-tools +wrapt==1.14.1 + # via + # aiobotocore + # deprecated + # testcontainers +xmltodict==0.13.0 + # via moto +yarl==1.7.2 + # via aiohttp +zipp==3.8.0 + # via + # importlib-metadata + # importlib-resources + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/sdk/python/requirements/py3.7-requirements.txt b/sdk/python/requirements/py3.7-requirements.txt new file mode 100644 index 0000000000..60add10fdf --- /dev/null +++ b/sdk/python/requirements/py3.7-requirements.txt @@ -0,0 +1,202 @@ +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# pip-compile --output-file=sdk/python/requirements/py3.7-requirements.txt +# +absl-py==1.1.0 + # via tensorflow-metadata +anyio==3.6.1 + # via + # starlette + # watchfiles +appdirs==1.4.4 + # via fissix +attrs==21.4.0 + # via + # bowler + # jsonschema +bowler==0.9.0 + # via feast (setup.py) +cachetools==5.2.0 + # via google-auth +certifi==2022.6.15 + # via requests +charset-normalizer==2.1.0 + # via requests +click==8.0.1 + # via + # bowler + # feast (setup.py) + # moreorless + # uvicorn +cloudpickle==2.1.0 + # via dask +colorama==0.4.5 + # via feast (setup.py) +dask==2022.1.1 + # via feast (setup.py) +dill==0.3.5.1 + # via feast (setup.py) +fastapi==0.78.0 + # via feast (setup.py) +fastavro==1.5.2 + # via + # feast (setup.py) + # pandavro +fissix==21.11.13 + # via bowler +fsspec==2022.5.0 + # via dask +google-api-core==2.8.2 + # via feast (setup.py) +google-auth==2.9.0 + # via google-api-core +googleapis-common-protos==1.56.3 + # via + # feast (setup.py) + # google-api-core + # tensorflow-metadata +grpcio==1.47.0 + # via + # feast (setup.py) + # grpcio-reflection +grpcio-reflection==1.47.0 + # via feast (setup.py) +h11==0.13.0 + # via uvicorn +httptools==0.4.0 + # via uvicorn +idna==3.3 + # via + # anyio + # requests +importlib-resources==5.8.0 + # via jsonschema +jinja2==3.1.2 + # via feast (setup.py) +jsonschema==4.6.1 + # via feast (setup.py) +locket==1.0.0 + # via partd +markupsafe==2.1.1 + # via jinja2 +mmh3==3.0.0 + # via feast (setup.py) +moreorless==0.4.0 + # via bowler +mypy==0.961 + # via sqlalchemy +mypy-extensions==0.4.3 + # via mypy +numpy==1.21.6 + # via + # feast (setup.py) + # pandas + # pandavro + # pyarrow +packaging==21.3 + # via dask +pandas==1.4.3 + # via + # feast (setup.py) + # pandavro +pandavro==1.5.2 + # via feast (setup.py) +partd==1.2.0 + # via dask +proto-plus==1.20.6 + # via feast (setup.py) +protobuf==3.19.4 + # via + # feast (setup.py) + # google-api-core + # googleapis-common-protos + # grpcio-reflection + # proto-plus + # tensorflow-metadata +pyarrow==6.0.1 + # via feast (setup.py) +pyasn1==0.4.8 + # via + # pyasn1-modules + # rsa +pyasn1-modules==0.2.8 + # via google-auth +pydantic==1.9.1 + # via + # fastapi + # feast (setup.py) +pygments==2.12.0 + # via feast (setup.py) +pyparsing==3.0.9 + # via packaging +pyrsistent==0.18.1 + # via jsonschema +python-dateutil==2.8.2 + # via pandas +python-dotenv==0.20.0 + # via uvicorn +pytz==2022.1 + # via pandas +pyyaml==6.0 + # via + # dask + # feast (setup.py) + # uvicorn +requests==2.28.1 + # via google-api-core +rsa==4.8 + # via google-auth +six==1.16.0 + # via + # google-auth + # grpcio + # pandavro + # python-dateutil +sniffio==1.2.0 + # via anyio +sqlalchemy[mypy]==1.4.39 + # via feast (setup.py) +sqlalchemy2-stubs==0.0.2a24 + # via sqlalchemy +starlette==0.19.1 + # via fastapi +tabulate==0.8.10 + # via feast (setup.py) +tenacity==8.0.1 + # via feast (setup.py) +tensorflow-metadata==1.9.0 + # via feast (setup.py) +toml==0.10.2 + # via feast (setup.py) +tomli==2.0.1 + # via mypy +toolz==0.11.2 + # via + # dask + # partd +tqdm==4.64.0 + # via feast (setup.py) +typeguard==2.13.3 + # via feast (setup.py) +typing-extensions==4.2.0 + # via + # mypy + # pydantic + # sqlalchemy2-stubs + # starlette +urllib3==1.26.9 + # via requests +uvicorn[standard]==0.18.2 + # via feast (setup.py) +uvloop==0.16.0 + # via uvicorn +volatile==2.1.0 + # via bowler +watchfiles==0.15.0 + # via uvicorn +websockets==10.3 + # via uvicorn +zipp==3.8.0 + # via importlib-resources diff --git a/setup.py b/setup.py index c5ea35068f..931bd8e863 100644 --- a/setup.py +++ b/setup.py @@ -52,15 +52,15 @@ "fastavro>=1.1.0,<2", "google-api-core>=1.23.0,<3", "googleapis-common-protos>=1.52.*,<2", - "grpcio>=1.34.0,<2", - "grpcio-reflection>=1.34.0,<2", + "grpcio>=1.47.0,<2", + "grpcio-reflection>=1.47.0,<2", "Jinja2>=2,<4", "jsonschema", "mmh3", "numpy>=1.22,<2", "pandas>=1,<2", "pandavro==1.5.*", - "protobuf>=3.10,<4", + "protobuf>=3.10,<3.20", "proto-plus==1.20.*", "pyarrow>=4,<7", "pydantic>=1,<2", @@ -131,8 +131,8 @@ "flake8", "black==19.10b0", "isort>=5,<6", - "grpcio-tools==1.44.0", - "grpcio-testing==1.44.0", + "grpcio-tools==1.47.0", + "grpcio-testing==1.47.0", "minio==7.1.0", "mock==2.0.0", "moto", @@ -514,8 +514,8 @@ def copy_extensions_to_source(self): use_scm_version=use_scm_version, setup_requires=[ "setuptools_scm", - "grpcio", - "grpcio-tools==1.44.0", + "grpcio==1.47.0", + "grpcio-tools==1.47.0", "mypy-protobuf==3.1", "pybindgen==0.22.0", "sphinx!=4.0.0", From 278cda7af90c26ec24a678f2f5d0efa871abb8d5 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 16:25:27 -0700 Subject: [PATCH 22/31] Fix Signed-off-by: Kevin Zhang --- sdk/python/requirements/py3.10-ci-requirements.txt | 4 ++-- sdk/python/requirements/py3.8-ci-requirements.txt | 4 ++-- sdk/python/requirements/py3.9-ci-requirements.txt | 4 ++-- setup.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/python/requirements/py3.10-ci-requirements.txt b/sdk/python/requirements/py3.10-ci-requirements.txt index aab7df25fc..e0b05ecaa0 100644 --- a/sdk/python/requirements/py3.10-ci-requirements.txt +++ b/sdk/python/requirements/py3.10-ci-requirements.txt @@ -269,9 +269,9 @@ grpcio==1.47.0 # grpcio-tools grpcio-reflection==1.47.0 # via feast (setup.py) -grpcio-testing==1.44.0 +grpcio-testing==1.47.0 # via feast (setup.py) -grpcio-tools==1.44.0 +grpcio-tools==1.47.0 # via feast (setup.py) h11==0.13.0 # via uvicorn diff --git a/sdk/python/requirements/py3.8-ci-requirements.txt b/sdk/python/requirements/py3.8-ci-requirements.txt index 5c261a21bd..649e34cb8f 100644 --- a/sdk/python/requirements/py3.8-ci-requirements.txt +++ b/sdk/python/requirements/py3.8-ci-requirements.txt @@ -273,9 +273,9 @@ grpcio==1.47.0 # grpcio-tools grpcio-reflection==1.47.0 # via feast (setup.py) -grpcio-testing==1.44.0 +grpcio-testing==1.47.0 # via feast (setup.py) -grpcio-tools==1.44.0 +grpcio-tools==1.47.0 # via feast (setup.py) h11==0.13.0 # via uvicorn diff --git a/sdk/python/requirements/py3.9-ci-requirements.txt b/sdk/python/requirements/py3.9-ci-requirements.txt index 39259c1740..fe1b8b2e13 100644 --- a/sdk/python/requirements/py3.9-ci-requirements.txt +++ b/sdk/python/requirements/py3.9-ci-requirements.txt @@ -269,9 +269,9 @@ grpcio==1.47.0 # grpcio-tools grpcio-reflection==1.47.0 # via feast (setup.py) -grpcio-testing==1.44.0 +grpcio-testing==1.47.0 # via feast (setup.py) -grpcio-tools==1.44.0 +grpcio-tools==1.47.0 # via feast (setup.py) h11==0.13.0 # via uvicorn diff --git a/setup.py b/setup.py index 931bd8e863..7cfc5a0622 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ "numpy>=1.22,<2", "pandas>=1,<2", "pandavro==1.5.*", - "protobuf>=3.10,<3.20", + "protobuf>=3.10,<4", "proto-plus==1.20.*", "pyarrow>=4,<7", "pydantic>=1,<2", From 3d63de050919e67fe7dd8d8d68526dcff2dc4a1f Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 16:30:34 -0700 Subject: [PATCH 23/31] Fix Signed-off-by: Kevin Zhang --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 88f04aa95d..176e2cb354 100644 --- a/Makefile +++ b/Makefile @@ -180,7 +180,7 @@ install-go-ci-dependencies: python -m pip install pybindgen==0.22.0 install-protoc-dependencies: - pip install grpcio-tools==1.44.0 mypy-protobuf==3.1.0 + pip install grpcio-tools==1.47.0 mypy-protobuf==3.1.0 compile-protos-go: install-go-proto-dependencies install-protoc-dependencies python setup.py build_go_protos From 698e3357aa85c1e3ab2fc8ff692d384091576f26 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 16:34:53 -0700 Subject: [PATCH 24/31] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 3b9d2693eb..80cf167109 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -186,7 +186,7 @@ jobs: env: COMPILE_GO: "True" run: | - pip install 'grpcio-tools==1.44.0' 'pybindgen==0.22.0' + pip install 'grpcio-tools==1.47.0' 'pybindgen==0.22.0' go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26.0 go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1.0 pip install dist/*tar.gz diff --git a/pyproject.toml b/pyproject.toml index 64394a558a..8ba7254440 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=60", "wheel", "setuptools_scm>=6.2", "grpcio", "grpcio-tools==1.44.0", "mypy-protobuf==3.1", "sphinx!=4.0.0"] +requires = ["setuptools>=60", "wheel", "setuptools_scm>=6.2", "grpcio", "grpcio-tools==1.47.0", "mypy-protobuf==3.1", "sphinx!=4.0.0"] build-backend = "setuptools.build_meta" [tool.setuptools_scm] From 2b8cbe9c310ab29490a50dc58ab1029f698a02e7 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 16:43:16 -0700 Subject: [PATCH 25/31] Fix test Signed-off-by: Kevin Zhang --- sdk/python/tests/unit/test_proto_json.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/python/tests/unit/test_proto_json.py b/sdk/python/tests/unit/test_proto_json.py index 6bfdbbbf91..235ebc7f93 100644 --- a/sdk/python/tests/unit/test_proto_json.py +++ b/sdk/python/tests/unit/test_proto_json.py @@ -81,7 +81,7 @@ def test_feast_repeated_value(proto_json_patch): # additional structure (e.g. [1,2,3] instead of {"val": [1,2,3]}) repeated_value_str = "[1,2,3]" repeated_value_proto = RepeatedValue() - Parse(repeated_value_str, repeated_value_proto) + Parse(repeated_value_str, repeated_value_proto, "") assertpy.assert_that(len(repeated_value_proto.val)).is_equal_to(3) assertpy.assert_that(repeated_value_proto.val[0].int64_val).is_equal_to(1) assertpy.assert_that(repeated_value_proto.val[1].int64_val).is_equal_to(2) From 4f5ec8862889ba7ea4eb80f1633bf3364d085222 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 17:03:29 -0700 Subject: [PATCH 26/31] Fix Signed-off-by: Kevin Zhang --- sdk/python/feast/proto_json.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/python/feast/proto_json.py b/sdk/python/feast/proto_json.py index edc50a9fa1..58b77edf8b 100644 --- a/sdk/python/feast/proto_json.py +++ b/sdk/python/feast/proto_json.py @@ -146,7 +146,7 @@ def from_json_object( ) -> None: array = value if isinstance(value, list) else value["val"] for item in array: - parser.ConvertMessage(item, message.val.add()) + parser.ConvertMessage(item, message.val.add(), path) _patch_proto_json_encoding(RepeatedValue, to_json_object, from_json_object) From c7c9ff160cdc67fbc310a7ebd00f2f09a6c0705a Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 17:48:52 -0700 Subject: [PATCH 27/31] Update go with grpc 1.47 Signed-off-by: Kevin Zhang --- go.mod | 2 +- go.sum | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index fbbc95e1bf..90ddb93e21 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/spaolacci/murmur3 v1.1.0 github.com/stretchr/testify v1.7.0 - google.golang.org/grpc v1.45.0 + google.golang.org/grpc v1.47.0 google.golang.org/protobuf v1.28.0 ) diff --git a/go.sum b/go.sum index 698d1ef640..933ecf6b29 100644 --- a/go.sum +++ b/go.sum @@ -55,6 +55,7 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= @@ -83,6 +84,7 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/feast-dev/gopy v0.4.1-0.20220429180328-4257ac71a4d0 h1:Go714ObVP1O+a6qK7haXVL28QNm6WMD8bwnN9EA8PlM= @@ -588,8 +590,9 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From ca1fd4bb6eba357cc8302badd64fb21ec2df0635 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 20:40:05 -0700 Subject: [PATCH 28/31] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 80cf167109..395fefdc01 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -82,8 +82,8 @@ jobs: make install-protoc-dependencies make install-go-proto-dependencies make install-go-ci-dependencies - # git status - # git restore go.mod go.sum + git status + git restore go.mod go.sum CIBW_BEFORE_TEST: "cd {project} && git status" # py3.10 on MacOS does not work with Go so we have to install separately. Issue is tracked here: https://github.com/feast/dev/feast/issues/2881. - name: Build py310 specific wheels for macos From d875c616bfd490a5746ed113695dd103d4fd6f29 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 20:41:24 -0700 Subject: [PATCH 29/31] Fix Signed-off-by: Kevin Zhang --- .../requirements/py3.7-ci-requirements.txt | 806 ------------------ .../requirements/py3.7-requirements.txt | 202 ----- 2 files changed, 1008 deletions(-) delete mode 100644 sdk/python/requirements/py3.7-ci-requirements.txt delete mode 100644 sdk/python/requirements/py3.7-requirements.txt diff --git a/sdk/python/requirements/py3.7-ci-requirements.txt b/sdk/python/requirements/py3.7-ci-requirements.txt deleted file mode 100644 index bbdd12c5e4..0000000000 --- a/sdk/python/requirements/py3.7-ci-requirements.txt +++ /dev/null @@ -1,806 +0,0 @@ -# -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: -# -# pip-compile --extra=ci --output-file=sdk/python/requirements/py3.7-ci-requirements.txt -# -absl-py==1.1.0 - # via tensorflow-metadata -adal==1.2.7 - # via - # azure-datalake-store - # msrestazure -adlfs==0.5.9 - # via feast (setup.py) -aiobotocore==2.1.2 - # via s3fs -aiohttp==3.8.1 - # via - # adlfs - # aiobotocore - # gcsfs - # s3fs -aioitertools==0.10.0 - # via aiobotocore -aiosignal==1.2.0 - # via aiohttp -alabaster==0.7.12 - # via sphinx -altair==4.2.0 - # via great-expectations -anyio==3.6.1 - # via - # starlette - # watchfiles -appdirs==1.4.4 - # via - # black - # fissix -appnope==0.1.3 - # via ipython -asn1crypto==1.5.1 - # via - # oscrypto - # snowflake-connector-python -assertpy==1.1 - # via feast (setup.py) -asttokens==2.0.5 - # via stack-data -async-timeout==4.0.2 - # via - # aiohttp - # redis -attrs==21.4.0 - # via - # aiohttp - # black - # bowler - # jsonschema - # pytest -avro==1.10.0 - # via feast (setup.py) -azure-core==1.24.1 - # via - # adlfs - # azure-identity - # azure-storage-blob - # msrest -azure-datalake-store==0.0.52 - # via adlfs -azure-identity==1.10.0 - # via adlfs -azure-storage-blob==12.12.0 - # via adlfs -babel==2.10.3 - # via sphinx -backcall==0.2.0 - # via ipython -backports-zoneinfo==0.2.1 - # via - # pytz-deprecation-shim - # tzlocal -black==19.10b0 - # via feast (setup.py) -boto3==1.20.23 - # via - # feast (setup.py) - # moto -botocore==1.23.24 - # via - # aiobotocore - # boto3 - # moto - # s3transfer -bowler==0.9.0 - # via feast (setup.py) -build==0.8.0 - # via - # feast (setup.py) - # pip-tools -cachecontrol==0.12.11 - # via firebase-admin -cachetools==4.2.4 - # via google-auth -certifi==2022.6.15 - # via - # minio - # msrest - # requests - # snowflake-connector-python -cffi==1.15.0 - # via - # azure-datalake-store - # cryptography - # snowflake-connector-python -cfgv==3.3.1 - # via pre-commit -charset-normalizer==2.0.12 - # via - # aiohttp - # requests - # snowflake-connector-python -click==8.0.1 - # via - # black - # bowler - # feast (setup.py) - # great-expectations - # moreorless - # pip-tools - # uvicorn -cloudpickle==2.1.0 - # via dask -colorama==0.4.5 - # via - # feast (setup.py) - # great-expectations -coverage[toml]==6.4.1 - # via pytest-cov -cryptography==35.0.0 - # via - # adal - # azure-identity - # azure-storage-blob - # feast (setup.py) - # great-expectations - # moto - # msal - # pyopenssl - # snowflake-connector-python -dask==2022.1.1 - # via feast (setup.py) -dataclasses==0.6 - # via great-expectations -decorator==5.1.1 - # via - # gcsfs - # ipython -deprecated==1.2.13 - # via redis -deprecation==2.1.0 - # via testcontainers -dill==0.3.5.1 - # via feast (setup.py) -distlib==0.3.4 - # via virtualenv -docker==5.0.3 - # via - # feast (setup.py) - # testcontainers -docutils==0.17.1 - # via - # sphinx - # sphinx-rtd-theme -entrypoints==0.4 - # via altair -execnet==1.9.0 - # via pytest-xdist -executing==0.8.3 - # via stack-data -fastapi==0.78.0 - # via feast (setup.py) -fastavro==1.5.2 - # via - # feast (setup.py) - # pandavro -fastjsonschema==2.15.3 - # via nbformat -filelock==3.7.1 - # via virtualenv -firebase-admin==4.5.2 - # via feast (setup.py) -fissix==21.11.13 - # via bowler -flake8==4.0.1 - # via feast (setup.py) -frozenlist==1.3.0 - # via - # aiohttp - # aiosignal -fsspec==2022.1.0 - # via - # adlfs - # dask - # gcsfs - # s3fs -gcsfs==2022.1.0 - # via feast (setup.py) -google-api-core[grpc]==1.31.6 - # via - # feast (setup.py) - # firebase-admin - # google-api-python-client - # google-cloud-bigquery - # google-cloud-bigquery-storage - # google-cloud-core - # google-cloud-datastore - # google-cloud-firestore -google-api-python-client==2.52.0 - # via firebase-admin -google-auth==1.35.0 - # via - # gcsfs - # google-api-core - # google-api-python-client - # google-auth-httplib2 - # google-auth-oauthlib - # google-cloud-core - # google-cloud-storage -google-auth-httplib2==0.1.0 - # via google-api-python-client -google-auth-oauthlib==0.5.2 - # via gcsfs -google-cloud-bigquery==2.34.4 - # via feast (setup.py) -google-cloud-bigquery-storage==2.13.2 - # via feast (setup.py) -google-cloud-core==1.7.2 - # via - # feast (setup.py) - # google-cloud-bigquery - # google-cloud-datastore - # google-cloud-firestore - # google-cloud-storage -google-cloud-datastore==2.7.1 - # via feast (setup.py) -google-cloud-firestore==2.5.3 - # via firebase-admin -google-cloud-storage==1.40.0 - # via - # feast (setup.py) - # firebase-admin - # gcsfs -google-crc32c==1.3.0 - # via google-resumable-media -google-resumable-media==1.3.3 - # via - # google-cloud-bigquery - # google-cloud-storage -googleapis-common-protos==1.56.3 - # via - # feast (setup.py) - # google-api-core - # tensorflow-metadata -great-expectations==0.14.13 - # via feast (setup.py) -grpcio==1.47.0 - # via - # feast (setup.py) - # google-api-core - # google-cloud-bigquery - # grpcio-reflection - # grpcio-testing - # grpcio-tools -grpcio-reflection==1.47.0 - # via feast (setup.py) -grpcio-testing==1.47.0 - # via feast (setup.py) -grpcio-tools==1.47.0 - # via feast (setup.py) -h11==0.13.0 - # via uvicorn -happybase==1.2.0 - # via feast (setup.py) -hiredis==2.0.0 - # via feast (setup.py) -httplib2==0.20.4 - # via - # google-api-python-client - # google-auth-httplib2 -httptools==0.4.0 - # via uvicorn -identify==2.5.1 - # via pre-commit -idna==3.3 - # via - # anyio - # requests - # snowflake-connector-python - # yarl -imagesize==1.3.0 - # via sphinx -importlib-metadata==4.12.0 - # via great-expectations -importlib-resources==5.8.0 - # via jsonschema -iniconfig==1.1.1 - # via pytest -ipython==8.4.0 - # via great-expectations -isodate==0.6.1 - # via msrest -isort==5.10.1 - # via feast (setup.py) -jedi==0.18.1 - # via ipython -jinja2==3.0.3 - # via - # altair - # feast (setup.py) - # great-expectations - # moto - # sphinx -jmespath==0.10.0 - # via - # boto3 - # botocore -jsonpatch==1.32 - # via great-expectations -jsonpointer==2.3 - # via jsonpatch -jsonschema==4.6.1 - # via - # altair - # feast (setup.py) - # great-expectations - # nbformat -jupyter-core==4.10.0 - # via nbformat -locket==1.0.0 - # via partd -markupsafe==2.1.1 - # via - # jinja2 - # moto -matplotlib-inline==0.1.3 - # via ipython -mccabe==0.6.1 - # via flake8 -minio==7.1.0 - # via feast (setup.py) -mistune==2.0.3 - # via great-expectations -mmh3==3.0.0 - # via feast (setup.py) -mock==2.0.0 - # via feast (setup.py) -moreorless==0.4.0 - # via bowler -moto==3.1.16 - # via feast (setup.py) -msal==1.18.0 - # via - # azure-identity - # msal-extensions -msal-extensions==1.0.0 - # via azure-identity -msgpack==1.0.4 - # via cachecontrol -msrest==0.7.1 - # via - # azure-storage-blob - # msrestazure -msrestazure==0.6.4 - # via adlfs -multidict==6.0.2 - # via - # aiohttp - # yarl -mypy==0.961 - # via - # feast (setup.py) - # sqlalchemy -mypy-extensions==0.4.3 - # via mypy -mypy-protobuf==3.1 - # via feast (setup.py) -mysqlclient==2.1.1 - # via feast (setup.py) -nbformat==5.4.0 - # via great-expectations -nodeenv==1.7.0 - # via pre-commit -numpy==1.21.6 - # via - # altair - # feast (setup.py) - # great-expectations - # pandas - # pandavro - # pyarrow - # scipy -oauthlib==3.2.0 - # via requests-oauthlib -oscrypto==1.3.0 - # via snowflake-connector-python -packaging==21.3 - # via - # build - # dask - # deprecation - # google-api-core - # google-cloud-bigquery - # great-expectations - # pytest - # redis - # sphinx -pandas==1.4.3 - # via - # altair - # feast (setup.py) - # great-expectations - # pandavro - # snowflake-connector-python -pandavro==1.5.2 - # via feast (setup.py) -parso==0.8.3 - # via jedi -partd==1.2.0 - # via dask -pathspec==0.9.0 - # via black -pbr==5.9.0 - # via mock -pep517==0.12.0 - # via build -pexpect==4.8.0 - # via ipython -pickleshare==0.7.5 - # via ipython -pip-tools==6.7.0 - # via feast (setup.py) -platformdirs==2.5.2 - # via virtualenv -pluggy==1.0.0 - # via pytest -ply==3.11 - # via thriftpy2 -portalocker==2.4.0 - # via msal-extensions -pre-commit==2.19.0 - # via feast (setup.py) -prompt-toolkit==3.0.30 - # via ipython -proto-plus==1.20.6 - # via - # feast (setup.py) - # google-cloud-bigquery - # google-cloud-bigquery-storage - # google-cloud-datastore - # google-cloud-firestore -protobuf==3.19.4 - # via - # feast (setup.py) - # google-api-core - # google-cloud-bigquery - # google-cloud-bigquery-storage - # google-cloud-datastore - # google-cloud-firestore - # googleapis-common-protos - # grpcio-reflection - # grpcio-testing - # grpcio-tools - # mypy-protobuf - # proto-plus - # tensorflow-metadata -psutil==5.9.0 - # via feast (setup.py) -psycopg2-binary==2.9.3 - # via feast (setup.py) -ptyprocess==0.7.0 - # via pexpect -pure-eval==0.2.2 - # via stack-data -py==1.11.0 - # via - # pytest - # pytest-forked -py-cpuinfo==8.0.0 - # via pytest-benchmark -py4j==0.10.9.5 - # via pyspark -pyarrow==6.0.1 - # via - # feast (setup.py) - # snowflake-connector-python -pyasn1==0.4.8 - # via - # pyasn1-modules - # rsa -pyasn1-modules==0.2.8 - # via google-auth -pybindgen==0.22.1 - # via feast (setup.py) -pycodestyle==2.8.0 - # via flake8 -pycparser==2.21 - # via cffi -pycryptodomex==3.15.0 - # via snowflake-connector-python -pydantic==1.9.1 - # via - # fastapi - # feast (setup.py) -pyflakes==2.4.0 - # via flake8 -pygments==2.12.0 - # via - # feast (setup.py) - # ipython - # sphinx -pyjwt[crypto]==2.4.0 - # via - # adal - # msal - # snowflake-connector-python -pyopenssl==22.0.0 - # via snowflake-connector-python -pyparsing==2.4.7 - # via - # great-expectations - # httplib2 - # packaging -pyrsistent==0.18.1 - # via jsonschema -pyspark==3.3.0 - # via feast (setup.py) -pytest==7.1.2 - # via - # feast (setup.py) - # pytest-benchmark - # pytest-cov - # pytest-forked - # pytest-lazy-fixture - # pytest-mock - # pytest-ordering - # pytest-timeout - # pytest-xdist -pytest-benchmark==3.4.1 - # via feast (setup.py) -pytest-cov==3.0.0 - # via feast (setup.py) -pytest-forked==1.4.0 - # via pytest-xdist -pytest-lazy-fixture==0.6.3 - # via feast (setup.py) -pytest-mock==1.10.4 - # via feast (setup.py) -pytest-ordering==0.6 - # via feast (setup.py) -pytest-timeout==1.4.2 - # via feast (setup.py) -pytest-xdist==2.5.0 - # via feast (setup.py) -python-dateutil==2.8.2 - # via - # adal - # botocore - # google-cloud-bigquery - # great-expectations - # moto - # pandas -python-dotenv==0.20.0 - # via uvicorn -pytz==2022.1 - # via - # babel - # google-api-core - # great-expectations - # moto - # pandas - # snowflake-connector-python - # trino -pytz-deprecation-shim==0.1.0.post0 - # via tzlocal -pyyaml==6.0 - # via - # dask - # feast (setup.py) - # pre-commit - # uvicorn -redis==4.2.2 - # via feast (setup.py) -regex==2022.6.2 - # via black -requests==2.28.1 - # via - # adal - # adlfs - # azure-core - # azure-datalake-store - # cachecontrol - # docker - # gcsfs - # google-api-core - # google-cloud-bigquery - # google-cloud-storage - # great-expectations - # moto - # msal - # msrest - # requests-oauthlib - # responses - # snowflake-connector-python - # sphinx - # trino -requests-oauthlib==1.3.1 - # via - # google-auth-oauthlib - # msrest -responses==0.21.0 - # via moto -rsa==4.8 - # via google-auth -ruamel-yaml==0.17.17 - # via great-expectations -ruamel-yaml-clib==0.2.6 - # via ruamel-yaml -s3fs==2022.1.0 - # via feast (setup.py) -s3transfer==0.5.2 - # via boto3 -scipy==1.8.1 - # via great-expectations -six==1.16.0 - # via - # azure-core - # azure-identity - # google-api-core - # google-auth - # google-auth-httplib2 - # google-cloud-core - # google-resumable-media - # grpcio - # happybase - # mock - # msrestazure - # pandavro - # python-dateutil - # virtualenv -sniffio==1.2.0 - # via anyio -snowballstemmer==2.2.0 - # via sphinx -snowflake-connector-python[pandas]==2.7.8 - # via feast (setup.py) -sphinx==4.3.2 - # via - # feast (setup.py) - # sphinx-rtd-theme -sphinx-rtd-theme==1.0.0 - # via feast (setup.py) -sphinxcontrib-applehelp==1.0.2 - # via sphinx -sphinxcontrib-devhelp==1.0.2 - # via sphinx -sphinxcontrib-htmlhelp==2.0.0 - # via sphinx -sphinxcontrib-jsmath==1.0.1 - # via sphinx -sphinxcontrib-qthelp==1.0.3 - # via sphinx -sphinxcontrib-serializinghtml==1.1.5 - # via sphinx -sqlalchemy[mypy]==1.4.39 - # via feast (setup.py) -sqlalchemy2-stubs==0.0.2a24 - # via sqlalchemy -stack-data==0.3.0 - # via ipython -starlette==0.19.1 - # via fastapi -tabulate==0.8.10 - # via feast (setup.py) -tenacity==8.0.1 - # via feast (setup.py) -tensorflow-metadata==1.9.0 - # via feast (setup.py) -termcolor==1.1.0 - # via great-expectations -testcontainers==3.6.0 - # via feast (setup.py) -thriftpy2==0.4.14 - # via happybase -toml==0.10.2 - # via - # black - # feast (setup.py) - # pre-commit -tomli==2.0.1 - # via - # build - # coverage - # mypy - # pep517 - # pytest -toolz==0.11.2 - # via - # altair - # dask - # partd -tqdm==4.64.0 - # via - # feast (setup.py) - # great-expectations -traitlets==5.3.0 - # via - # ipython - # jupyter-core - # matplotlib-inline - # nbformat -trino==0.313.0 - # via feast (setup.py) -typed-ast==1.5.4 - # via black -typeguard==2.13.3 - # via feast (setup.py) -types-protobuf==3.19.22 - # via - # feast (setup.py) - # mypy-protobuf -types-python-dateutil==2.8.18 - # via feast (setup.py) -types-pytz==2022.1.1 - # via feast (setup.py) -types-pyyaml==6.0.9 - # via feast (setup.py) -types-redis==4.3.3 - # via feast (setup.py) -types-requests==2.28.0 - # via feast (setup.py) -types-setuptools==57.4.18 - # via feast (setup.py) -types-tabulate==0.8.11 - # via feast (setup.py) -types-urllib3==1.26.15 - # via types-requests -typing-extensions==4.2.0 - # via - # aioitertools - # azure-core - # great-expectations - # mypy - # pydantic - # sqlalchemy2-stubs - # starlette -tzdata==2022.1 - # via pytz-deprecation-shim -tzlocal==4.2 - # via great-expectations -uritemplate==4.1.1 - # via google-api-python-client -urllib3==1.26.9 - # via - # botocore - # feast (setup.py) - # great-expectations - # minio - # requests - # responses -uvicorn[standard]==0.18.2 - # via feast (setup.py) -uvloop==0.16.0 - # via uvicorn -virtualenv==20.15.1 - # via pre-commit -volatile==2.1.0 - # via bowler -watchfiles==0.15.0 - # via uvicorn -wcwidth==0.2.5 - # via prompt-toolkit -websocket-client==1.3.3 - # via docker -websockets==10.3 - # via uvicorn -werkzeug==2.1.2 - # via moto -wheel==0.37.1 - # via pip-tools -wrapt==1.14.1 - # via - # aiobotocore - # deprecated - # testcontainers -xmltodict==0.13.0 - # via moto -yarl==1.7.2 - # via aiohttp -zipp==3.8.0 - # via - # importlib-metadata - # importlib-resources - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/sdk/python/requirements/py3.7-requirements.txt b/sdk/python/requirements/py3.7-requirements.txt deleted file mode 100644 index 60add10fdf..0000000000 --- a/sdk/python/requirements/py3.7-requirements.txt +++ /dev/null @@ -1,202 +0,0 @@ -# -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: -# -# pip-compile --output-file=sdk/python/requirements/py3.7-requirements.txt -# -absl-py==1.1.0 - # via tensorflow-metadata -anyio==3.6.1 - # via - # starlette - # watchfiles -appdirs==1.4.4 - # via fissix -attrs==21.4.0 - # via - # bowler - # jsonschema -bowler==0.9.0 - # via feast (setup.py) -cachetools==5.2.0 - # via google-auth -certifi==2022.6.15 - # via requests -charset-normalizer==2.1.0 - # via requests -click==8.0.1 - # via - # bowler - # feast (setup.py) - # moreorless - # uvicorn -cloudpickle==2.1.0 - # via dask -colorama==0.4.5 - # via feast (setup.py) -dask==2022.1.1 - # via feast (setup.py) -dill==0.3.5.1 - # via feast (setup.py) -fastapi==0.78.0 - # via feast (setup.py) -fastavro==1.5.2 - # via - # feast (setup.py) - # pandavro -fissix==21.11.13 - # via bowler -fsspec==2022.5.0 - # via dask -google-api-core==2.8.2 - # via feast (setup.py) -google-auth==2.9.0 - # via google-api-core -googleapis-common-protos==1.56.3 - # via - # feast (setup.py) - # google-api-core - # tensorflow-metadata -grpcio==1.47.0 - # via - # feast (setup.py) - # grpcio-reflection -grpcio-reflection==1.47.0 - # via feast (setup.py) -h11==0.13.0 - # via uvicorn -httptools==0.4.0 - # via uvicorn -idna==3.3 - # via - # anyio - # requests -importlib-resources==5.8.0 - # via jsonschema -jinja2==3.1.2 - # via feast (setup.py) -jsonschema==4.6.1 - # via feast (setup.py) -locket==1.0.0 - # via partd -markupsafe==2.1.1 - # via jinja2 -mmh3==3.0.0 - # via feast (setup.py) -moreorless==0.4.0 - # via bowler -mypy==0.961 - # via sqlalchemy -mypy-extensions==0.4.3 - # via mypy -numpy==1.21.6 - # via - # feast (setup.py) - # pandas - # pandavro - # pyarrow -packaging==21.3 - # via dask -pandas==1.4.3 - # via - # feast (setup.py) - # pandavro -pandavro==1.5.2 - # via feast (setup.py) -partd==1.2.0 - # via dask -proto-plus==1.20.6 - # via feast (setup.py) -protobuf==3.19.4 - # via - # feast (setup.py) - # google-api-core - # googleapis-common-protos - # grpcio-reflection - # proto-plus - # tensorflow-metadata -pyarrow==6.0.1 - # via feast (setup.py) -pyasn1==0.4.8 - # via - # pyasn1-modules - # rsa -pyasn1-modules==0.2.8 - # via google-auth -pydantic==1.9.1 - # via - # fastapi - # feast (setup.py) -pygments==2.12.0 - # via feast (setup.py) -pyparsing==3.0.9 - # via packaging -pyrsistent==0.18.1 - # via jsonschema -python-dateutil==2.8.2 - # via pandas -python-dotenv==0.20.0 - # via uvicorn -pytz==2022.1 - # via pandas -pyyaml==6.0 - # via - # dask - # feast (setup.py) - # uvicorn -requests==2.28.1 - # via google-api-core -rsa==4.8 - # via google-auth -six==1.16.0 - # via - # google-auth - # grpcio - # pandavro - # python-dateutil -sniffio==1.2.0 - # via anyio -sqlalchemy[mypy]==1.4.39 - # via feast (setup.py) -sqlalchemy2-stubs==0.0.2a24 - # via sqlalchemy -starlette==0.19.1 - # via fastapi -tabulate==0.8.10 - # via feast (setup.py) -tenacity==8.0.1 - # via feast (setup.py) -tensorflow-metadata==1.9.0 - # via feast (setup.py) -toml==0.10.2 - # via feast (setup.py) -tomli==2.0.1 - # via mypy -toolz==0.11.2 - # via - # dask - # partd -tqdm==4.64.0 - # via feast (setup.py) -typeguard==2.13.3 - # via feast (setup.py) -typing-extensions==4.2.0 - # via - # mypy - # pydantic - # sqlalchemy2-stubs - # starlette -urllib3==1.26.9 - # via requests -uvicorn[standard]==0.18.2 - # via feast (setup.py) -uvloop==0.16.0 - # via uvicorn -volatile==2.1.0 - # via bowler -watchfiles==0.15.0 - # via uvicorn -websockets==10.3 - # via uvicorn -zipp==3.8.0 - # via importlib-resources From c6d2ef728064266678bbd1c859e9a9ae6bea28ff Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 20:44:56 -0700 Subject: [PATCH 30/31] Fix Signed-off-by: Kevin Zhang --- sdk/python/requirements/py3.8-ci-requirements.txt | 2 +- sdk/python/requirements/py3.8-requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/python/requirements/py3.8-ci-requirements.txt b/sdk/python/requirements/py3.8-ci-requirements.txt index 649e34cb8f..813420a121 100644 --- a/sdk/python/requirements/py3.8-ci-requirements.txt +++ b/sdk/python/requirements/py3.8-ci-requirements.txt @@ -390,7 +390,7 @@ nbformat==5.4.0 # via great-expectations nodeenv==1.7.0 # via pre-commit -numpy==1.22.0 +numpy==1.23.0 # via # altair # feast (setup.py) diff --git a/sdk/python/requirements/py3.8-requirements.txt b/sdk/python/requirements/py3.8-requirements.txt index 2464c5f747..56e5e3adba 100644 --- a/sdk/python/requirements/py3.8-requirements.txt +++ b/sdk/python/requirements/py3.8-requirements.txt @@ -89,7 +89,7 @@ mypy==0.961 # via sqlalchemy mypy-extensions==0.4.3 # via mypy -numpy==1.22.0 +numpy==1.23.0 # via # feast (setup.py) # pandas diff --git a/setup.py b/setup.py index 7cfc5a0622..217b2e1011 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ "numpy>=1.22,<2", "pandas>=1,<2", "pandavro==1.5.*", - "protobuf>=3.10,<4", + "protobuf>3.20,<4", "proto-plus==1.20.*", "pyarrow>=4,<7", "pydantic>=1,<2", From 7a7a4731616bca17c3f63cc289ca3ac9ca8a5dd5 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 20:46:43 -0700 Subject: [PATCH 31/31] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 395fefdc01..ea93cc85a4 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -85,7 +85,7 @@ jobs: git status git restore go.mod go.sum CIBW_BEFORE_TEST: "cd {project} && git status" - # py3.10 on MacOS does not work with Go so we have to install separately. Issue is tracked here: https://github.com/feast/dev/feast/issues/2881. + # py3.10 on MacOS does not work with Go so we have to install separately. Issue is tracked here: https://github.com/feast-dev/feast/issues/2881. - name: Build py310 specific wheels for macos if: matrix.os == 'macos-10.15' uses: pypa/cibuildwheel@v2.7.0