Skip to content

Commit 99d5d9e

Browse files
pombredannepombredanne
committed
Merge latest develop
Signed-off-by: Philippe Ombredanne <[email protected]>
2 parents 7ba80f0 + e31bdf5 commit 99d5d9e

File tree

39,956 files changed

+315411
-391898
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

39,956 files changed

+315411
-391898
lines changed

‎.VERSION‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
refs=$Format:%D$
2+
commit=$Format:%H$
3+
abbrev_commit=$Format:%H$

‎.bumpversion.cfg‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.cirrus.yml‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,20 @@
11
env:
2-
CIRRUS_CLONE_DEPTH: 1
3-
ARCH: amd64
4-
5-
py27_task:
6-
env:
7-
PYTHON_EXE: /usr/local/bin/python2.7
8-
9-
freebsd_instance:
10-
matrix:
11-
image: freebsd-11-2-release-amd64
12-
image: freebsd-12-0-release-amd64
13-
14-
install_script:
15-
- sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
16-
- pkg upgrade -y
17-
- pkg install -y python27 bash libxml2 libxslt
18-
script:
19-
- ./configure
2+
CIRRUS_CLONE_DEPTH: 1
3+
ARCH: amd64
204

215
py36_task:
22-
env:
23-
PYTHON_EXE: /usr/local/bin/python3.6
6+
env:
7+
PYTHON_EXE: /usr/local/bin/python3.6
8+
9+
freebsd_instance:
10+
matrix:
11+
image: freebsd-11-2-release-amd64
12+
image: freebsd-12-0-release-amd64
2413

25-
freebsd_instance:
26-
matrix:
27-
image: freebsd-11-2-release-amd64
28-
image: freebsd-12-0-release-amd64
14+
install_script:
15+
- sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
16+
- pkg upgrade -y
17+
- pkg install -y python36 bash libxml2 libxslt
2918

30-
install_script:
31-
- sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
32-
- pkg upgrade -y
33-
- pkg install -y python36 bash libxml2 libxslt
34-
script:
35-
- ./configure
19+
script:
20+
- ./configure

‎.dockerignore‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Ignore the Docker files themselves to avoid that all layers are invalidated if the Docker files are changed during development.
2+
.dockerignore
3+
Dockerfile
4+
5+
# Ignore the Git directory and files and github directory.
6+
.git/
7+
.github/
8+
.gitattributes
9+
.gitignore
10+
11+
# Ignore other directories that are not required in the image
12+
tests/
13+
docs/
14+
samples/

‎.gitattributes‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,13 @@
1-
# never convert crlf
2-
* binary
1+
# make sure end of lines are always lf
2+
* text eol=lf
3+
*.bat text eol=crlf
4+
5+
# data in the tests should be kept as is
6+
**/data/** binary
7+
**/assets/** binary
8+
**/samples/** binary
9+
*.pyz binary
10+
11+
# *.json text eol=lf
12+
# save the version details for git tarballs
13+
.VERSION export-subst

‎.github/ISSUE_TEMPLATE/--lic-det-bug-report.md‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
---
2+
name: "\U0001F41B License Detection Bug report"
3+
about: Create a Report for a License Detection Bug
4+
title: ''
5+
labels: 'bug', 'license scan', 'new and improved data'
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Please fill out as much of the below template and delete unnecessary text.
12+
Sample License Detection Bug Reports
13+
- https://github.com/nexB/scancode-toolkit/issues/2126
14+
- https://github.com/nexB/scancode-toolkit/issues/2266
15+
Markdown Styling - https://commonmark.org/help/
16+
-->
17+
18+
### Description
19+
20+
> Please leave a brief description of the License Detection Bug:
21+
22+
23+
### Where to get the File/Package
24+
25+
> Link to Public Repository/Package Index, if there are multiple files that has license detection errors
26+
> Also list some example files. If the bug is in a single file then link to the file.
27+
28+
29+
30+
## Scan Reports
31+
32+
> What scancode command was used?
33+
34+
35+
> Scan Outputs (Preferably of a whole file in [json-pretty-print](https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/output-format.html#json-pp-file))
36+
> Note:-
37+
> If possible please use the `--license-text` and `--license-text-diagonostics` [command line options](https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/basic-options.html#license-text-diagnostics-options)
38+
> as it helps understand which parts were wrongly matched and gives us more insight into the bug
39+
> Upload your results.json file on this issue [like this](https://docs.github.com/en/enterprise/2.16/user/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests)
40+
41+
42+
43+
### System/Scancode Configuration
44+
45+
> For bug reports, it really helps us to know:
46+
47+
* What OS are you running on?
48+
> (Windows/MacOS/Linux)
49+
50+
51+
* What version of scancode-toolkit was used to generate the scan file?
52+
> `./scancode --version`
53+
54+
55+
* What installation method was used to install/run scancode?
56+
> (pip/source download/other)
57+
58+
59+
## Links to Rule or excerpts of Rule Texts (If Possible)
60+
61+
> Which Licenses/Rules were wrongly matched (if Applicable)
62+
>
63+
> [Rule Directory](https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules) and [License Directory](https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses)
64+
65+
66+
67+
## Select the Relevant Issue Category(s)
68+
69+
> [ ] - Unselected, [x] - Selected
70+
71+
- [ ] Unknown License
72+
- [ ] False Positive
73+
- [ ] Multiple Detections, Some Wrong
74+
- [ ] License Version Mismatch
75+
- [ ] New License
76+
- [ ] Change in License/Rule Attributes
77+
- [ ] Edit existing Rule
78+
- [ ] From [`scancode-results-analyzer`](https://github.com/nexB/scancode-results-analyzer)
79+
80+
81+
## Comments on the License Detection Bug
82+
83+
> What should have been detected instead, why is it a bug.
84+
85+
86+
87+
## Comments (if any) on How to Add a New Rule/Modify an existing Rule for solving this Bug
88+
89+
> Refer the documentation page at [Add new license](https://scancode-toolkit.readthedocs.io/en/latest/how-to-guides/add_new_license.html) and [Add new rule](https://scancode-toolkit.readthedocs.io/en/latest/how-to-guides/add_new_license_detection_rule.html)
90+
91+
92+
<!--
93+
Your help makes ScanCode Toolkit better! We *deeply* appreciate your help in improving ScanCode Toolkit.
94+
-->

‎.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
# Python compiled files
55
*.py[cod]
66

7+
# do not commit thriparty cache of wheels
8+
/thirdparty
9+
710
# virtualenv and other misc bits
811
*.egg-info
912
/dist
@@ -79,3 +82,9 @@ pyvenv.cfg
7982
lib64
8083
tcl
8184
/.env
85+
86+
*.orig
87+
/release*
88+
/00-*.txt
89+
/z-todo-licenses-*
90+

‎.travis.yml‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

0 commit comments

Comments
 (0)