Skip to content

Commit 943ee3f

Browse files
chhabrakadabrachhabrakadabra
committed
Remove tensorflow-metadata.
Turns out that this dependency is not required. We removed all references to it in [this PR](feast-dev#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>
1 parent cce3602 commit 943ee3f

7 files changed

Lines changed: 27 additions & 71 deletions

File tree

‎sdk/python/requirements/py3.10-ci-requirements.txt‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#
55
# pip-compile --extra=ci --output-file=sdk/python/requirements/py3.10-ci-requirements.txt
66
#
7-
absl-py==1.2.0
8-
# via tensorflow-metadata
97
adal==1.2.7
108
# via
119
# azure-datalake-store
@@ -281,7 +279,6 @@ googleapis-common-protos[grpc]==1.56.4
281279
# google-api-core
282280
# grpc-google-iam-v1
283281
# grpcio-status
284-
# tensorflow-metadata
285282
great-expectations==0.14.13
286283
# via feast (setup.py)
287284
grpc-google-iam-v1==0.12.4
@@ -297,15 +294,13 @@ grpcio==1.49.1
297294
# grpcio-status
298295
# grpcio-testing
299296
# grpcio-tools
300-
grpcio-reflection==1.48.2
297+
grpcio-reflection==1.49.1
301298
# via feast (setup.py)
302-
grpcio-status==1.48.2
303-
# via
304-
# feast (setup.py)
305-
# google-api-core
306-
grpcio-testing==1.48.2
299+
grpcio-status==1.49.1
300+
# via google-api-core
301+
grpcio-testing==1.49.1
307302
# via feast (setup.py)
308-
grpcio-tools==1.48.2
303+
grpcio-tools==1.49.1
309304
# via feast (setup.py)
310305
h11==0.14.0
311306
# via uvicorn
@@ -499,7 +494,7 @@ proto-plus==1.22.1
499494
# google-cloud-bigtable
500495
# google-cloud-datastore
501496
# google-cloud-firestore
502-
protobuf==3.20.3
497+
protobuf==4.21.7
503498
# via
504499
# feast (setup.py)
505500
# google-api-core
@@ -515,7 +510,6 @@ protobuf==3.20.3
515510
# grpcio-tools
516511
# mypy-protobuf
517512
# proto-plus
518-
# tensorflow-metadata
519513
psutil==5.9.0
520514
# via feast (setup.py)
521515
psycopg2-binary==2.9.3
@@ -735,8 +729,6 @@ tabulate==0.8.10
735729
# via feast (setup.py)
736730
tenacity==8.1.0
737731
# via feast (setup.py)
738-
tensorflow-metadata==1.10.0
739-
# via feast (setup.py)
740732
termcolor==2.0.1
741733
# via great-expectations
742734
testcontainers==3.7.0

‎sdk/python/requirements/py3.10-requirements.txt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#
55
# pip-compile --output-file=sdk/python/requirements/py3.10-requirements.txt
66
#
7-
absl-py==1.2.0
8-
# via tensorflow-metadata
97
anyio==3.6.1
108
# via
119
# starlette
@@ -56,12 +54,11 @@ googleapis-common-protos==1.56.4
5654
# via
5755
# feast (setup.py)
5856
# google-api-core
59-
# tensorflow-metadata
6057
grpcio==1.49.1
6158
# via
6259
# feast (setup.py)
6360
# grpcio-reflection
64-
grpcio-reflection==1.48.2
61+
grpcio-reflection==1.49.1
6562
# via feast (setup.py)
6663
h11==0.14.0
6764
# via uvicorn
@@ -105,14 +102,13 @@ partd==1.3.0
105102
# via dask
106103
proto-plus==1.22.1
107104
# via feast (setup.py)
108-
protobuf==3.20.3
105+
protobuf==4.21.7
109106
# via
110107
# feast (setup.py)
111108
# google-api-core
112109
# googleapis-common-protos
113110
# grpcio-reflection
114111
# proto-plus
115-
# tensorflow-metadata
116112
pyarrow==8.0.0
117113
# via feast (setup.py)
118114
pyasn1==0.4.8
@@ -164,8 +160,6 @@ tabulate==0.8.10
164160
# via feast (setup.py)
165161
tenacity==8.1.0
166162
# via feast (setup.py)
167-
tensorflow-metadata==1.10.0
168-
# via feast (setup.py)
169163
toml==0.10.2
170164
# via feast (setup.py)
171165
tomli==2.0.1

‎sdk/python/requirements/py3.8-ci-requirements.txt‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#
55
# pip-compile --extra=ci --output-file=sdk/python/requirements/py3.8-ci-requirements.txt
66
#
7-
absl-py==1.2.0
8-
# via tensorflow-metadata
97
adal==1.2.7
108
# via
119
# azure-datalake-store
@@ -285,7 +283,6 @@ googleapis-common-protos[grpc]==1.56.4
285283
# google-api-core
286284
# grpc-google-iam-v1
287285
# grpcio-status
288-
# tensorflow-metadata
289286
great-expectations==0.14.13
290287
# via feast (setup.py)
291288
grpc-google-iam-v1==0.12.4
@@ -301,15 +298,13 @@ grpcio==1.49.1
301298
# grpcio-status
302299
# grpcio-testing
303300
# grpcio-tools
304-
grpcio-reflection==1.48.2
301+
grpcio-reflection==1.49.1
305302
# via feast (setup.py)
306-
grpcio-status==1.48.2
307-
# via
308-
# feast (setup.py)
309-
# google-api-core
310-
grpcio-testing==1.48.2
303+
grpcio-status==1.49.1
304+
# via google-api-core
305+
grpcio-testing==1.49.1
311306
# via feast (setup.py)
312-
grpcio-tools==1.48.2
307+
grpcio-tools==1.49.1
313308
# via feast (setup.py)
314309
h11==0.14.0
315310
# via uvicorn
@@ -507,7 +502,7 @@ proto-plus==1.22.1
507502
# google-cloud-bigtable
508503
# google-cloud-datastore
509504
# google-cloud-firestore
510-
protobuf==3.20.3
505+
protobuf==4.21.7
511506
# via
512507
# feast (setup.py)
513508
# google-api-core
@@ -523,7 +518,6 @@ protobuf==3.20.3
523518
# grpcio-tools
524519
# mypy-protobuf
525520
# proto-plus
526-
# tensorflow-metadata
527521
psutil==5.9.0
528522
# via feast (setup.py)
529523
psycopg2-binary==2.9.3
@@ -745,8 +739,6 @@ tabulate==0.8.10
745739
# via feast (setup.py)
746740
tenacity==8.1.0
747741
# via feast (setup.py)
748-
tensorflow-metadata==1.10.0
749-
# via feast (setup.py)
750742
termcolor==2.0.1
751743
# via great-expectations
752744
testcontainers==3.7.0

‎sdk/python/requirements/py3.8-requirements.txt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#
55
# pip-compile --output-file=sdk/python/requirements/py3.8-requirements.txt
66
#
7-
absl-py==1.2.0
8-
# via tensorflow-metadata
97
anyio==3.6.1
108
# via
119
# starlette
@@ -56,12 +54,11 @@ googleapis-common-protos==1.56.4
5654
# via
5755
# feast (setup.py)
5856
# google-api-core
59-
# tensorflow-metadata
6057
grpcio==1.49.1
6158
# via
6259
# feast (setup.py)
6360
# grpcio-reflection
64-
grpcio-reflection==1.48.2
61+
grpcio-reflection==1.49.1
6562
# via feast (setup.py)
6663
h11==0.14.0
6764
# via uvicorn
@@ -109,14 +106,13 @@ pkgutil-resolve-name==1.3.10
109106
# via jsonschema
110107
proto-plus==1.22.1
111108
# via feast (setup.py)
112-
protobuf==3.20.3
109+
protobuf==4.21.7
113110
# via
114111
# feast (setup.py)
115112
# google-api-core
116113
# googleapis-common-protos
117114
# grpcio-reflection
118115
# proto-plus
119-
# tensorflow-metadata
120116
pyarrow==8.0.0
121117
# via feast (setup.py)
122118
pyasn1==0.4.8
@@ -168,8 +164,6 @@ tabulate==0.8.10
168164
# via feast (setup.py)
169165
tenacity==8.1.0
170166
# via feast (setup.py)
171-
tensorflow-metadata==1.10.0
172-
# via feast (setup.py)
173167
toml==0.10.2
174168
# via feast (setup.py)
175169
tomli==2.0.1

‎sdk/python/requirements/py3.9-ci-requirements.txt‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#
55
# pip-compile --extra=ci --output-file=sdk/python/requirements/py3.9-ci-requirements.txt
66
#
7-
absl-py==1.2.0
8-
# via tensorflow-metadata
97
adal==1.2.7
108
# via
119
# azure-datalake-store
@@ -281,7 +279,6 @@ googleapis-common-protos[grpc]==1.56.4
281279
# google-api-core
282280
# grpc-google-iam-v1
283281
# grpcio-status
284-
# tensorflow-metadata
285282
great-expectations==0.14.13
286283
# via feast (setup.py)
287284
grpc-google-iam-v1==0.12.4
@@ -297,15 +294,13 @@ grpcio==1.49.1
297294
# grpcio-status
298295
# grpcio-testing
299296
# grpcio-tools
300-
grpcio-reflection==1.48.2
297+
grpcio-reflection==1.49.1
301298
# via feast (setup.py)
302-
grpcio-status==1.48.2
303-
# via
304-
# feast (setup.py)
305-
# google-api-core
306-
grpcio-testing==1.48.2
299+
grpcio-status==1.49.1
300+
# via google-api-core
301+
grpcio-testing==1.49.1
307302
# via feast (setup.py)
308-
grpcio-tools==1.48.2
303+
grpcio-tools==1.49.1
309304
# via feast (setup.py)
310305
h11==0.14.0
311306
# via uvicorn
@@ -499,7 +494,7 @@ proto-plus==1.22.1
499494
# google-cloud-bigtable
500495
# google-cloud-datastore
501496
# google-cloud-firestore
502-
protobuf==3.20.3
497+
protobuf==4.21.7
503498
# via
504499
# feast (setup.py)
505500
# google-api-core
@@ -515,7 +510,6 @@ protobuf==3.20.3
515510
# grpcio-tools
516511
# mypy-protobuf
517512
# proto-plus
518-
# tensorflow-metadata
519513
psutil==5.9.0
520514
# via feast (setup.py)
521515
psycopg2-binary==2.9.3
@@ -737,8 +731,6 @@ tabulate==0.8.10
737731
# via feast (setup.py)
738732
tenacity==8.1.0
739733
# via feast (setup.py)
740-
tensorflow-metadata==1.10.0
741-
# via feast (setup.py)
742734
termcolor==2.0.1
743735
# via great-expectations
744736
testcontainers==3.7.0

‎sdk/python/requirements/py3.9-requirements.txt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#
55
# pip-compile --output-file=sdk/python/requirements/py3.9-requirements.txt
66
#
7-
absl-py==1.2.0
8-
# via tensorflow-metadata
97
anyio==3.6.1
108
# via
119
# starlette
@@ -56,12 +54,11 @@ googleapis-common-protos==1.56.4
5654
# via
5755
# feast (setup.py)
5856
# google-api-core
59-
# tensorflow-metadata
6057
grpcio==1.49.1
6158
# via
6259
# feast (setup.py)
6360
# grpcio-reflection
64-
grpcio-reflection==1.48.2
61+
grpcio-reflection==1.49.1
6562
# via feast (setup.py)
6663
h11==0.14.0
6764
# via uvicorn
@@ -105,14 +102,13 @@ partd==1.3.0
105102
# via dask
106103
proto-plus==1.22.1
107104
# via feast (setup.py)
108-
protobuf==3.20.3
105+
protobuf==4.21.7
109106
# via
110107
# feast (setup.py)
111108
# google-api-core
112109
# googleapis-common-protos
113110
# grpcio-reflection
114111
# proto-plus
115-
# tensorflow-metadata
116112
pyarrow==8.0.0
117113
# via feast (setup.py)
118114
pyasn1==0.4.8
@@ -164,8 +160,6 @@ tabulate==0.8.10
164160
# via feast (setup.py)
165161
tenacity==8.1.0
166162
# via feast (setup.py)
167-
tensorflow-metadata==1.10.0
168-
# via feast (setup.py)
169163
toml==0.10.2
170164
# via feast (setup.py)
171165
tomli==2.0.1

‎setup.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"google-api-core>=1.23.0,<3",
5454
"googleapis-common-protos>=1.52.*,<2",
5555
"grpcio>=1.47.0,<2",
56-
"grpcio-reflection>=1.47.0,<1.49",
56+
"grpcio-reflection>=1.47.0,<2",
5757
"Jinja2>=2,<4",
5858
"jsonschema",
5959
"mmh3",
@@ -74,7 +74,6 @@
7474
"typeguard",
7575
"fastapi>=0.68.0,<1",
7676
"uvicorn[standard]>=0.14.0,<1",
77-
"tensorflow-metadata>=1.0.0,<2.0.0",
7877
"dask>=2021.*,<2022.02.0",
7978
"bowler", # Needed for automatic repo upgrades
8079
]
@@ -85,7 +84,6 @@
8584
"google-cloud-datastore>=2.1.*,<3",
8685
"google-cloud-storage>=1.34.*,<3",
8786
"google-cloud-bigtable>=2.11.*,<3",
88-
"grpcio-status<1.49",
8987
]
9088

9189
REDIS_REQUIRED = [
@@ -148,8 +146,8 @@
148146
"flake8",
149147
"black>=22.6.0,<23",
150148
"isort>=5,<6",
151-
"grpcio-tools>=1.47.0,<1.49",
152-
"grpcio-testing>=1.47.0,<1.49",
149+
"grpcio-tools>=1.47.0",
150+
"grpcio-testing>=1.47.0",
153151
"minio==7.1.0",
154152
"mock==2.0.0",
155153
"moto<4",

0 commit comments

Comments
 (0)