Skip to content

Commit

Permalink
Merge pull request #576 from FederatedAI/dev-2.2.0
Browse files Browse the repository at this point in the history
Merge v2.2.0's Updates Into Main Branch
  • Loading branch information
zhihuiwan authored Jul 31, 2024
2 parents 689345f + 2017042 commit e7083f7
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 39 deletions.
4 changes: 4 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion python/fate_flow/_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions python/requirements-eggroll.txt
Original file line number Diff line number Diff line change
@@ -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
pynvml==11.5.0
19 changes: 11 additions & 8 deletions python/requirements-fate.txt
Original file line number Diff line number Diff line change
@@ -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
pandas==2.0.3
numpy<2.0.0
pandas
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
grpcio==1.62.1
safetensors==0.4.1
scipy
16 changes: 8 additions & 8 deletions python/requirements-flow.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
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
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
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
2 changes: 1 addition & 1 deletion python/requirements-pulsar.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pulsar-client==2.10.2
pulsar-client==3.4.0
38 changes: 20 additions & 18 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,44 @@

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"
]
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]"],
}
Expand Down

0 comments on commit e7083f7

Please sign in to comment.