You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by zh...@apache.org on 2022/12/08 08:57:31 UTC
[dolphinscheduler] branch dev updated: [release] version 3.0.3 (#13131)
This is an automated email from the ASF dual-hosted git repository.
zhongjiajie pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new e90cd9e13b [release] version 3.0.3 (#13131)
e90cd9e13b is described below
commit e90cd9e13ba1d6892956138af40a7e3d8745635f
Author: Jay Chung <zh...@gmail.com>
AuthorDate: Thu Dec 8 16:57:17 2022 +0800
[release] version 3.0.3 (#13131)
---
.flake8 | 3 ++-
docs/configs/index.md.jsx | 2 ++
docs/configs/site.js | 8 ++++----
docs/docs/en/contribute/release/release-prepare.md | 2 +-
docs/docs/en/contribute/release/release.md | 4 ++--
docs/docs/en/guide/task/mlflow.md | 14 +++++++-------
docs/docs/en/history-versions.md | 4 ++++
docs/docs/zh/contribute/release/release-prepare.md | 2 +-
docs/docs/zh/contribute/release/release.md | 7 +++----
docs/docs/zh/guide/task/mlflow.md | 14 +++++++-------
docs/docs/zh/history-versions.md | 4 ++++
docs/img_utils.py | 7 +++++--
tools/release/github/pull_request.py | 20 +++++++++++++++-----
13 files changed, 57 insertions(+), 34 deletions(-)
diff --git a/.flake8 b/.flake8
index f6829fc382..3e840dc380 100644
--- a/.flake8
+++ b/.flake8
@@ -25,4 +25,5 @@ ignore =
D107, # D107: Don't require docstrings on __init__
D105, # D105: Missing docstring in magic method
# Conflict to Black
- W503 # W503: Line breaks before binary operators
+ W503, # W503: Line breaks before binary operators
+ D100 # Missing docstring in public module
diff --git a/docs/configs/index.md.jsx b/docs/configs/index.md.jsx
index 276b9eea58..5617ffe9db 100644
--- a/docs/configs/index.md.jsx
+++ b/docs/configs/index.md.jsx
@@ -47,6 +47,7 @@ import docs207Config from '../../../site_config/docs2-0-7';
import docs300Config from '../../../site_config/docs3-0-0';
import docs301Config from '../../../site_config/docs3-0-1';
import docs302Config from '../../../site_config/docs3-0-2';
+import docs303Config from '../../../site_config/docs3-0-3';
import docs310Config from '../../../site_config/docs3-1-0';
import docs311Config from '../../../site_config/docs3-1-1';
import docsDevConfig from '../../../site_config/docsdev';
@@ -72,6 +73,7 @@ const docsSource = {
'3.0.0': docs300Config,
'3.0.1': docs301Config,
'3.0.2': docs302Config,
+ '3.0.3': docs303Config,
'3.1.0': docs310Config,
'3.1.1': docs311Config,
dev: docsDevConfig,
diff --git a/docs/configs/site.js b/docs/configs/site.js
index 562c2742c4..7b585eb871 100644
--- a/docs/configs/site.js
+++ b/docs/configs/site.js
@@ -50,8 +50,8 @@ export default {
},
{
key: 'docs1',
- text: '3.0.2',
- link: '/en-us/docs/3.0.2/user_doc/about/introduction.html',
+ text: '3.0.3',
+ link: '/en-us/docs/3.0.3/user_doc/about/introduction.html',
},
{
key: 'docs2',
@@ -178,8 +178,8 @@ export default {
},
{
key: 'docs1',
- text: '3.0.2',
- link: '/zh-cn/docs/3.0.2/user_doc/about/introduction.html',
+ text: '3.0.3',
+ link: '/zh-cn/docs/3.0.3/user_doc/about/introduction.html',
},
{
key: 'docs2',
diff --git a/docs/docs/en/contribute/release/release-prepare.md b/docs/docs/en/contribute/release/release-prepare.md
index 30bcaae52f..8dce8423b6 100644
--- a/docs/docs/en/contribute/release/release-prepare.md
+++ b/docs/docs/en/contribute/release/release-prepare.md
@@ -21,7 +21,7 @@ For example, to release `x.y.z`, the following updates are required:
- `soft_version`: need to be updated to x.y.z
- `deploy/docker/.env`: `HUB` change to `apache`，`TAG` change to `x.y.z`
- `deploy/kubernetes/dolphinscheduler`:
- - `Chart.yaml`: `appVersion` needs to be updated to x.y.z (`version` is helm chart version，incremented and different from x.y.z)
+ - `Chart.yaml`: `appVersion` and `version` needs to be updated to x.y.z
- `values.yaml`: `image.tag` needs to be updated to x.y.z
- Version in the docs:
- Change the placeholder `<version>`(except `pom`) to the `x.y.z` in directory `docs`
diff --git a/docs/docs/en/contribute/release/release.md b/docs/docs/en/contribute/release/release.md
index 10e7fd1887..4901024ad7 100644
--- a/docs/docs/en/contribute/release/release.md
+++ b/docs/docs/en/contribute/release/release.md
@@ -469,10 +469,10 @@ the release version is `<VERSION>`, the following updates are required(note it w
- `docs/configs/site.js`:
- `docsLatest`: update to `<VERSION>`
- `docs0`: The `text` of two places of `en-us/zh-cn` needs to be updated to `latest(<VERSION>)`
- - `docs/configs/index.md.jsx`: Add `<VERSION>: docsxyzConfig`
+ - `docs/configs/index.md.jsx`: Add `<VERSION>: docsxyzConfig` and add new `import` for the new `docsxyzConfig`
- `docs/docs/en/history-versions.md` and `docs/docs/zh/history-versions.md`: Add new `<VERSION>` release docs.
- `.github/ISSUE_TEMPLATE/bug-report.yml`: DolphinScheduler's GitHub [bug-report](https://github.com/apache/dolphinscheduler/blob/dev/.github/ISSUE_TEMPLATE/bug-report.yml)
- issue template have **Version** selection bottom. So after we release DolphinScheduler we should and the new `<VERSION>` to
+ issue template have **Version** selection bottom. So after released we should and the new `<VERSION>` to
bug-report.yml
### Find DolphinScheduler in [apache staging repositories](https://repository.apache.org/#stagingRepositories) and click `Release`
diff --git a/docs/docs/en/guide/task/mlflow.md b/docs/docs/en/guide/task/mlflow.md
index 842682b424..a14ac12483 100644
--- a/docs/docs/en/guide/task/mlflow.md
+++ b/docs/docs/en/guide/task/mlflow.md
@@ -61,13 +61,13 @@ The MLflow plugin currently supports and will support the following:
**Task Parameter**
-| **Parameter** | **Description** [...]
-|----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ [...]
-| Register Model | Register the model or not. If register is selected, the following parameters are expanded. [...]
-| model name | The registered model name is added to the original model version and registered as Production. [...]
-| Data Path | The absolute path of the file or folder. Ends with .csv for file or contain train.csv and test.csv for folder(In the suggested way, users should build their own test sets for model evaluation). [...]
-| Parameters | Parameter when initializing the algorithm/AutoML model, which can be empty. For example, parameters `n_estimators=200;learning_rate=0.2` for flaml. The convention will be passed with '; 'shards each parameter, using the name before the equal sign as the parameter name, and using the name after the equal sign to get the corresponding parameter value through `python eval()`. The detailed parameter list is as follows: <ul><li>[flaml](https://microsoft.github.io/FLAML/docs [...]
-| AutoML tool | The AutoML tool used, currently supports [autosklearn](https://github.com/automl/auto-sklearn) and [flaml](https://github.com/microsoft/FLAML). [...]
+| **Parameter** | **Description** [...]
+|----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ [...]
+| Register Model | Register the model or not. If register is selected, the following parameters are expanded. [...]
+| model name | The registered model name is added to the original model version and registered as Production. [...]
+| Data Path | The absolute path of the file or folder. Ends with .csv for file or contain train.csv and test.csv for folder(In the suggested way, users should build their own test sets for model evaluation). [...]
+| Parameters | Parameter when initializing the algorithm/AutoML model, which can be empty. For example, parameters `n_estimators=200;learning_rate=0.2` for flaml. The convention will be passed with '; 'shards each parameter, using the name before the equal sign as the parameter name, and using the name after the equal sign to get the corresponding parameter value through `python eval()`. The detailed parameter list is as follows: <ul><li>[flaml](https://microsoft.github.io/FLAML/docs [...]
+| AutoML tool | The AutoML tool used, currently supports [autosklearn](https://github.com/automl/auto-sklearn) and [flaml](https://github.com/microsoft/FLAML). [...]
#### Custom projects
diff --git a/docs/docs/en/history-versions.md b/docs/docs/en/history-versions.md
index 924fdf7f98..3042ea465a 100644
--- a/docs/docs/en/history-versions.md
+++ b/docs/docs/en/history-versions.md
@@ -14,6 +14,10 @@
### Versions: 3.0.2
+#### Links： [3.0.3 Document](../3.0.3/user_doc/about/introduction.md)
+
+### Versions: 3.0.2
+
#### Links： [3.0.2 Document](../3.0.2/user_doc/about/introduction.md)
### Versions: 3.0.1
diff --git a/docs/docs/zh/contribute/release/release-prepare.md b/docs/docs/zh/contribute/release/release-prepare.md
index 85eea69e6b..4b347d8b77 100644
--- a/docs/docs/zh/contribute/release/release-prepare.md
+++ b/docs/docs/zh/contribute/release/release-prepare.md
@@ -21,7 +21,7 @@
- `soft_version`: 版本更新为 x.y.z
- `deploy/docker/.env`: `HUB` 改为 `apache`，`TAG` 改为 `x.y.z`
- `deploy/kubernetes/dolphinscheduler`:
- - `Chart.yaml`: `appVersion` 版本更新为 x.y.z (`version` 为 helm chart 版本, 增量更新但不要设置为 x.y.z)
+ - `Chart.yaml`: `appVersion` 和 `version` 版本更新为 x.y.z
- `values.yaml`: `image.tag` 版本更新为 x.y.z
- 修改文档（docs模块）中的版本号:
- 将 `docs` 文件夹下文件的占位符 `<version>` (除了 pom.xml 相关的) 修改成 `x.y.z`
diff --git a/docs/docs/zh/contribute/release/release.md b/docs/docs/zh/contribute/release/release.md
index f53ae1821a..7203479e6b 100644
--- a/docs/docs/zh/contribute/release/release.md
+++ b/docs/docs/zh/contribute/release/release.md
@@ -468,11 +468,10 @@ svn mv -m "release ${VERSION}" https://dist.apache.org/repos/dist/dev/dolphinsch
- `docs/configs/site.js`:
- `docsLatest`: 更新为 `<VERSION>`
- `docs0`: 两处 `en-us/zh-cn` 的 `text` 更新为 `latest(<VERSION>)`
- - `docs/configs/index.md.jsx`: 增加 `'<VERSION>': docsxyzConfig,`
+ - `docs/configs/index.md.jsx`: 增加 `'<VERSION>': docsxyzConfig,` 以及新的 `import`
- `docs/docs/en/history-versions.md` 和 `docs/docs/zh/history-versions.md`: 增加新的发版版本 `<VERSION>` 的链接
- - `.github/ISSUE_TEMPLATE/bug-report.yml`: DolphinScheduler 在 GitHub issue 中有版本选择的部分，当有新版本发版后，需要更新这部分的内容。目前与版本关联的是
- [bug-report](https://github.com/apache/dolphinscheduler/blob/dev/.github/ISSUE_TEMPLATE/bug-report.yml)，发版的时候需要
- 向其中的 **Version** 部分增加内容。
+ - `.github/ISSUE_TEMPLATE/bug-report.yml`: DolphinScheduler 在 GitHub bug report 的 issue 中有版本选择，当有新的版本发版后，需要更新
+ [bug-report](https://github.com/apache/dolphinscheduler/blob/dev/.github/ISSUE_TEMPLATE/bug-report.yml) 中的 **Version** 部分。
### 在 [apache staging repositories](https://repository.apache.org/#stagingRepositories) 仓库找到 DolphinScheduler 并点击`Release`
diff --git a/docs/docs/zh/guide/task/mlflow.md b/docs/docs/zh/guide/task/mlflow.md
index 550cdfb557..3c384ce221 100644
--- a/docs/docs/zh/guide/task/mlflow.md
+++ b/docs/docs/zh/guide/task/mlflow.md
@@ -57,13 +57,13 @@ MLflow 组件用于执行 MLflow 任务，目前包含Mlflow Projects，和MLflo
-| **任务参数** | **描述** |
-|----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| 注册模型 | 是否注册模型，若选择注册，则会展开以下参数 |
-| 注册的模型名称 | 注册的模型名称，会在原来的基础上加上一个模型版本，并注册为Production |
-| 数据路径 | 文件/文件夹的绝对路径，若文件需以.csv结尾（自动切分训练集与测试集），文件夹需包含train.csv和test.csv（建议方式，用户应自行构建测试集用于模型评估） |
-| 参数 | 初始化AutoML训练器时的参数，可为空，如针对 flaml 设置`time_budget=30;estimator_list=['lgbm']`。约定传入后会以; 切分各个参数，等号前的名字作为参数名，等号后的名字将以python eval执行得到对应的参数值。详细的参数列表如下: [flaml](https://microsoft.github.io/FLAML/docs/reference/automl#automl-objects)，[autosklearn](https://automl.github.io/auto-sklearn/master/api.html) |
-| AutoML工具 | 使用的AutoML工具，目前支持 [autosklearn](https://github.com/automl/auto-sklearn)，[flaml](https://github.com/microsoft/FLAML) |
+| **任务参数** | **描述** |
+|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 注册模型 | 是否注册模型，若选择注册，则会展开以下参数 |
+| 注册的模型名称 | 注册的模型名称，会在原来的基础上加上一个模型版本，并注册为Production |
+| 数据路径 | 文件/文件夹的绝对路径，若文件需以.csv结尾（自动切分训练集与测试集），文件夹需包含train.csv和test.csv（建议方式，用户应自行构建测试集用于模型评估） |
+| 参数 | 初始化AutoML训练器时的参数，可为空，如针对 flaml 设置`time_budget=30;estimator_list=['lgbm']`。约定传入后会以; 切分各个参数，等号前的名字作为参数名，等号后的名字将以python eval执行得到对应的参数值。详细的参数列表如下: [flaml](https://microsoft.github.io/FLAML/docs/Use-Cases/Task-Oriented-AutoML)，[autosklearn](https://automl.github.io/auto-sklearn/master/api.html) |
+| AutoML工具 | 使用的AutoML工具，目前支持 [autosklearn](https://github.com/automl/auto-sklearn)，[flaml](https://github.com/microsoft/FLAML) |
#### Custom projects
diff --git a/docs/docs/zh/history-versions.md b/docs/docs/zh/history-versions.md
index f2ceee8f54..0c24a6cd29 100644
--- a/docs/docs/zh/history-versions.md
+++ b/docs/docs/zh/history-versions.md
@@ -12,6 +12,10 @@
#### Links： [3.1.0 文档](../3.1.0/user_doc/about/introduction.md)
+### Versions: 3.0.3
+
+#### Links： [3.0.3 文档](../3.0.3/user_doc/about/introduction.md)
+
### Versions: 3.0.2
#### Links： [3.0.2 文档](../3.0.2/user_doc/about/introduction.md)
diff --git a/docs/img_utils.py b/docs/img_utils.py
index a0116dfbd8..84c9ac80f9 100644
--- a/docs/img_utils.py
+++ b/docs/img_utils.py
@@ -135,7 +135,9 @@ def dev_syntax() -> None:
for path in dev_files_path:
content = path.read_text()
find = pattern.findall(content)
- assert not find, f"File {str(path)} contain temporary not support syntax: {find}."
+ assert (
+ not find
+ ), f"File {str(path)} contain temporary not support syntax: {find}."
def build_argparse() -> argparse.ArgumentParser:
@@ -167,7 +169,8 @@ def build_argparse() -> argparse.ArgumentParser:
parser_prune.set_defaults(func=prune)
parser_prune = subparsers.add_parser(
- "dev-syntax", help="Check whether temporary does not support syntax in development directory."
+ "dev-syntax",
+ help="Check whether temporary does not support syntax in development directory.",
)
parser_prune.set_defaults(func=dev_syntax)
diff --git a/tools/release/github/pull_request.py b/tools/release/github/pull_request.py
index 74dcd80b32..c35f0cdbae 100644
--- a/tools/release/github/pull_request.py
+++ b/tools/release/github/pull_request.py
@@ -15,7 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-from typing import Optional, List, Dict
+from typing import Dict, List, Optional
+
from github.resp_get import RespGet
@@ -25,6 +26,7 @@ class PullRequest:
:param token: token to request GitHub API entrypoint.
:param repo: GitHub repository identify, use `user/repo` or `org/repo`.
"""
+
url_search = "https://api.github.com/search/issues"
url_pr = "https://api.github.com/repos/{}/pulls/{}"
@@ -41,7 +43,9 @@ class PullRequest:
:param number: pull requests number you want to get detail.
"""
- return RespGet(url=self.url_pr.format(self.repo, number), headers=self.headers).get_single()
+ return RespGet(
+ url=self.url_pr.format(self.repo, number), headers=self.headers
+ ).get_single()
def get_merged_detail_by_milestone(self, milestone: str) -> List[Dict]:
"""Get all merged requests pull request detail by specific milestone.
@@ -49,9 +53,13 @@ class PullRequest:
:param milestone: query by specific milestone.
"""
detail = []
- numbers = {pr.get("number") for pr in self.search_merged_by_milestone(milestone)}
+ numbers = {
+ pr.get("number") for pr in self.search_merged_by_milestone(milestone)
+ }
for number in numbers:
- pr_dict = RespGet(url=self.url_pr.format(self.repo, number), headers=self.headers).get_single()
+ pr_dict = RespGet(
+ url=self.url_pr.format(self.repo, number), headers=self.headers
+ ).get_single()
detail.append(pr_dict)
return detail
@@ -61,4 +69,6 @@ class PullRequest:
:param milestone: query by specific milestone.
"""
params = {"q": f"repo:{self.repo} is:pr is:merged milestone:{milestone}"}
- return RespGet(url=self.url_search, headers=self.headers, param=params).get_total()
+ return RespGet(
+ url=self.url_search, headers=self.headers, param=params
+ ).get_total()