Visitar URL original
resolving the merge conflict · feast-dev/feast@523bdfb · GitHub
Skip to content

Commit 523bdfb

Browse files
patelchaitanypatelchaitany
committed
resolving the merge conflict
Signed-off-by: Chaitany patel <patelchaitany93@gmail.com>
1 parent 9fc01a8 commit 523bdfb

16 files changed

Lines changed: 2893 additions & 9840 deletions

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

Lines changed: 390 additions & 371 deletions
Large diffs are not rendered by default.

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

Lines changed: 220 additions & 215 deletions
Large diffs are not rendered by default.

‎sdk/python/requirements/py3.10-minimal-sdist-requirements-build.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,6 @@ poetry-core==2.3.1 \
653653
# dunamai
654654
# pkgconfig
655655
# rich
656-
# rsa
657656
# tomlkit
658657
pybind11-global==3.0.2 \
659658
--hash=sha256:00a26be4cd65974133eaae7e7532e7141ccb7a88cd131995bc8d1f652852aaf9 \
@@ -919,6 +918,7 @@ setuptools==80.10.2 \
919918
# types-pymysql
920919
# types-setuptools
921920
# tzdata
921+
# ujson
922922
# uvloop
923923
# versioneer
924924
# websockets
@@ -935,4 +935,3 @@ setuptools==82.0.1 \
935935
# via
936936
# python-dateutil
937937
# setuptools-scm
938-
# ujson

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

Lines changed: 220 additions & 215 deletions
Large diffs are not rendered by default.

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

Lines changed: 134 additions & 117 deletions
Large diffs are not rendered by default.

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

Lines changed: 392 additions & 372 deletions
Large diffs are not rendered by default.

‎sdk/python/requirements/py3.11-minimal-requirements.txt‎

Lines changed: 219 additions & 215 deletions
Large diffs are not rendered by default.

‎sdk/python/requirements/py3.11-minimal-sdist-requirements-build.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,6 @@ poetry-core==2.3.1 \
665665
# dunamai
666666
# pkgconfig
667667
# rich
668-
# rsa
669668
# tomlkit
670669
pybind11-global==3.0.2 \
671670
--hash=sha256:00a26be4cd65974133eaae7e7532e7141ccb7a88cd131995bc8d1f652852aaf9 \
@@ -909,6 +908,7 @@ setuptools==80.10.2 \
909908
# types-pymysql
910909
# types-setuptools
911910
# tzdata
911+
# ujson
912912
# uvloop
913913
# versioneer
914914
# websockets
@@ -925,4 +925,3 @@ setuptools==82.0.1 \
925925
# via
926926
# python-dateutil
927927
# setuptools-scm
928-
# ujson

‎sdk/python/requirements/py3.11-minimal-sdist-requirements.txt‎

Lines changed: 219 additions & 215 deletions
Large diffs are not rendered by default.

‎sdk/python/requirements/py3.11-mongodb-dev-requirements.txt‎

Lines changed: 0 additions & 7078 deletions
This file was deleted.

0 commit comments

Comments
 (0)