From 820a53585c785098b0c3a267afa5734221a2457c Mon Sep 17 00:00:00 2001 From: robbie228 Date: Tue, 16 Jul 2024 17:37:58 +0800 Subject: [PATCH 1/8] update req & setup.py Signed-off-by: robbie228 --- python/requirements-eggroll.txt | 6 +++--- python/requirements-flow.txt | 16 ++++++++-------- python/requirements-pulsar.txt | 2 +- python/setup.py | 24 ++++++++++++------------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/python/requirements-eggroll.txt b/python/requirements-eggroll.txt index 63d09f2c9..0eeaf1412 100644 --- a/python/requirements-eggroll.txt +++ b/python/requirements-eggroll.txt @@ -1,8 +1,8 @@ opentelemetry-api opentelemetry-sdk protobuf==4.24.4 -grpcio==1.59.3 -grpcio-tools==1.59.3 +grpcio==1.62.1 +grpcio-tools==1.62.1 cloudpickle==2.1.0 psutil>=5.7.0 -pynvml==11.5.0 \ No newline at end of file +pynvml==11.5.0 diff --git a/python/requirements-flow.txt b/python/requirements-flow.txt index 62c704cb5..c8dfefe6b 100644 --- a/python/requirements-flow.txt +++ b/python/requirements-flow.txt @@ -1,8 +1,8 @@ pip>=21 -apsw<=3.10 +apsw>=3.10 Flask==2.2.5 -grpcio==1.59.3 -grpcio-tools==1.59.3 +grpcio==1.62.1 +grpcio-tools==1.62.1 requests<2.26.0 urllib3==1.26.18 ruamel-yaml==0.16 @@ -10,9 +10,9 @@ cachetools==3.0.0 filelock==3.3.1 pydantic==1.10.12 webargs -peewee==3.9.3 +peewee==3.17.1 python-dotenv==0.13.0 -pyyaml==5.4.1 +pyyaml networkx psutil>=5.7.0 casbin_peewee_adapter @@ -20,7 +20,7 @@ casbin pymysql kazoo shortuuid -cos-python-sdk-v5==1.9.10 -typing-extensions==4.5.0 +cos-python-sdk-v5==1.9.27 +typing-extensions==4.8.0 boto3 -pyarrow==14.0.1 +pyarrow==15.0.1 diff --git a/python/requirements-pulsar.txt b/python/requirements-pulsar.txt index 03726430b..f51aaa905 100644 --- a/python/requirements-pulsar.txt +++ b/python/requirements-pulsar.txt @@ -1 +1 @@ -pulsar-client==2.10.2 \ No newline at end of file +pulsar-client==3.4.0 diff --git a/python/setup.py b/python/setup.py index c6f6ee93a..079d57cf4 100644 --- a/python/setup.py +++ b/python/setup.py @@ -6,28 +6,28 @@ packages = find_packages(".") install_requires = [ - "apsw", + "apsw>=3.10", "Flask==2.2.5", - "grpcio==1.59.3", - "grpcio-tools==1.59.3", - "requests", - "urllib3", - "cachetools", - "filelock", + "grpcio==1.62.1", + "grpcio-tools==1.62.1", + "requests<2.26.0", + "urllib3==1.26.18", + "cachetools==3.0.0", + "filelock==3.3.1", "pydantic==1.10.12", "webargs", - "peewee", - "python-dotenv", + "peewee==3.17.1", + "python-dotenv==0.13.0", "pyyaml", "networkx", - "psutil", + "psutil>=5.7.0", "casbin_peewee_adapter", "casbin", "pymysql", "kazoo", "shortuuid", - "cos-python-sdk-v5", - "typing-extensions", + "cos-python-sdk-v5==1.9.27", + "typing-extensions==4.8.0", "ruamel.yaml==0.16", "boto3" ] From 1a3b4e83c9b48f4bd9e7c485c179ad9058ffd131 Mon Sep 17 00:00:00 2001 From: robbie228 Date: Tue, 16 Jul 2024 17:41:49 +0800 Subject: [PATCH 2/8] update req & setup.py Signed-off-by: robbie228 --- python/requirements-fate.txt | 15 +++++++++------ python/setup.py | 14 ++++++++------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/python/requirements-fate.txt b/python/requirements-fate.txt index fd164d99a..f2e6914b6 100644 --- a/python/requirements-fate.txt +++ b/python/requirements-fate.txt @@ -1,23 +1,26 @@ -lmdb==1.3.0 -torch==1.13.1 +--extra-index-url https://download.pytorch.org/whl/cpu + +lmdb==1.4.1 +torch==2.3.1+cpu fate_utils pydantic==1.10.12 cloudpickle==2.1.0 click ruamel-yaml==0.16 -numpy +numpy==1.26.4 pandas==2.0.3 transformers==4.37.2 accelerate==0.27.2 beautifultable requests<2.26.0 -scikit-learn +scikit-learn==1.4.1.post1 omegaconf -rich +rich==13.7.1 opentelemetry-api opentelemetry-sdk opentelemetry-exporter-otlp-proto-grpc mmh3==3.0.0 protobuf==4.24.4 grpcio==1.59.3 -safetensors==0.4.1 \ No newline at end of file +safetensors==0.4.1 +scipy diff --git a/python/setup.py b/python/setup.py index 079d57cf4..c9f84390c 100644 --- a/python/setup.py +++ b/python/setup.py @@ -33,15 +33,17 @@ ] extras_require = { "rabbitmq": ["pika==1.2.1"], - "pulsar": ["pulsar-client==2.10.2"], + "pulsar": ["pulsar-client==3.4.0"], "spark": ["pyspark"], "eggroll": [ - "cloudpickle", + "cloudpickle==2.1.0", "lmdb", - "protobuf", - "grpcio", - "grpcio-tools", - "protobuf", + "protobuf==4.24.4", + "grpcio==1.62.1", + "grpcio-tools==1.62.1", + "protobuf==4.24.4", + "psutil>=5.7.0", + "pynvml==11.5.0" ], "fate_flow": ["fate_flow[rabbitmq,pulsar,spark,eggroll]"], } From b65dcb6ef2a012895d86f869a2fd672a1aa49cfa Mon Sep 17 00:00:00 2001 From: robbie228 Date: Tue, 16 Jul 2024 18:24:10 +0800 Subject: [PATCH 3/8] update req & setup.py Signed-off-by: robbie228 --- python/setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/python/setup.py b/python/setup.py index c9f84390c..e995e9ee9 100644 --- a/python/setup.py +++ b/python/setup.py @@ -42,8 +42,6 @@ "grpcio==1.62.1", "grpcio-tools==1.62.1", "protobuf==4.24.4", - "psutil>=5.7.0", - "pynvml==11.5.0" ], "fate_flow": ["fate_flow[rabbitmq,pulsar,spark,eggroll]"], } From fdf9feea55db25ede842c27b72db299e30fc2618 Mon Sep 17 00:00:00 2001 From: robbie228 Date: Tue, 16 Jul 2024 18:31:22 +0800 Subject: [PATCH 4/8] update req & setup.py Signed-off-by: robbie228 --- python/setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/setup.py b/python/setup.py index e995e9ee9..c9f84390c 100644 --- a/python/setup.py +++ b/python/setup.py @@ -42,6 +42,8 @@ "grpcio==1.62.1", "grpcio-tools==1.62.1", "protobuf==4.24.4", + "psutil>=5.7.0", + "pynvml==11.5.0" ], "fate_flow": ["fate_flow[rabbitmq,pulsar,spark,eggroll]"], } From 403908bbe3ce11de30aaf70ab9a735b70b7070bd Mon Sep 17 00:00:00 2001 From: robbie228 Date: Wed, 17 Jul 2024 14:44:06 +0800 Subject: [PATCH 5/8] update req-fate Signed-off-by: robbie228 --- python/requirements-fate.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/requirements-fate.txt b/python/requirements-fate.txt index f2e6914b6..2f859340c 100644 --- a/python/requirements-fate.txt +++ b/python/requirements-fate.txt @@ -21,6 +21,6 @@ opentelemetry-sdk opentelemetry-exporter-otlp-proto-grpc mmh3==3.0.0 protobuf==4.24.4 -grpcio==1.59.3 +grpcio==1.62.1 safetensors==0.4.1 scipy From 836d032634deebdcdbaf567f5f7f0bc6e695dae6 Mon Sep 17 00:00:00 2001 From: mgqa34 Date: Mon, 29 Jul 2024 14:07:34 +0800 Subject: [PATCH 6/8] update version of pandas and numpy Signed-off-by: mgqa34 --- python/requirements-fate.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/requirements-fate.txt b/python/requirements-fate.txt index 2f859340c..b74d7f423 100644 --- a/python/requirements-fate.txt +++ b/python/requirements-fate.txt @@ -7,8 +7,8 @@ pydantic==1.10.12 cloudpickle==2.1.0 click ruamel-yaml==0.16 -numpy==1.26.4 -pandas==2.0.3 +numpy<2.0.0 +pandas==2.2.2 transformers==4.37.2 accelerate==0.27.2 beautifultable From 256b48735fee8757766491a055fedad8519c396c Mon Sep 17 00:00:00 2001 From: mgqa34 Date: Mon, 29 Jul 2024 17:42:52 +0800 Subject: [PATCH 7/8] update release note Signed-off-by: mgqa34 --- RELEASE.md | 4 ++++ python/requirements-fate.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 69484e7bb..6081f74cb 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,7 @@ +## Release 2.2.0 +### Major Features and Improvements +* Upgrade from Python 3.8 to Python 3.10 + ## Release 2.1.0 ### Major Features and Improvements Improved the display issue of output data. diff --git a/python/requirements-fate.txt b/python/requirements-fate.txt index b74d7f423..484e372a9 100644 --- a/python/requirements-fate.txt +++ b/python/requirements-fate.txt @@ -8,7 +8,7 @@ cloudpickle==2.1.0 click ruamel-yaml==0.16 numpy<2.0.0 -pandas==2.2.2 +pandas transformers==4.37.2 accelerate==0.27.2 beautifultable From 4a57b7cf81f7ce17e020c732db458b5727a0050e Mon Sep 17 00:00:00 2001 From: mgqa34 Date: Mon, 29 Jul 2024 20:02:19 +0800 Subject: [PATCH 8/8] update version of fate_flow Signed-off-by: mgqa34 --- python/fate_flow/_info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/fate_flow/_info.py b/python/fate_flow/_info.py index 4093fdb3f..faa0c5afd 100644 --- a/python/fate_flow/_info.py +++ b/python/fate_flow/_info.py @@ -12,5 +12,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "2.1.0" +__version__ = "2.2.0" __provider__ = "fate_flow"