Skip to content

Commit c66ce53

Browse files
authored
Merge pull request #95 from lostsnow/feature/v1.2.0
bump version 1.2.0
2 parents 1c3b67b + 5e17d84 commit c66ce53

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

.github/workflows/release-agent.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ jobs:
3838
echo "${{ github.event.repository.name }},version,${{ steps.get_python_version.outputs.VERSION }}" >> version.txt && \
3939
echo "${{ github.event.repository.name }},commit_hash,${GITHUB_SHA}" >> version.txt
4040
41-
- name: Replace setup cfg
42-
run: |
43-
sed -i -e 's/version = .*$/version = ${{ steps.get_python_version.outputs.VERSION }}/g' setup.cfg
44-
cat setup.cfg
45-
4641
- name: Upload version file to oss
4742
id: upload_version_file_to_oss
4843
uses: tvrcgo/upload-to-oss@master
@@ -56,7 +51,9 @@ jobs:
5651
5752
- name: Package
5853
run: |
54+
cp config-example.json config.json
5955
python setup.py sdist
56+
6057
- uses: manyuanrong/[email protected]
6158
with:
6259
endpoint: "oss-cn-beijing.aliyuncs.com"

.github/workflows/update-test-agent.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222

2323
- name: Package
2424
run: |
25+
cp config-example.json config.json
2526
python setup.py sdist
2627
2728
- uses: manyuanrong/[email protected]

MANIFEST.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
include *.py
2+
include *.md
3+
include LICENSE
24
include dongtai_agent_python/*.py
3-
include dongtai_agent_python/*.json
5+
include dongtai_agent_python/config.json
6+
include dongtai_agent_python/policy_api.json
47
include dongtai_agent_python/api/*.py
58
include dongtai_agent_python/assess/*.py
69
include dongtai_agent_python/assess_ext/*.c

dongtai_agent_python/config-example.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
"allhook": {
3434
"enable": true
3535
},
36-
"name": "DongTai 1.1.4",
36+
"name": "DongTai 1.2.0",
3737
"mode": "normal"
3838
},
3939
"project": {
4040
"name": "Python Demo Project",
4141
"version": ""
4242
},
4343
"engine": {
44-
"version": "v1.1.4",
44+
"version": "v1.2.0",
4545
"name": "dongtai-agent-python"
4646
},
4747
"app": {

setup.cfg

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
[metadata]
22
name = dongtai_agent_python
3-
version = 1.1.4
3+
version = 1.2.0
44
description = DongTai IAST Agent for Python
55
long_description = file: README.md
6-
url = https://iast.huoxian.cn
6+
url = https://dongtai.io
77
author = songjinghao
88
author_email = [email protected]
9-
license = GPL-3
9+
license = Apache License 2.0
10+
license_file = LICENSE
1011
classifiers =
1112
Environment :: Web Environment
1213
Framework :: Django
13-
Framework :: Django :: X.Y # Replace "X.Y" as appropriate
14+
Framework :: Flask
1415
Intended Audience :: Developers
15-
License :: OSI Approved :: BSD License
16+
License :: OSI Approved :: Apache Software License
1617
Operating System :: OS Independent
1718
Programming Language :: Python
1819
Programming Language :: Python :: 3

0 commit comments

Comments
 (0)