From 57b63b808d25d8425687d607397df8ad484271fa Mon Sep 17 00:00:00 2001 From: yugasun Date: Wed, 2 Sep 2020 16:49:48 +0800 Subject: [PATCH 1/3] fix: update tencnet-component-toolkit for api mark --- README.md | 21 +++++++++------------ example/serverless.yml | 3 --- serverless.component.yml | 2 +- src/package.json | 2 +- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index a1261f9..a269106 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ $ cd example 在本地创建`serverless.yml`文件： -```shell +```bash $ touch serverless.yml ``` @@ -64,16 +64,13 @@ inputs: environment: variables: TEST: vale - vpcConfig: - subnetId: '' - vpcId: '' apigatewayConf: protocols: - https environment: release ``` -[更多配置](./docs/configure.md) +[更多配置](https://github.com/serverless-tencent/tencent-django/tree/master/docs/configure.md) > 注意：如果您自己创建项目，请将 Python 所需要的依赖安装到项目目录，例如本实例需要`Django`，所以可以通过`pip`进行安装： @@ -85,29 +82,29 @@ pip install Django -t ./ 如您的账号未 [登录](https://cloud.tencent.com/login) 或 [注册](https://cloud.tencent.com/register) 腾讯云，您可以直接通过**微信**扫描命令行中的二维码进行授权登录和注册。 -通过`sls`命令进行部署，并可以添加`--debug`参数查看部署过程中的信息 +通过 `sls` 命令进行部署，并可以添加 `--debug` 参数查看部署过程中的信息 -```shell -$ sls --debug +```bash +$ sls deploy ``` #### 5.移除 通过以下命令移除部署的服务： -```shell +```bash $ sls remove --debug ``` #### 账号配置（可选） -当前默认支持 CLI 扫描二维码登录，如您希望配置持久的环境变量/密钥信息，也可以本地创建`.env`文件： +当前默认支持 CLI 扫描二维码登录，如您希望配置持久的环境变量/密钥信息，也可以本地创建 `.env` 文件： -```shell +```bash $ touch .env # 腾讯云的配置信息 ``` -在`.env`文件中配置腾讯云的 SecretId 和 SecretKey 信息并保存： +在`.env`文件中配置腾讯云的 `SecretId` 和 `SecretKey` 信息并保存： ```text # .env diff --git a/example/serverless.yml b/example/serverless.yml index 5f3a2c4..ea8efa1 100644 --- a/example/serverless.yml +++ b/example/serverless.yml @@ -14,9 +14,6 @@ inputs: environment: variables: TEST: vale - vpcConfig: - subnetId: '' - vpcId: '' apigatewayConf: protocols: - https diff --git a/serverless.component.yml b/serverless.component.yml index 1d228ea..208abf7 100644 --- a/serverless.component.yml +++ b/serverless.component.yml @@ -1,5 +1,5 @@ name: django -version: 0.0.6 +version: 0.0.7 author: Tencent Cloud, Inc. org: Tencent Cloud, Inc. description: Deploy a Django application onto Tencent SCF and API Gateway. diff --git a/src/package.json b/src/package.json index a53fc4f..9931624 100644 --- a/src/package.json +++ b/src/package.json @@ -1,7 +1,7 @@ { "dependencies": { "download": "^8.0.0", - "tencent-component-toolkit": "^1.15.7", + "tencent-component-toolkit": "^1.16.3", "type": "^2.0.0" } } From fa96d871759a15e2203508b33a81773475c365c7 Mon Sep 17 00:00:00 2001 From: yugasun Date: Wed, 2 Sep 2020 17:18:49 +0800 Subject: [PATCH 2/3] ci: update integration test --- tests/integration.test.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/integration.test.js b/tests/integration.test.js index faf08ee..e01ccbd 100644 --- a/tests/integration.test.js +++ b/tests/integration.test.js @@ -1,4 +1,5 @@ const { generateId, getServerlessSdk } = require('./utils') +const { join } = require('path') // set enough timeout for deployment to finish jest.setTimeout(300000) @@ -11,8 +12,8 @@ const instanceYaml = { name: `django-integration-tests-${generateId()}`, stage: 'dev', inputs: { - djangoProjectName: 'djangotest', - src: './src', + djangoProjectName: 'mydjangocomponent', + src: join(__dirname, '..', 'example/src'), region: 'ap-guangzhou', apigatewayConf: { environment: 'test' } } From b94310ec06f499ef5c3444085ae2ab9f196a1a4c Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 2 Sep 2020 09:32:01 +0000 Subject: [PATCH 3/3] chore(release): version 0.0.7 ## [0.0.7](https://github.com/serverless-components/tencent-django/compare/v0.0.6...v0.0.7) (2020-09-02) ### Bug Fixes * update tencnet-component-toolkit for api mark ([57b63b8](https://github.com/serverless-components/tencent-django/commit/57b63b808d25d8425687d607397df8ad484271fa)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a44f87..4219905 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [0.0.7](https://github.com/serverless-components/tencent-django/compare/v0.0.6...v0.0.7) (2020-09-02) + + +### Bug Fixes + +* update tencnet-component-toolkit for api mark ([57b63b8](https://github.com/serverless-components/tencent-django/commit/57b63b808d25d8425687d607397df8ad484271fa)) + ## [0.0.6](https://github.com/serverless-components/tencent-django/compare/v0.0.5...v0.0.6) (2020-09-02)