Skip to content

Commit e7083f7

Browse files
authored
Merge pull request #576 from FederatedAI/dev-2.2.0
Merge v2.2.0's Updates Into Main Branch
2 parents 689345f + 2017042 commit e7083f7

7 files changed

+48
-39
lines changed

RELEASE.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## Release 2.2.0
2+
### Major Features and Improvements
3+
* Upgrade from Python 3.8 to Python 3.10
4+
15
## Release 2.1.0
26
### Major Features and Improvements
37
Improved the display issue of output data.

python/fate_flow/_info.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
15-
__version__ = "2.1.0"
15+
__version__ = "2.2.0"
1616
__provider__ = "fate_flow"

python/requirements-eggroll.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
opentelemetry-api
22
opentelemetry-sdk
33
protobuf==4.24.4
4-
grpcio==1.59.3
5-
grpcio-tools==1.59.3
4+
grpcio==1.62.1
5+
grpcio-tools==1.62.1
66
cloudpickle==2.1.0
77
psutil>=5.7.0
8-
pynvml==11.5.0
8+
pynvml==11.5.0

python/requirements-fate.txt

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1-
lmdb==1.3.0
2-
torch==1.13.1
1+
--extra-index-url https://download.pytorch.org/whl/cpu
2+
3+
lmdb==1.4.1
4+
torch==2.3.1+cpu
35
fate_utils
46
pydantic==1.10.12
57
cloudpickle==2.1.0
68
click
79
ruamel-yaml==0.16
8-
numpy
9-
pandas==2.0.3
10+
numpy<2.0.0
11+
pandas
1012
transformers==4.37.2
1113
accelerate==0.27.2
1214
beautifultable
1315
requests<2.26.0
14-
scikit-learn
16+
scikit-learn==1.4.1.post1
1517
omegaconf
16-
rich
18+
rich==13.7.1
1719
opentelemetry-api
1820
opentelemetry-sdk
1921
opentelemetry-exporter-otlp-proto-grpc
2022
mmh3==3.0.0
2123
protobuf==4.24.4
22-
grpcio==1.59.3
23-
safetensors==0.4.1
24+
grpcio==1.62.1
25+
safetensors==0.4.1
26+
scipy

python/requirements-flow.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
pip>=21
2-
apsw<=3.10
2+
apsw>=3.10
33
Flask==2.2.5
4-
grpcio==1.59.3
5-
grpcio-tools==1.59.3
4+
grpcio==1.62.1
5+
grpcio-tools==1.62.1
66
requests<2.26.0
77
urllib3==1.26.18
88
ruamel-yaml==0.16
99
cachetools==3.0.0
1010
filelock==3.3.1
1111
pydantic==1.10.12
1212
webargs
13-
peewee==3.9.3
13+
peewee==3.17.1
1414
python-dotenv==0.13.0
15-
pyyaml==5.4.1
15+
pyyaml
1616
networkx
1717
psutil>=5.7.0
1818
casbin_peewee_adapter
1919
casbin
2020
pymysql
2121
kazoo
2222
shortuuid
23-
cos-python-sdk-v5==1.9.10
24-
typing-extensions==4.5.0
23+
cos-python-sdk-v5==1.9.27
24+
typing-extensions==4.8.0
2525
boto3
26-
pyarrow==14.0.1
26+
pyarrow==15.0.1

python/requirements-pulsar.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pulsar-client==2.10.2
1+
pulsar-client==3.4.0

python/setup.py

+20-18
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,44 @@
66

77
packages = find_packages(".")
88
install_requires = [
9-
"apsw",
9+
"apsw>=3.10",
1010
"Flask==2.2.5",
11-
"grpcio==1.59.3",
12-
"grpcio-tools==1.59.3",
13-
"requests",
14-
"urllib3",
15-
"cachetools",
16-
"filelock",
11+
"grpcio==1.62.1",
12+
"grpcio-tools==1.62.1",
13+
"requests<2.26.0",
14+
"urllib3==1.26.18",
15+
"cachetools==3.0.0",
16+
"filelock==3.3.1",
1717
"pydantic==1.10.12",
1818
"webargs",
19-
"peewee",
20-
"python-dotenv",
19+
"peewee==3.17.1",
20+
"python-dotenv==0.13.0",
2121
"pyyaml",
2222
"networkx",
23-
"psutil",
23+
"psutil>=5.7.0",
2424
"casbin_peewee_adapter",
2525
"casbin",
2626
"pymysql",
2727
"kazoo",
2828
"shortuuid",
29-
"cos-python-sdk-v5",
30-
"typing-extensions",
29+
"cos-python-sdk-v5==1.9.27",
30+
"typing-extensions==4.8.0",
3131
"ruamel.yaml==0.16",
3232
"boto3"
3333
]
3434
extras_require = {
3535
"rabbitmq": ["pika==1.2.1"],
36-
"pulsar": ["pulsar-client==2.10.2"],
36+
"pulsar": ["pulsar-client==3.4.0"],
3737
"spark": ["pyspark"],
3838
"eggroll": [
39-
"cloudpickle",
39+
"cloudpickle==2.1.0",
4040
"lmdb",
41-
"protobuf",
42-
"grpcio",
43-
"grpcio-tools",
44-
"protobuf",
41+
"protobuf==4.24.4",
42+
"grpcio==1.62.1",
43+
"grpcio-tools==1.62.1",
44+
"protobuf==4.24.4",
45+
"psutil>=5.7.0",
46+
"pynvml==11.5.0"
4547
],
4648
"fate_flow": ["fate_flow[rabbitmq,pulsar,spark,eggroll]"],
4749
}

0 commit comments

Comments
 (0)