Skip to content

Commit 2c85421

Browse files
adchiaadchia
committed
fix: Fix missing requests requirement after GCP requirement removed. Make BigQuerySource not require gcp extra
Signed-off-by: Danny Chiao <danny@tecton.ai>
1 parent 57ac1ab commit 2c85421

8 files changed

Lines changed: 179 additions & 152 deletions

File tree

‎sdk/python/feast/infra/offline_stores/bigquery_source.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818
from feast.usage import get_user_agent
1919
from feast.value_type import ValueType
2020

21-
try:
22-
from google.api_core import client_info as http_client_info
23-
except ImportError as e:
24-
from feast.errors import FeastExtrasDependencyImportError
25-
26-
raise FeastExtrasDependencyImportError("gcp", str(e))
27-
2821

2922
@typechecked
3023
class BigQuerySource(DataSource):
@@ -165,6 +158,12 @@ def source_datatype_to_feast_value_type() -> Callable[[str], ValueType]:
165158
def get_table_column_names_and_types(
166159
self, config: RepoConfig
167160
) -> Iterable[Tuple[str, str]]:
161+
try:
162+
from google.api_core import client_info as http_client_info
163+
except ImportError as e:
164+
from feast.errors import FeastExtrasDependencyImportError
165+
raise FeastExtrasDependencyImportError("gcp", str(e))
166+
168167
from google.cloud import bigquery
169168

