Merge remote-tracking branch 'origin/master' into develop-1.7

Signed-off-by: weiwee <[email protected]>
ToJ112 · Nov 23, 2021 · 3750be0 · 3750be0
2 parents a8c7eaa + ebf536a
commit 3750be0
Show file tree

Hide file tree

Showing 16 changed files with 104 additions and 117 deletions.
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -1,30 +1,29 @@
-# use pypi/<version>/develop to test build and publish to pypitest
-# use pypi/<version>/release to publish pypi
-
-name: build-wheel
+name: publish fate_client to PyPI
 
 on:
-  push:
-    branches:
-      - 'pypi/**/develop'
-      - 'pypi/**/release'
+  workflow_dispatch:
+    inputs:
+      source:
+        description: 'source branch'     
+        required: true
+      target:
+        description: 'target package version'
+        required: true
+      type:
+        description: 'publish type, test or release'
+        required: false
+        default: 'test'
 
 jobs:
   build:
-    name: Build fate client and fate_test
+    name: (${{github.event.inputs.type}} build) branch ${{github.event.inputs.source}} -> package version ${{github.event.inputs.target}}
     strategy:
       fail-fast: true
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-
-      - name: Extract version and name
-        shell: bash
-        run: |
-          # extract version and name from patterm: pypi/<version>/<name>
-          echo ::set-output name=version::$(echo ${GITHUB_REF} | sed -E -e 's/refs\/heads\/pypi\/(.*)\/(develop|release)/\1/g')
-          echo ::set-output name=name::$(echo ${GITHUB_REF} | sed -E -e 's/refs\/heads\/pypi\/(.*)\/(develop|release)/\2/g')
-        id: extract
+        with:
+          ref: ${{github.event.inputs.source}}
 
       - uses: actions/setup-python@v2
         with:
@@ -42,59 +41,41 @@ jobs:
           # clear README.rst
           echo "# fate client" > README.rst
           # bump fate client version
-          poetry version ${{steps.extract.outputs.version}}
-          # build package, saved in dist/
-          poetry build
-
-      - name: Build fate_test
-        run: |
-          cd python/fate_test &&
-          # clear README.rst
-          echo "# fate test" > README.rst
-          # bump fate test version
-          poetry version ${{steps.extract.outputs.version}}
-          # update dependency version
-          sed -E -i "s/(fate_client\s*=\s*)(.*)/\1\"${{steps.extract.outputs.version}}\"/g" pyproject.toml
-          cat pyproject.toml
+          poetry version ${{github.event.inputs.target}}
           # build package, saved in dist/
           poetry build
 
       - name: List dist files
