Skip to content

Commit d1ee9e6

Browse files
authored
Merge branch 'main' into main
2 parents 59aacfe + 3d366d4 commit d1ee9e6

File tree

5 files changed

+52
-137
lines changed

5 files changed

+52
-137
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ tag = False
44
message = Bump version: {current_version} → {new_version}
55
current_version = 3.7.0
66

7+
78
[bumpversion:file:setup.py]
89
search = '{current_version}'
910
replace = '{new_version}'

CHANGELOG.md

Lines changed: 47 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -1,167 +1,81 @@
11
# Changelog
22

3+
34
## v3.7.0 (27/08/2021)
4-
## Changes
5-
## 🚀 Features
6-
7-
- Support carthage package manager @dd-jy (#48)
5+
## Changes
6+
## 🚀 Features
7+
8+
- Support carthage package manager @dd-jy (#48)
89

910
---
1011

1112
## v3.6.1 (25/08/2021)
12-
## Changes
13-
## 🚀 Features
14-
15-
- Support swift package manager @dd-jy (#45)
16-
17-
## 🐛 Hotfixes
18-
19-
- Fix the gradle license parsing error @dd-jy (#47)
20-
- Fix a bug related release actions @soimkim (#46)
21-
- Fix the maven license result parsing issue @dd-jy (#44)
22-
23-
## 🔧 Maintenance
24-
25-
- Fix the gradle license parsing error @dd-jy (#47)
26-
- Set condition to use FOSSLight Util v1.1.0 or later @bjk7119 (#43)
27-
- Merge init_log & init_log_item functiions @bjk7119 (#40)
28-
- Update version in setup.py when released @bjk7119 (#38)
29-
- change the pypi license separator from ';' to ',' @dd-jy (#37)
30-
- Update CONTRIBUTING.md @bjk7119 (#36)
3113

32-
---
14+
## Changes
15+
- Update publish-release.yml @dd-jy (#2)
3316

34-
## v3.5.0 (14/07/2021)
35-
## Changes
36-
## 🐛 Hotfixes
37-
38-
- Fix the android scanning issues @dd-jy (#35)
39-
40-
## 🔧 Maintenance
41-
42-
- Fix the android scanning issues @dd-jy (#35)
43-
- Move user-guide link to FOSSLight guide & @dd-jy (#34)
44-
- Add tox test for windows and MacOS @bjk7119 (#34)
45-
- Add tox test for each package manger in Ubuntu environment @bjk7119 (#31)
17+
- Support swift package manager @dd-jy (#45)
4618

47-
---
19+
## 🐛 Hotfixes
4820

49-
## v3.4.0 (02/07/2021)
50-
## Changes
51-
## 🐛 Hotfixes
52-
53-
- Fix the windows executable file issue @dd-jy (#30)
21+
- Fix the gradle license parsing error @dd-jy (#47)
22+
- Fix a bug related release actions @soimkim (#46)
23+
- Fix the maven license result parsing issue @dd-jy (#44)
5424

55-
---
25+
## 🔧 Maintenance
5626

57-
## v3.3.0 (24/06/2021)
58-
## Changes
59-
## 🐛 Hotfixes
60-
61-
- Fix the pub parsing error @dd-jy (#29)
27+
- Fix the gradle license parsing error @dd-jy (#47)
28+
- Set condition to use FOSSLight Util v1.1.0 or later @bjk7119 (#43)
29+
- Merge init_log & init_log_item functiions @bjk7119 (#40)
30+
- Update version in setup.py when released @bjk7119 (#38)
31+
- change the pypi license separator from ';' to ',' @dd-jy (#37)
32+
- Update CONTRIBUTING.md @bjk7119 (#36)
6233

6334
---
6435

65-
## v3.2.1 (24/06/2021)
66-
## 🔧 Maintenance
67-
68-
- Update PR action commands @soimkim (#28)
69-
- Update nomos standalone binary and source @dd-jy (#27)
70-
- Update nomos standalone binary @dd-jy (#25)
71-
- Update reuse related files @soimkim (#24)
72-
- Change name to FOSSLight Dependency Scanner @dd-jy (#23)
73-
74-
---
36+
## v3.5.0 (14/07/2021)
37+
## Changes
38+
## 🐛 Hotfixes
7539

76-
## v3.2.0 (11/06/2021)
77-
## Changes
78-
## 🚀 Features
79-
80-
- add android dependency scanning @dd-jy (#21)
81-
82-
## 🔧 Maintenance
83-
84-
- change user guide @dd-jy (#22)
40+
- Fix the android scanning issues @dd-jy (#35)
8541

86-
---
42+
## 🔧 Maintenance
8743

88-
## v3.1.0 (10/06/2021)
89-
## Changes
90-
## 🐛 Hotfixes
91-
92-
- fix the executable file import error @dd-jy (#20)
93-
94-
## 🔧 Maintenance
95-
96-
- Add files for reuse compliance. @soimkim (#19)
97-
- Update only CHANGELOG.md when releasing @soimkim (#18)
98-
- Apply Tox Configuration & Change help message @bjk7119 (#17)
44+
- Fix the android scanning issues @dd-jy (#35)
45+
- Move user-guide link to FOSSLight guide & @dd-jy (#34)
46+
- Add tox test for windows and MacOS @bjk7119 (#34)
47+
- Add tox test for each package manger in Ubuntu environment @bjk7119 (#31)
9948

10049
---
10150

102-
## v3.0.7 (17/05/2021)
103-
## Changes
104-
## 🔧 Maintenance
105-
106-
- Refactoring code and use fosslight_util @dd-jy (#15)
107-
- Update user-guide.md @dd-jy (#14)
108-
- Update contributing guide about DCO @dd-jy (#13)
109-
- Update the pypi description to README.md @dd-jy (#12)
110-
- Add 'cocoapods:' to oss name for cocoapods package @dd-jy (#11)
111-
- Change oss name for cocoapods package manager @dd-jy (#10)
112-
- Create CODE_OF_CONDUCT.md @dd-jy (#9)
113-
- Add CONTRIBUTING.md @dd-jy (#8)
51+
## v3.4.0 (02/07/2021)
52+
## Changes
53+
## 🐛 Hotfixes
11454

115-
---
55+
- Fix the windows executable file issue @dd-jy (#30)
11656

117-
## v3.0.6 (25/03/2021)
118-
## Changes
119-
## 🐛 Hotfixes
120-
121-
- Fix the cocoapods error @dd-jy (#7)
122-
123-
## 🔧 Maintenance
124-
125-
- Update changelog @dd-jy (#6)
126-
- Update github workflows @dd-jy (#5)
12757
---
12858

129-
## v3.0.5 (19/03/2021)
130-
## Changes
131-
## 🚀 Features
132-
- Support cocoapods package manager
133-
59+
## v3.3.0 (24/06/2021)
60+
## Changes
61+
## 🐛 Hotfixes
13462

135-
---
63+
- Fix the pub parsing error @dd-jy (#29)
13664

137-
## v3.0.4 (13/03/2021)
138-
## Changes
139-
## 🔧 Maintenance
140-
- Add license file to wheel
14165
---
14266

143-
## v3.0.3 (12/03/2021)
144-
## Changes
145-
## 🔧 Maintenance
146-
- Modify to include binaries that analyze license text.
147-
---
67+
## v3.2.1 (24/06/2021)
14868

149-
## v3.0.2 (05/03/2021)
150-
## Changes
151-
## 🐛 Hotfixes
152-
- Fix to generate a single oss for multiple license names for npm, maven
153-
---
69+
## 🔧 Maintenance
70+
71+
- Update LICENSE @dd-jy (#7)
72+
- Update CONTRIBUTING.md @dd-jy (#6)
73+
- Update README.md @dd-jy (#5)
74+
- Update publish-release.yml @dd-jy (#4)
75+
- Update LICENSE @dd-jy (#3)
15476

155-
## v3.0.1 (26/02/2021)
156-
## Changes
157-
## 🚀 Features
158-
- Add prefix 'pub:' to oss name in result file for pub package manager
159-
## 🔧 Maintenance
160-
- Update 3rd party License text
161-
- Update documents (README, user-guide)
16277
---
16378

164-
## v3.0.0 (27/01/2021)
165-
## Changes
166-
## 🚀 Features
167-
- FOSSLight dependency initial release
79+
## v3.6.1 (25/08/2021)
80+
## Changes
81+
- Develop @dd-jy (#1)

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Contributing
1+
## Contributing test
22

33
Hi! I'm really appreciate that you'd like to contribute to this project. Your help is essential for keeping it great.
44

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Apache License
2-
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
2+
testest Version 2.0, January 2004
3+
test http://www.apache.org/licenses/
44

55
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
66

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Copyright (c) 2021 LG Electronics
33
SPDX-License-Identifier: Apache-2.0
44
-->
5-
5+
testest
66
# FOSSLight Dependency Scanner
77

88
<img src="https://img.shields.io/pypi/l/fosslight_dependency" alt="License" /> <img src="https://img.shields.io/pypi/v/fosslight_dependency" alt="Current python package version." /> <img src="https://img.shields.io/pypi/pyversions/fosslight_dependency" /> [![REUSE status](https://api.reuse.software/badge/github.com/fosslight/fosslight_dependency_scanner)](https://api.reuse.software/info/github.com/fosslight/fosslight_dependency_scanner)

0 commit comments

Comments
 (0)