170169
project_id = (

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

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ adlfs==0.5.9
1212
# via feast (setup.py)
1313
aiobotocore==2.1.2
1414
# via s3fs
15-
aiohttp==3.8.3
15+
aiohttp==3.8.4
1616
# via
1717
# adlfs
1818
# aiobotocore
@@ -55,7 +55,7 @@ attrs==22.2.0
5555
# pytest
5656
avro==1.10.0
5757
# via feast (setup.py)
58-
azure-core==1.26.2
58+
azure-core==1.26.3
5959
# via
6060
# adlfs
6161
# azure-identity
@@ -155,7 +155,7 @@ cryptography==35.0.0
155155
# snowflake-connector-python
156156
# types-pyopenssl
157157
# types-redis
158-
dask==2023.1.1
158+
dask==2023.2.0
159159
# via feast (setup.py)
160160
dataclasses==0.6
161161
# via great-expectations
@@ -190,7 +190,7 @@ execnet==1.9.0
190190
# via pytest-xdist
191191
executing==1.2.0
192192
# via stack-data
193-
fastapi==0.89.1
193+
fastapi==0.92.0
194194
# via feast (setup.py)
195195
fastavro==1.7.1
196196
# via
@@ -236,7 +236,7 @@ google-api-core[grpc]==2.11.0
236236
# google-cloud-datastore
237237
# google-cloud-firestore
238238
# google-cloud-storage
239-
google-api-python-client==2.74.0
239+
google-api-python-client==2.78.0
240240
# via firebase-admin
241241
google-auth==2.16.0
242242
# via
@@ -250,9 +250,9 @@ google-auth==2.16.0
250250
# kubernetes
251251
google-auth-httplib2==0.1.0
252252
# via google-api-python-client
253-
google-auth-oauthlib==0.8.0
253+
google-auth-oauthlib==1.0.0
254254
# via gcsfs
255-
google-cloud-bigquery[pandas]==3.4.2
255+
google-cloud-bigquery[pandas]==3.5.0
256256
# via feast (setup.py)
257257
google-cloud-bigquery-storage==2.18.1
258258
# via feast (setup.py)
@@ -317,7 +317,7 @@ h11==0.14.0
317317
# uvicorn
318318
happybase==1.2.0
319319
# via feast (setup.py)
320-
hiredis==2.1.1
320+
hiredis==2.2.2
321321
# via feast (setup.py)
322322
httpcore==0.16.3
323323
# via httpx
@@ -329,7 +329,7 @@ httptools==0.5.0
329329
# via uvicorn
330330
httpx==0.23.3
331331
# via feast (setup.py)
332-
identify==2.5.17
332+
identify==2.5.18
333333
# via pre-commit
334334
idna==3.4
335335
# via
@@ -389,7 +389,7 @@ mccabe==0.7.0
389389
# via flake8
390390
minio==7.1.0
391391
# via feast (setup.py)
392-
mistune==2.0.4
392+
mistune==2.0.5
393393
# via great-expectations
394394
mmh3==3.0.0
395395
# via feast (setup.py)
@@ -399,7 +399,7 @@ moreorless==0.4.0
399399
# via bowler
400400
moto==3.1.18
401401
# via feast (setup.py)
402-
msal==1.20.0
402+
msal==1.21.0
403403
# via
404404
# azure-identity
405405
# msal-extensions
@@ -423,7 +423,7 @@ mypy==0.982
423423
# via
424424
# feast (setup.py)
425425
# sqlalchemy
426-
mypy-extensions==0.4.3
426+
mypy-extensions==1.0.0
427427
# via
428428
# black
429429
# mypy
@@ -435,7 +435,7 @@ nbformat==5.7.3
435435
# via great-expectations
436436
nodeenv==1.7.0
437437
# via pre-commit
438-
numpy==1.24.1
438+
numpy==1.24.2
439439
# via
440440
# altair
441441
# db-dtypes
@@ -484,9 +484,9 @@ pexpect==4.8.0
484484
# via ipython
485485
pickleshare==0.7.5
486486
# via ipython
487-
pip-tools==6.12.1
487+
pip-tools==6.12.2
488488
# via feast (setup.py)
489-
platformdirs==2.6.2
489+
platformdirs==3.0.0
490490
# via
491491
# black
492492
# jupyter-core
@@ -497,7 +497,7 @@ ply==3.11
497497
# via thriftpy2
498498
portalocker==2.7.0
499499
# via msal-extensions
500-
pre-commit==3.0.2
500+
pre-commit==3.0.4
501501
# via feast (setup.py)
502502
prompt-toolkit==3.0.36
503503
# via ipython
@@ -509,7 +509,7 @@ proto-plus==1.22.2
509509
# google-cloud-bigtable
510510
# google-cloud-datastore
511511
# google-cloud-firestore
512-
protobuf==4.21.12
512+
protobuf==4.22.0
513513
# via
514514
# feast (setup.py)
515515
# google-api-core
@@ -560,7 +560,7 @@ pycparser==2.21
560560
# via cffi
561561
pycryptodomex==3.17
562562
# via snowflake-connector-python
563-
pydantic==1.10.4
563+
pydantic==1.10.5
564564
# via
565565
# fastapi
566566
# feast (setup.py)
@@ -594,7 +594,7 @@ pyproject-hooks==1.0.0
594594
# via build
595595
pyrsistent==0.19.3
596596
# via jsonschema
597-
pyspark==3.3.1
597+
pyspark==3.3.2
598598
# via feast (setup.py)
599599
pytest==7.2.1
600600
# via
@@ -618,7 +618,7 @@ pytest-ordering==0.6
618618
# via feast (setup.py)
619619
pytest-timeout==1.4.2
620620
# via feast (setup.py)
621-
pytest-xdist==3.1.0
621+
pytest-xdist==3.2.0
622622
# via feast (setup.py)
623623
python-dateutil==2.8.2
624624
# via
@@ -659,6 +659,7 @@ requests==2.28.2
659659
# azure-datalake-store
660660
# cachecontrol
661661
# docker
662+
# feast (setup.py)
662663
# gcsfs
663664
# google-api-core
664665
# google-cloud-bigquery
@@ -682,7 +683,7 @@ responses==0.22.0
682683
# via moto
683684
rfc3986[idna2008]==1.5.0
684685
# via httpx
685-
rockset==1.0.3
686+
rockset==1.0.5
686687
# via feast (setup.py)
687688
rsa==4.9
688689
# via google-auth
@@ -725,7 +726,7 @@ sphinxcontrib-applehelp==1.0.4
725726
# via sphinx
726727
sphinxcontrib-devhelp==1.0.2
727728
# via sphinx
728-
sphinxcontrib-htmlhelp==2.0.0
729+
sphinxcontrib-htmlhelp==2.0.1
729730
# via sphinx
730731
sphinxcontrib-jsmath==1.0.1
731732
# via sphinx
@@ -739,11 +740,11 @@ sqlalchemy2-stubs==0.0.2a32
739740
# via sqlalchemy
740741
stack-data==0.6.2
741742
# via ipython
742-
starlette==0.22.0
743+
starlette==0.25.0
743744
# via fastapi
744745
tabulate==0.9.0
745746
# via feast (setup.py)
746-
tenacity==8.1.0
747+
tenacity==8.2.1
747748
# via feast (setup.py)
748749
termcolor==2.2.0
749750
# via great-expectations
@@ -782,35 +783,35 @@ trino==0.321.0
782783
# via feast (setup.py)
783784
typeguard==2.13.3
784785
# via feast (setup.py)
785-
types-docutils==0.19.1.2
786+
types-docutils==0.19.1.4
786787
# via types-setuptools
787788
types-protobuf==3.19.22
788789
# via
789790
# feast (setup.py)
790791
# mypy-protobuf
791-
types-pymysql==1.0.19.2
792+
types-pymysql==1.0.19.3
792793
# via feast (setup.py)
793-
types-pyopenssl==23.0.0.2
794+
types-pyopenssl==23.0.0.3
794795
# via types-redis
795-
types-python-dateutil==2.8.19.6
796+
types-python-dateutil==2.8.19.7
796797
# via feast (setup.py)
797798
types-pytz==2022.7.1.0
798799
# via feast (setup.py)
799-
types-pyyaml==6.0.12.3
800+
types-pyyaml==6.0.12.6
800801
# via feast (setup.py)
801-
types-redis==4.4.0.4
802+
types-redis==4.5.1.1
802803
# via feast (setup.py)
803-
types-requests==2.28.11.8
804+
types-requests==2.28.11.13
804805
# via feast (setup.py)
805-
types-setuptools==65.7.0.3
806+
types-setuptools==67.3.0.1
806807
# via feast (setup.py)
807808
types-tabulate==0.9.0.0
808809
# via feast (setup.py)
809-
types-toml==0.10.8.1
810+
types-toml==0.10.8.4
810811
# via responses
811-
types-urllib3==1.26.25.4
812+
types-urllib3==1.26.25.6
812813
# via types-requests
813-
typing-extensions==4.4.0
814+
typing-extensions==4.5.0
814815
# via
815816
# azure-core
816817
# great-expectations
@@ -842,15 +843,15 @@ uvicorn[standard]==0.20.0
842843
# via feast (setup.py)
843844
uvloop==0.17.0
844845
# via uvicorn
845-
virtualenv==20.17.1
846+
virtualenv==20.19.0
846847
# via pre-commit
847848
volatile==2.1.0
848849
# via bowler
849850
watchfiles==0.18.1
850851
# via uvicorn
851852
wcwidth==0.2.6
852853
# via prompt-toolkit
853-
websocket-client==1.5.0
854+
websocket-client==1.5.1
854855
# via
855856
# docker
856857
# kubernetes
@@ -869,7 +870,7 @@ xmltodict==0.13.0
869870
# via moto
870871
yarl==1.8.2
871872
# via aiohttp
872-
zipp==3.12.0
873+
zipp==3.13.0
873874
# via importlib-metadata
874875

875876
# The following packages are considered to be unsafe in a requirements file:

0 commit comments

Comments
 (0)