Skip to content

Commit 2c4a347

Browse files
tokokotokoko
authored
chore: Drop dependency on non-standard importlib libraries (feast-dev#4109)
drop dependency on non-standard importlib libraries Signed-off-by: tokoko <togurg14@freeuni.edu.ge>
1 parent 2ba71ff commit 2c4a347

File tree

10 files changed

+92
-119
lines changed

10 files changed

+92
-119
lines changed

‎sdk/python/feast/__init__.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
try:
2-
from importlib.metadata import PackageNotFoundError
3-
from importlib.metadata import version as _version
4-
except ModuleNotFoundError:
5-
from importlib_metadata import PackageNotFoundError # type: ignore
6-
from importlib_metadata import version as _version
1+
from importlib.metadata import PackageNotFoundError
2+
from importlib.metadata import version as _version
73

84
from feast.infra.offline_stores.bigquery_source import BigQuerySource
95
from feast.infra.offline_stores.contrib.athena_offline_store.athena_source import (

‎sdk/python/feast/cli.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
import json
1515
import logging
1616
from datetime import datetime
17+
from importlib.metadata import version as importlib_version
1718
from pathlib import Path
1819
from typing import List, Optional
1920

2021
import click
2122
import yaml
2223
from colorama import Fore, Style
2324
from dateutil import parser
24-
from importlib_metadata import version as importlib_version
2525
from pygments import formatters, highlight, lexers
2626

2727
from feast import utils

‎sdk/python/feast/proto_json.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import uuid
2+
from importlib.metadata import version as importlib_version
23
from typing import Any, Callable, Type
34

45
from google.protobuf.json_format import ( # type: ignore
@@ -7,7 +8,6 @@
78
_Parser,
89
_Printer,
910
)
10-
from importlib_metadata import version as importlib_version
1111
from packaging import version
1212

1313
from feast.protos.feast.serving.ServingService_pb2 import FeatureList

‎sdk/python/feast/ui_server.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import json
22
import threading
3+
from importlib import resources as importlib_resources
34
from typing import Callable, Optional
45

5-
import importlib_resources
66
import uvicorn
77
from fastapi import FastAPI, Response
88
from fastapi.middleware.cors import CORSMiddleware

‎sdk/python/feast/version.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
try:
2-
from importlib.metadata import PackageNotFoundError, version
3-
except ModuleNotFoundError:
4-
from importlib_metadata import PackageNotFoundError, version # type: ignore
1+
from importlib.metadata import PackageNotFoundError, version
52

63

74
def get_version():

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

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ azure-core==1.30.1
4545
# via
4646
# azure-identity
4747
# azure-storage-blob
48-
azure-identity==1.15.0
48+
azure-identity==1.16.0
4949
# via feast (setup.py)
5050
azure-storage-blob==12.19.1
5151
# via feast (setup.py)
@@ -59,11 +59,11 @@ bidict==0.23.1
5959
# via ibis-framework
6060
bleach==6.1.0
6161
# via nbconvert
62-
boto3==1.34.80
62+
boto3==1.34.85
6363
# via
6464
# feast (setup.py)
6565
# moto
66-
botocore==1.34.80
66+
botocore==1.34.85
6767
# via
6868
# boto3
6969
# moto
@@ -138,7 +138,7 @@ dask[array,dataframe]==2024.4.1
138138
# via
139139
# dask-expr
140140
# feast (setup.py)
141-
dask-expr==1.0.10
141+
dask-expr==1.0.11
142142
# via dask
143143
db-dtypes==1.2.0
144144
# via google-cloud-bigquery
@@ -148,12 +148,8 @@ decorator==5.1.1
148148
# via ipython
149149
defusedxml==0.7.1
150150
# via nbconvert
151-
deprecation==2.1.0
152-
# via testcontainers
153151
dill==0.3.8
154-
# via
155-
# feast (setup.py)
156-
# multiprocess
152+
# via feast (setup.py)
157153
distlib==0.3.8
158154
# via virtualenv
159155
docker==7.0.0
@@ -166,7 +162,7 @@ duckdb==0.10.1
166162
# via
167163
# duckdb-engine
168164
# ibis-framework
169-
duckdb-engine==0.11.4
165+
duckdb-engine==0.11.5
170166
# via ibis-framework
171167
entrypoints==0.4
172168
# via altair
@@ -183,7 +179,7 @@ fastapi==0.110.1
183179
# via feast (setup.py)
184180
fastjsonschema==2.19.1
185181
# via nbformat
186-
filelock==3.13.3
182+
filelock==3.13.4
187183
# via
188184
# snowflake-connector-python
189185
# virtualenv
@@ -213,7 +209,7 @@ google-api-core[grpc]==2.18.0
213209
# google-cloud-datastore
214210
# google-cloud-firestore
215211
# google-cloud-storage
216-
google-api-python-client==2.125.0
212+
google-api-python-client==2.126.0
217213
# via firebase-admin
218214
google-auth==2.29.0
219215
# via
@@ -230,7 +226,7 @@ google-cloud-bigquery[pandas]==3.12.0
230226
# via feast (setup.py)
231227
google-cloud-bigquery-storage==2.24.0
232228
# via feast (setup.py)
233-
google-cloud-bigtable==2.23.0
229+
google-cloud-bigtable==2.23.1
234230
# via feast (setup.py)
235231
google-cloud-core==2.4.1
236232
# via
@@ -330,12 +326,8 @@ idna==3.7
330326
# snowflake-connector-python
331327
imagesize==1.4.1
332328
# via sphinx
333-
importlib-metadata==6.11.0
334-
# via
335-
# dask
336-
# feast (setup.py)
337-
importlib-resources==6.4.0
338-
# via feast (setup.py)
329+
importlib-metadata==7.1.0
330+
# via dask
339331
iniconfig==2.0.0
340332
# via pytest
341333
ipykernel==6.29.4
@@ -368,7 +360,7 @@ jmespath==1.0.1
368360
# via
369361
# boto3
370362
# botocore
371-
json5==0.9.24
363+
json5==0.9.25
372364
# via jupyterlab-server
373365
jsonpatch==1.33
374366
# via great-expectations
@@ -402,9 +394,9 @@ jupyter-core==5.7.2
402394
# nbformat
403395
jupyter-events==0.10.0
404396
# via jupyter-server
405-
jupyter-lsp==2.2.4
397+
jupyter-lsp==2.2.5
406398
# via jupyterlab
407-
jupyter-server==2.13.0
399+
jupyter-server==2.14.0
408400
# via
409401
# jupyter-lsp
410402
# jupyterlab
@@ -438,7 +430,7 @@ markupsafe==2.1.5
438430
# werkzeug
439431
marshmallow==3.21.1
440432
# via great-expectations
441-
matplotlib-inline==0.1.6
433+
matplotlib-inline==0.1.7
442434
# via
443435
# ipykernel
444436
# ipython
@@ -511,12 +503,11 @@ oauthlib==3.2.2
511503
# via requests-oauthlib
512504
overrides==7.7.0
513505
# via jupyter-server
514-
packaging==21.3
506+
packaging==24.0
515507
# via
516508
# build
517509
# dask
518510
# db-dtypes
519-
# deprecation
520511
# docker
521512
# duckdb-engine
522513
# google-cloud-bigquery
@@ -533,7 +524,7 @@ packaging==21.3
533524
# pytest
534525
# snowflake-connector-python
535526
# sphinx
536-
pandas==2.2.1
527+
pandas==2.2.2
537528
# via
538529
# altair
539530
# dask
@@ -640,12 +631,12 @@ pybindgen==0.22.1
640631
# via feast (setup.py)
641632
pycparser==2.22
642633
# via cffi
643-
pydantic==2.6.4
634+
pydantic==2.7.0
644635
# via
645636
# fastapi
646637
# feast (setup.py)
647638
# great-expectations
648-
pydantic-core==2.16.3
639+
pydantic-core==2.18.1
649640
# via pydantic
650641
pygments==2.17.2
651642
# via
@@ -670,7 +661,6 @@ pyparsing==3.1.2
670661
# via
671662
# great-expectations
672663
# httplib2
673-
# packaging
674664
pyproject-hooks==1.0.0
675665
# via
676666
# build
@@ -738,7 +728,7 @@ pyyaml==6.0.1
738728
# pre-commit
739729
# responses
740730
# uvicorn
741-
pyzmq==25.1.2
731+
pyzmq==26.0.0
742732
# via
743733
# ipykernel
744734
# jupyter-client
@@ -750,7 +740,7 @@ referencing==0.34.0
750740
# jsonschema
751741
# jsonschema-specifications
752742
# jupyter-events
753-
regex==2023.12.25
743+
regex==2024.4.16
754744
# via feast (setup.py)
755745
requests==2.31.0
756746
# via
@@ -795,7 +785,7 @@ rsa==4.9
795785
# via google-auth
796786
ruamel-yaml==0.17.17
797787
# via great-expectations
798-
ruff==0.3.5
788+
ruff==0.3.7
799789
# via feast (setup.py)
800790
s3transfer==0.10.1
801791
# via boto3
@@ -822,7 +812,7 @@ sniffio==1.3.1
822812
# httpx
823813
snowballstemmer==2.2.0
824814
# via sphinx
825-
snowflake-connector-python[pandas]==3.7.1
815+
snowflake-connector-python[pandas]==3.8.1
826816
# via feast (setup.py)
827817
sortedcontainers==2.4.0
828818
# via snowflake-connector-python
@@ -857,7 +847,7 @@ stack-data==0.6.3
857847
# via ipython
858848
starlette==0.37.2
859849
# via fastapi
860-
substrait==0.15.0
850+
substrait==0.16.0
861851
# via ibis-substrait
862852
tabulate==0.9.0
863853
# via feast (setup.py)
@@ -867,7 +857,7 @@ terminado==0.18.1
867857
# via
868858
# jupyter-server
869859
# jupyter-server-terminals
870-
testcontainers==3.7.1
860+
testcontainers==4.3.3
871861
# via feast (setup.py)
872862
thriftpy2==0.4.20
873863
# via happybase
@@ -924,28 +914,32 @@ trino==0.328.0
924914
# via feast (setup.py)
925915
typeguard==4.2.1
926916
# via feast (setup.py)
917+
types-cffi==1.16.0.20240331
918+
# via types-pyopenssl
927919
types-protobuf==3.19.22
928920
# via
929921
# feast (setup.py)
930922
# mypy-protobuf
931923
types-pymysql==1.1.0.1
932924
# via feast (setup.py)
933-
types-pyopenssl==24.0.0.20240311
925+
types-pyopenssl==24.0.0.20240417
934926
# via types-redis
935927
types-python-dateutil==2.9.0.20240316
936928
# via
937929
# arrow
938930
# feast (setup.py)
939-
types-pytz==2024.1.0.20240203
931+
types-pytz==2024.1.0.20240417
940932
# via feast (setup.py)
941933
types-pyyaml==6.0.12.20240311
942934
# via feast (setup.py)
943-
types-redis==4.6.0.20240409
935+
types-redis==4.6.0.20240417
944936
# via feast (setup.py)
945937
types-requests==2.30.0.0
946938
# via feast (setup.py)
947-
types-setuptools==69.2.0.20240317
948-
# via feast (setup.py)
939+
types-setuptools==69.5.0.20240415
940+
# via
941+
# feast (setup.py)
942+
# types-cffi
949943
types-tabulate==0.9.0.20240106
950944
# via feast (setup.py)
951945
types-urllib3==1.26.25.14
@@ -965,6 +959,7 @@ typing-extensions==4.11.0
965959
# pydantic-core
966960
# snowflake-connector-python
967961
# sqlalchemy
962+
# testcontainers
968963
# typeguard
969964
# uvicorn
970965
tzdata==2024.1
@@ -988,6 +983,7 @@ urllib3==1.26.18
988983
# requests
989984
# responses
990985
# rockset
986+
# testcontainers
991987
uvicorn[standard]==0.29.0
992988
# via feast (setup.py)
993989
uvloop==0.19.0

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dask[array,dataframe]==2024.4.1
3838
# via
3939
# dask-expr
4040
# feast (setup.py)
41-
dask-expr==1.0.10
41+
dask-expr==1.0.11
4242
# via dask
4343
dill==0.3.8
4444
# via feast (setup.py)
@@ -62,12 +62,8 @@ idna==3.7
6262
# via
6363
# anyio
6464
# requests
65-
importlib-metadata==6.11.0
66-
# via
67-
# dask
68-
# feast (setup.py)
69-
importlib-resources==6.4.0
70-
# via feast (setup.py)
65+
importlib-metadata==7.1.0
66+
# via dask
7167
jinja2==3.1.3
7268
# via feast (setup.py)
7369
jsonschema==4.21.1
@@ -98,7 +94,7 @@ packaging==24.0
9894
# via
9995
# dask
10096
# gunicorn
101-
pandas==2.2.1
97+
pandas==2.2.2
10298
# via
10399
# dask
104100
# dask-expr
@@ -113,11 +109,11 @@ pyarrow==15.0.2
113109
# via
114110
# dask-expr
115111
# feast (setup.py)
116-
pydantic==2.6.4
112+
pydantic==2.7.0
117113
# via
118114
# fastapi
119115
# feast (setup.py)
120-
pydantic-core==2.16.3
116+
pydantic-core==2.18.1
121117
# via pydantic
122118
pygments==2.17.2
123119
# via feast (setup.py)
@@ -168,7 +164,7 @@ tqdm==4.66.2
168164
# via feast (setup.py)
169165
typeguard==4.2.1
170166
# via feast (setup.py)
171-
types-protobuf==4.24.0.20240408
167+
types-protobuf==4.25.0.20240417
172168
# via mypy-protobuf
173169
typing-extensions==4.11.0
174170
# via

0 commit comments

Comments
 (0)