-        run: ls -lh python/fate_client/dist/ python/fate_test/dist/
+        run: ls -lh python/fate_client/dist/ python/fate_client/dist/
 
       - name: Twine check
         run: |
           pip install -U twine
           twine check python/fate_client/dist/*
-          twine check python/fate_test/dist/*
 
       - name: Upload to artifact
         uses: actions/upload-artifact@v2
         with:
           path: |
             python/fate_client/dist/*
-            python/fate_test/dist/*
 
       - name: Test Install
         run: |
           pip install -U pip
-          pip install python/fate_client/dist/fate_client-${{steps.extract.outputs.version}}.tar.gz
-          pip install python/fate_test/dist/fate_test-${{steps.extract.outputs.version}}.tar.gz
+          pip install python/fate_client/dist/fate_client-${{github.event.inputs.target}}.tar.gz
 
       - name: Upload to PyPI Test
-        if: ${{ steps.extract.outputs.name == 'develop' }}
+        if: ${{ github.event.inputs.type == 'test' }}
         run: |
-          twine upload --repository testpypi python/fate_client/dist/*
-          twine upload --repository testpypi python/fate_test/dist/*
+          twine upload --repository testpypi python/fate_client/dist/* --verbose
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.pypitest_token }}
 
       - name: Upload to PyPI
-        if: ${{ steps.extract.outputs.name == 'release' }}
+        if: ${{ github.event.inputs.type == 'release' }}
         run: |
-          twine upload python/fate_client/dist/*
-          twine upload python/fate_test/dist/*
+          twine upload python/fate_client/dist/* --verbose
         env:
           TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.pypi_token }}
+          TWINE_PASSWORD: ${{ secrets.pypi_token }}
diff --git a/.readthedocs.mkdocs.yml b/.readthedocs.mkdocs.yml
@@ -13,7 +13,7 @@ nav:
       - pipeline:
         - tutorial/pipeline/index.md
       - DSL:
-        - tutorial: tutorial/dsl_conf/README.md
+        - tutorial: tutorial/dsl_conf/dsl_conf_tutorial.md
         - upload guide: tutorial/dsl_conf/upload_data_guide.md
         - job conf guide: tutorial/dsl_conf/dsl_conf_v2_setting_guide.md
       - model publish: tutorial/model_publish_with_serving_guide.md
@@ -122,10 +122,6 @@ plugins:
       default_language: en
       languages:
         zh: 中文
-      nav_translations:
-        zh:
-          Tutorial: 教程
-          Usage: 教程
   - mkdocs-jupyter
 
 markdown_extensions:
@@ -153,6 +149,10 @@ markdown_extensions:
       custom_checkbox: true
   - pymdownx.tabbed
   - pymdownx.tilde
+  - pymdownx.emoji:
+      emoji_index: !!python/name:materialx.emoji.twemoji
+      emoji_generator: !!python/name:materialx.emoji.to_svg
+
 
 extra:
   alternate:

diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![CodeStyle](https://img.shields.io/badge/Check%20Style-Google-brightgreen)](https://checkstyle.sourceforge.io/google_style.html) [![Style](https://img.shields.io/badge/Check%20Style-Black-black)](https://checkstyle.sourceforge.io/google_style.html) [![Build Status](https://travis-ci.org/FederatedAI/FATE.svg?branch=master)](https://travis-ci.org/FederatedAI/FATE)
 [![codecov](https://codecov.io/gh/FederatedAI/FATE/branch/master/graph/badge.svg)](https://codecov.io/gh/FederatedAI/FATE)
 [![Documentation Status](https://readthedocs.org/projects/fate/badge/?version=latest)](https://fate.readthedocs.io/en/latest/?badge=latest)
+[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/from-referrer/)
+
 
 <div align="center">
   <img src="./doc/images/FATE_logo.png">

diff --git a/README_zh.md b/README_zh.md
@@ -1,4 +1,7 @@
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![CodeStyle](https://img.shields.io/badge/Check%20Style-Google-brightgreen)](https://checkstyle.sourceforge.io/google_style.html) [![Style](https://img.shields.io/badge/Check%20Style-Black-black)](https://checkstyle.sourceforge.io/google_style.html)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![CodeStyle](https://img.shields.io/badge/Check%20Style-Google-brightgreen)](https://checkstyle.sourceforge.io/google_style.html) [![Style](https://img.shields.io/badge/Check%20Style-Black-black)](https://checkstyle.sourceforge.io/google_style.html) [![Build Status](https://travis-ci.org/FederatedAI/FATE.svg?branch=master)](https://travis-ci.org/FederatedAI/FATE)
+[![codecov](https://codecov.io/gh/FederatedAI/FATE/branch/master/graph/badge.svg)](https://codecov.io/gh/FederatedAI/FATE)
+[![Documentation Status](https://readthedocs.org/projects/fate/badge/?version=latest)](https://fate.readthedocs.io/en/latest/?badge=latest)
+[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/from-referrer/)
 
 <div align="center">
   <img src="./doc/images/FATE_logo.png">

diff --git a/deploy/cluster-deploy/doc/fate_on_eggroll/fate-allinone_deployment_guide.md b/deploy/cluster-deploy/doc/fate_on_eggroll/fate-allinone_deployment_guide.md
@@ -24,9 +24,9 @@
 
 The architecture diagram:
 
-<div style="text-align:center" align=center>
-<img src="../../images/arch_en.png" />
-</div>
+|![](../../images/arch_en.png)|
+|:--:|
+|The architecture diagram|
 
 ## 3. Component Description
 

diff --git a/deploy/cluster-deploy/doc/fate_on_eggroll/fate-allinone_deployment_guide.zh.md b/deploy/cluster-deploy/doc/fate_on_eggroll/fate-allinone_deployment_guide.zh.md
@@ -24,9 +24,9 @@
 
 架构图：
 
-<div style="text-align:center" align=center>
-<img src="../../images/arch_zh.png" />
-</div>
+|![](../../images/arch_zh.png)|
+|:--:|
+|架构图|
 
 ## 3. 组件说明
 

diff --git a/deploy/cluster-deploy/doc/fate_on_eggroll/fate-exchange_deployment_guide.md b/deploy/cluster-deploy/doc/fate_on_eggroll/fate-exchange_deployment_guide.md
@@ -19,9 +19,8 @@
 
 The architecture diagram:
 
-<div style="text-align:center", align=center>
-<img src="../../images/proxy_en.png" />
-</div>
+|![](../../images/proxy_en.png)|
+|:--:|
 
 # 3\. Component Description
 

diff --git a/deploy/cluster-deploy/doc/fate_on_eggroll/fate-exchange_deployment_guide.zh.md b/deploy/cluster-deploy/doc/fate_on_eggroll/fate-exchange_deployment_guide.zh.md
@@ -21,9 +21,8 @@
 
 架构图：
 
-<div style="text-align:center", align=center>
-<img src="../../images/proxy_zh.png" />
-</div>
+|![](../../images/proxy_zh.png)|
+|:--:|
 
 # 3.组件说明
 

diff --git a/deploy/cluster-deploy/doc/fate_on_spark/fate_on_spark_deployment_guide.md b/deploy/cluster-deploy/doc/fate_on_spark/fate_on_spark_deployment_guide.md
@@ -24,11 +24,8 @@
 
 Architecture:
 
-<div style="text-align:center", align=center>
-
-<img src="../../images/fate_on_spark_architecture.png" />
-
-</div>
+|![](../../images/fate_on_spark_architecture.png)|
+|:--:|
 
 ## 3.Module Information
 

diff --git a/deploy/cluster-deploy/doc/fate_on_spark/fate_on_spark_deployment_guide.zh.md b/deploy/cluster-deploy/doc/fate_on_spark/fate_on_spark_deployment_guide.zh.md
@@ -24,9 +24,8 @@
 
 架构图：
 
-<div style="text-align:center", align=center>
-<img src="../../images/fate_on_spark_architecture.png" />
-</div>
+|![](../../images/fate_on_spark_architecture.png)|
+|:--:|
 
 ## 3.组件说明
 

diff --git a/doc/architecture/README.md b/doc/architecture/README.md
@@ -1,13 +1,9 @@
 # Architecture
 ## Overview
 
-<p align = "center">
-<img src = "images/fate_architecture_overview.png">
-
-</p>
-<p align = "center">
-Figure 1: FATE Architecture Overview
-</p>
+|![overview](images/fate_architecture_overview.png)|
+|:--:|
+|Figure 1: FATE Architecture Overview|
 
 ## Deployment Architecture for FATE:
 
@@ -18,17 +14,12 @@ We provide flowing deploy architectures:
 
 ### 1. on eggroll
 
-<p align = "center">
-<img src = "images/fate_on_eggroll_architecture.png">
-</p>
-<p align = "center">
-Figure 2: FATE on EggRoll
-</p>
+|![eggroll](images/fate_on_eggroll_architecture.png)|
+|:--:|
+|Figure 2: FATE on EggRoll|
 
 ### 2. on spark
-<p align = "center">
-<img src = "images/fate_on_spark_architecture.png">
-</p>
-<p align = "center">
-Figure 3: FATE on Spark
-</p>
+
+|![spark](images/fate_on_spark_architecture.png)|
+|:--:|
+|Figure 3: FATE on Spark|