merge master to mail

This commit is contained in:
debugtalk
2017-08-06 11:57:22 +08:00
3 changed files with 7 additions and 5 deletions
+1
View File
@@ -6,6 +6,7 @@ python:
- 3.4 - 3.4
- 3.5 - 3.5
- 3.6 - 3.6
- 3.7-dev
install: install:
- pip install -r requirements_dev.txt - pip install -r requirements_dev.txt
script: script:
+3 -3
View File
@@ -23,13 +23,13 @@ Take full reuse of Python's existing powerful libraries: [`Requests`][requests],
## Installation/Upgrade ## Installation/Upgrade
```bash ```bash
$ pip install git+https://github.com/debugtalk/ApiTestEngine.git#egg=ApiTestEngine $ pip install git+https://github.com/debugtalk/ApiTestEngine.git#egg=ApiTestEngine --process-dependency-links
``` ```
To upgrade all specified packages to the newest available version, you should add the `-U` option. To upgrade all specified packages to the newest available version, you should add the `-U` option.
```bash ```bash
$ pip install -U git+https://github.com/debugtalk/ApiTestEngine.git#egg=ApiTestEngine $ pip install -U git+https://github.com/debugtalk/ApiTestEngine.git#egg=ApiTestEngine --process-dependency-links
``` ```
If there is a problem with the installation or upgrade, you can check the [`FAQ`](docs/FAQ.md). If there is a problem with the installation or upgrade, you can check the [`FAQ`](docs/FAQ.md).
@@ -181,7 +181,7 @@ $ ate filepath/testcase.yml --report-name ${BUILD_NUMBER} \
## Supported Python Versions ## Supported Python Versions
Python `2.7`, `3.3`, `3.4`, `3.5`, and `3.6`. Python `2.7`, `3.3`, `3.4`, `3.5`, `3.6` and `3.7-dev`.
## To learn more ... ## To learn more ...
+3 -2
View File
@@ -31,7 +31,7 @@ setup(
"jenkins-mail-py" "jenkins-mail-py"
], ],
dependency_links=[ dependency_links=[
"git+https://github.com/debugtalk/PyUnitReport.git#egg=PyUnitReport", "git+https://github.com/debugtalk/PyUnitReport.git#egg=PyUnitReport-0",
"git+https://github.com/debugtalk/jenkins-mail-py.git#egg=jenkins-mail-py" "git+https://github.com/debugtalk/jenkins-mail-py.git#egg=jenkins-mail-py"
], ],
classifiers=[ classifiers=[
@@ -40,7 +40,8 @@ setup(
'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6' 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7-dev'
], ],
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [