Skip to content

Commit

Permalink
Remove tensorflow-metadata.
Browse files Browse the repository at this point in the history
Turns out that this dependency is not required. We removed all
references to it in [this
PR](#2063), but did not remove it
from `setup.py`. Removing it has caused many of the restrictions imposed
in previous commits to be unnecessary.

Signed-off-by: Abhin Chhabra <abhin.chhabra@shopify.com>
  • Loading branch information
chhabrakadabra committed Sep 30, 2022
1 parent cce3602 commit 943ee3f
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 71 deletions.
20 changes: 6 additions & 14 deletions sdk/python/requirements/py3.10-ci-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# pip-compile --extra=ci --output-file=sdk/python/requirements/py3.10-ci-requirements.txt
#
absl-py==1.2.0
# via tensorflow-metadata
adal==1.2.7
# via
# azure-datalake-store
Expand Down Expand Up @@ -281,7 +279,6 @@ googleapis-common-protos[grpc]==1.56.4
# google-api-core
# grpc-google-iam-v1
# grpcio-status
# tensorflow-metadata
great-expectations==0.14.13
# via feast (setup.py)
grpc-google-iam-v1==0.12.4
Expand All @@ -297,15 +294,13 @@ grpcio==1.49.1
# grpcio-status
# grpcio-testing
# grpcio-tools
grpcio-reflection==1.48.2
grpcio-reflection==1.49.1
# via feast (setup.py)
grpcio-status==1.48.2
# via
# feast (setup.py)
# google-api-core
grpcio-testing==1.48.2
grpcio-status==1.49.1
# via google-api-core
grpcio-testing==1.49.1
# via feast (setup.py)
grpcio-tools==1.48.2
grpcio-tools==1.49.1
# via feast (setup.py)
h11==0.14.0
# via uvicorn
Expand Down Expand Up @@ -499,7 +494,7 @@ proto-plus==1.22.1
# google-cloud-bigtable
# google-cloud-datastore
# google-cloud-firestore
protobuf==3.20.3
protobuf==4.21.7
# via
# feast (setup.py)
# google-api-core
Expand All @@ -515,7 +510,6 @@ protobuf==3.20.3
# grpcio-tools
# mypy-protobuf
# proto-plus
# tensorflow-metadata
psutil==5.9.0
# via feast (setup.py)
psycopg2-binary==2.9.3
Expand Down Expand Up @@ -735,8 +729,6 @@ tabulate==0.8.10
# via feast (setup.py)
tenacity==8.1.0
# via feast (setup.py)
tensorflow-metadata==1.10.0
# via feast (setup.py)
termcolor==2.0.1
# via great-expectations
testcontainers==3.7.0
Expand Down
10 changes: 2 additions & 8 deletions sdk/python/requirements/py3.10-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# pip-compile --output-file=sdk/python/requirements/py3.10-requirements.txt
#
absl-py==1.2.0
# via tensorflow-metadata
anyio==3.6.1
# via
# starlette
Expand Down Expand Up @@ -56,12 +54,11 @@ googleapis-common-protos==1.56.4
# via
# feast (setup.py)
# google-api-core
# tensorflow-metadata
grpcio==1.49.1
# via
# feast (setup.py)
# grpcio-reflection
grpcio-reflection==1.48.2
grpcio-reflection==1.49.1
# via feast (setup.py)
h11==0.14.0
# via uvicorn
Expand Down Expand Up @@ -105,14 +102,13 @@ partd==1.3.0
# via dask
proto-plus==1.22.1
# via feast (setup.py)
protobuf==3.20.3
protobuf==4.21.7
# via
# feast (setup.py)
# google-api-core
# googleapis-common-protos
# grpcio-reflection
# proto-plus
# tensorflow-metadata
pyarrow==8.0.0
# via feast (setup.py)
pyasn1==0.4.8
Expand Down Expand Up @@ -164,8 +160,6 @@ tabulate==0.8.10
# via feast (setup.py)
tenacity==8.1.0
# via feast (setup.py)
tensorflow-metadata==1.10.0
# via feast (setup.py)
toml==0.10.2
# via feast (setup.py)
tomli==2.0.1
Expand Down
20 changes: 6 additions & 14 deletions sdk/python/requirements/py3.8-ci-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# pip-compile --extra=ci --output-file=sdk/python/requirements/py3.8-ci-requirements.txt
#
absl-py==1.2.0
# via tensorflow-metadata
adal==1.2.7
# via
# azure-datalake-store
Expand Down Expand Up @@ -285,7 +283,6 @@ googleapis-common-protos[grpc]==1.56.4
# google-api-core
# grpc-google-iam-v1
# grpcio-status
# tensorflow-metadata
great-expectations==0.14.13
# via feast (setup.py)
grpc-google-iam-v1==0.12.4
Expand All @@ -301,15 +298,13 @@ grpcio==1.49.1
# grpcio-status
# grpcio-testing
# grpcio-tools
grpcio-reflection==1.48.2
grpcio-reflection==1.49.1
# via feast (setup.py)
grpcio-status==1.48.2
# via
# feast (setup.py)
# google-api-core
grpcio-testing==1.48.2
grpcio-status==1.49.1
# via google-api-core
grpcio-testing==1.49.1
# via feast (setup.py)
grpcio-tools==1.48.2
grpcio-tools==1.49.1
# via feast (setup.py)
h11==0.14.0
# via uvicorn
Expand Down Expand Up @@ -507,7 +502,7 @@ proto-plus==1.22.1
# google-cloud-bigtable
# google-cloud-datastore
# google-cloud-firestore
protobuf==3.20.3
protobuf==4.21.7
# via
# feast (setup.py)
# google-api-core
Expand All @@ -523,7 +518,6 @@ protobuf==3.20.3
# grpcio-tools
# mypy-protobuf
# proto-plus
# tensorflow-metadata
psutil==5.9.0
# via feast (setup.py)
psycopg2-binary==2.9.3
Expand Down Expand Up @@ -745,8 +739,6 @@ tabulate==0.8.10
# via feast (setup.py)
tenacity==8.1.0
# via feast (setup.py)
tensorflow-metadata==1.10.0
# via feast (setup.py)
termcolor==2.0.1
# via great-expectations
testcontainers==3.7.0
Expand Down
10 changes: 2 additions & 8 deletions sdk/python/requirements/py3.8-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# pip-compile --output-file=sdk/python/requirements/py3.8-requirements.txt
#
absl-py==1.2.0
# via tensorflow-metadata
anyio==3.6.1
# via
# starlette
Expand Down Expand Up @@ -56,12 +54,11 @@ googleapis-common-protos==1.56.4
# via
# feast (setup.py)
# google-api-core
# tensorflow-metadata
grpcio==1.49.1
# via
# feast (setup.py)
# grpcio-reflection
grpcio-reflection==1.48.2
grpcio-reflection==1.49.1
# via feast (setup.py)
h11==0.14.0
# via uvicorn
Expand Down Expand Up @@ -109,14 +106,13 @@ pkgutil-resolve-name==1.3.10
# via jsonschema
proto-plus==1.22.1
# via feast (setup.py)
protobuf==3.20.3
protobuf==4.21.7
# via
# feast (setup.py)
# google-api-core
# googleapis-common-protos
# grpcio-reflection
# proto-plus
# tensorflow-metadata
pyarrow==8.0.0
# via feast (setup.py)
pyasn1==0.4.8
Expand Down Expand Up @@ -168,8 +164,6 @@ tabulate==0.8.10
# via feast (setup.py)
tenacity==8.1.0
# via feast (setup.py)
tensorflow-metadata==1.10.0
# via feast (setup.py)
toml==0.10.2
# via feast (setup.py)
tomli==2.0.1
Expand Down
20 changes: 6 additions & 14 deletions sdk/python/requirements/py3.9-ci-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# pip-compile --extra=ci --output-file=sdk/python/requirements/py3.9-ci-requirements.txt
#
absl-py==1.2.0
# via tensorflow-metadata
adal==1.2.7
# via
# azure-datalake-store
Expand Down Expand Up @@ -281,7 +279,6 @@ googleapis-common-protos[grpc]==1.56.4
# google-api-core
# grpc-google-iam-v1
# grpcio-status
# tensorflow-metadata
great-expectations==0.14.13
# via feast (setup.py)
grpc-google-iam-v1==0.12.4
Expand All @@ -297,15 +294,13 @@ grpcio==1.49.1
# grpcio-status
# grpcio-testing
# grpcio-tools
grpcio-reflection==1.48.2
grpcio-reflection==1.49.1
# via feast (setup.py)
grpcio-status==1.48.2
# via
# feast (setup.py)
# google-api-core
grpcio-testing==1.48.2
grpcio-status==1.49.1
# via google-api-core
grpcio-testing==1.49.1
# via feast (setup.py)
grpcio-tools==1.48.2
grpcio-tools==1.49.1
# via feast (setup.py)
h11==0.14.0
# via uvicorn
Expand Down Expand Up @@ -499,7 +494,7 @@ proto-plus==1.22.1
# google-cloud-bigtable
# google-cloud-datastore
# google-cloud-firestore
protobuf==3.20.3
protobuf==4.21.7
# via
# feast (setup.py)
# google-api-core
Expand All @@ -515,7 +510,6 @@ protobuf==3.20.3
# grpcio-tools
# mypy-protobuf
# proto-plus
# tensorflow-metadata
psutil==5.9.0
# via feast (setup.py)
psycopg2-binary==2.9.3
Expand Down Expand Up @@ -737,8 +731,6 @@ tabulate==0.8.10
# via feast (setup.py)
tenacity==8.1.0
# via feast (setup.py)
tensorflow-metadata==1.10.0
# via feast (setup.py)
termcolor==2.0.1
# via great-expectations
testcontainers==3.7.0
Expand Down
10 changes: 2 additions & 8 deletions sdk/python/requirements/py3.9-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# pip-compile --output-file=sdk/python/requirements/py3.9-requirements.txt
#
absl-py==1.2.0
# via tensorflow-metadata
anyio==3.6.1
# via
# starlette
Expand Down Expand Up @@ -56,12 +54,11 @@ googleapis-common-protos==1.56.4
# via
# feast (setup.py)
# google-api-core
# tensorflow-metadata
grpcio==1.49.1
# via
# feast (setup.py)
# grpcio-reflection
grpcio-reflection==1.48.2
grpcio-reflection==1.49.1
# via feast (setup.py)
h11==0.14.0
# via uvicorn
Expand Down Expand Up @@ -105,14 +102,13 @@ partd==1.3.0
# via dask
proto-plus==1.22.1
# via feast (setup.py)
protobuf==3.20.3
protobuf==4.21.7
# via
# feast (setup.py)
# google-api-core
# googleapis-common-protos
# grpcio-reflection
# proto-plus
# tensorflow-metadata
pyarrow==8.0.0
# via feast (setup.py)
pyasn1==0.4.8
Expand Down Expand Up @@ -164,8 +160,6 @@ tabulate==0.8.10
# via feast (setup.py)
tenacity==8.1.0
# via feast (setup.py)
tensorflow-metadata==1.10.0
# via feast (setup.py)
toml==0.10.2
# via feast (setup.py)
tomli==2.0.1
Expand Down
8 changes: 3 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"google-api-core>=1.23.0,<3",
"googleapis-common-protos>=1.52.*,<2",
"grpcio>=1.47.0,<2",
"grpcio-reflection>=1.47.0,<1.49",
"grpcio-reflection>=1.47.0,<2",
"Jinja2>=2,<4",
"jsonschema",
"mmh3",
Expand All @@ -74,7 +74,6 @@
"typeguard",
"fastapi>=0.68.0,<1",
"uvicorn[standard]>=0.14.0,<1",
"tensorflow-metadata>=1.0.0,<2.0.0",
"dask>=2021.*,<2022.02.0",
"bowler", # Needed for automatic repo upgrades
]
Expand All @@ -85,7 +84,6 @@
"google-cloud-datastore>=2.1.*,<3",
"google-cloud-storage>=1.34.*,<3",
"google-cloud-bigtable>=2.11.*,<3",
"grpcio-status<1.49",
]

REDIS_REQUIRED = [
Expand Down Expand Up @@ -148,8 +146,8 @@
"flake8",
"black>=22.6.0,<23",
"isort>=5,<6",
"grpcio-tools>=1.47.0,<1.49",
"grpcio-testing>=1.47.0,<1.49",
"grpcio-tools>=1.47.0",
"grpcio-testing>=1.47.0",
"minio==7.1.0",
"mock==2.0.0",
"moto<4",
Expand Down

0 comments on commit 943ee3f

Please sign in to comment.