diff --git a/.travis.yml b/.travis.yml index a99d0121..d4140c97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ matrix: dist: xenial sudo: true install: - - pip install pipenv --upgrade-strategy=only-if-needed + - pip install pipenv --upgrade - pipenv install --dev --skip-lock script: - pipenv run python setup.py install diff --git a/CHANGELOG.md b/CHANGELOG.md index dfcfbf06..6e82d6d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Release History +## 2.1.3 (2019-04-24) + +**Bugfixes** + +- replace eval mechanism with builtins to prevent security vulnerabilities + ## 2.1.2 (2019-04-17) **Features** diff --git a/README.md b/README.md index 1368b69b..44d5824c 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ HttpRunner is rich documented. ## How to Contribute 1. Check for [open issues](https://github.com/HttpRunner/HttpRunner/issues) or [open a fresh issue](https://github.com/HttpRunner/HttpRunner/issues/new/choose) to start a discussion around a feature idea or a bug. -2. Fork [the repository](https://github.com/httprunner/httprunner) on GitHub to start making your changes to the **master** branch (or branch off of it). +2. Fork [the repository](https://github.com/httprunner/httprunner) on GitHub to start making your changes to the **master** branch (or branch off of it). You also need to comply with the [development rules](docs/dev-rules.md). 3. Write a test which shows that the bug was fixed or that the feature works as expected. 4. Send a pull request, you will then become a [contributor](https://github.com/HttpRunner/HttpRunner/graphs/contributors) after it gets merged and published. diff --git a/docs/dev-rules.md b/docs/dev-rules.md new file mode 100644 index 00000000..f9dfb589 --- /dev/null +++ b/docs/dev-rules.md @@ -0,0 +1,47 @@ + +## 版本号（Version） + +从 2.0 版本开始，HttpRunner 开始使用 [`Semantic Versioning`][SemVer] 版本号机制。该机制由 GitHub 联合创始人 Tom Preston-Werner 编写，当前被广泛采用，遵循该机制也可以更好地与开源生态统一，避免出现 “dependency hell” 的情况。 + +具体地，HttpRunner 将采用 `MAJOR.MINOR.PATCH` 的版本号机制。 + +- MAJOR: 重大版本升级并出现前后版本不兼容时加 1 +- MINOR: 大版本内新增功能并且保持版本内兼容性时加 1 +- PATCH: 功能迭代过程中进行问题修复（bugfix）时加 1 + +当然，在实际迭代开发过程中，肯定也不会每次提交（commit）都对 PATCH 加 1；在遵循如上主体原则的前提下，也会根据需要，在版本号后面添加先行版本号（-alpha/beta/rc）或版本编译元数据（+20190101）作为延伸。 + +## 分支策略 + +HttpRunner 的开发分支策略采用 GitHub Flow。 + +![](images/github-flow.png) + +## 提交信息（Commit Message） + +代码提交的注释信息遵循如下格式规范： + +```xml +(): + + + +