Skip to content

Commit b0eacdf

Browse files
chinyeunglichinyeungli
committed
Merge develop
Signed-off-by: Chin Yeung Li <[email protected]>
2 parents f3b2f1a + 569078b commit b0eacdf

File tree

300 files changed

+9336
-7203
lines changed

Some content is hidden

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

300 files changed

+9336
-7203
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Ignore all Git auto CR/LF line endings conversions
2+
* -text
3+
pyproject.toml export-subst

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/Lib
1313
/pip-selfcheck.json
1414
/tmp
15+
/venv
1516
.Python
1617
/include
1718
/Include
@@ -70,3 +71,4 @@ tcl
7071

7172
# Ignore Jupyter Notebook related temp files
7273
.ipynb_checkpoints/
74+
/virtualenv.pyz

‎.travis.yml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
1-
language: python
1+
# This is a skeleton Travis CI config file that provides a starting point for adding CI
2+
# to a Python project. Since we primarily develop in python3, this skeleton config file
3+
# will be specific to that language.
4+
#
5+
# See https://config.travis-ci.com/ for a full list of configuration options.
6+
7+
os: linux
28

9+
dist: xenial
10+
11+
language: python
312
python:
413
- "3.6"
14+
- "3.7"
15+
- "3.8"
16+
- "3.9"
517

6-
install:
7-
- ./configure etc/conf/dev
18+
# Scripts to run at install stage
19+
install: ./configure --dev
820

9-
script:
10-
- bin/py.test -vvs
21+
# Scripts to run at script stage
22+
script: venv/bin/pytest

‎AUTHORS.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
The following organizations or individuals have contributed to this repo:
2+
3+
- nexB, Inc.

‎CHANGELOG.rst‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
1-
2020-xx-xx
2-
Release 6.0.0
1+
2021-xx-xx
2+
Release 7.0.0
33

44
* Add '@' as a support character for filename #451
55
* Add support to collect redistributable sources #22
66
* Handle trailing spaces in field names during `transform` #456
77
* Remove restriction of python27 only on windows #453
88
* Documentation updated
99
* Code enhancement
10+
* Remove thirdparty/
11+
* Update configuration scripts
12+
* Use readthedocs for documentation
1013
* Add Dockerfile to run aboutcode with docker
14+
* Add new option to choose extract license from ScanCode LicenseDB or DJC License Library
15+
* Add ability to transform Excel formatted file
16+
* Support Excel file format for `inventory`, `gen` and `attrib`
17+
18+
2021-04-02
19+
Release 6.0.0
1120

21+
* This new release has no feature changes.
22+
* It has relaxed PyYAML dependencies and drop Python 2 support
1223

1324
2020-09-01
1425
Release 5.1.0

‎MANIFEST.in‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,15 @@
11
graft src
2-
graft tests
3-
graft docs
4-
graft etc
5-
graft example
6-
graft thirdparty
72

8-
prune src/aboutcode_toolkit.egg-info
9-
10-
include about.ABOUT
11-
include about
12-
include about.bat
13-
include about.cfg
14-
include apache-2.0.LICENSE
15-
include about.bat
16-
include apache-2.0.LICENSE
17-
include configure
18-
include configure.bat
19-
include MANIFEST.in
3+
include *.LICENSE
204
include NOTICE
21-
include README.rst
22-
include setup.cfg
23-
include setup.py
24-
include SPEC
25-
include USAGE.rst
26-
include .travis.yml
27-
include appveyor.yml
5+
include *.ABOUT
6+
include *.toml
7+
include *.yml
8+
include *.rst
9+
include setup.*
10+
include configure*
11+
include requirements*
12+
include .git*
2813

2914
global-exclude *.py[co] __pycache__ *.*~
15+

‎NOTICE‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
1-
Copyright (c) nexB Inc. http://www.nexb.com/ - All rights reserved.
2-
Licensed under the Apache License, Version 2.0 (the "License");
3-
you may not use this file except in compliance with the License.
4-
You may obtain a copy of the License at
5-
http://www.apache.org/licenses/LICENSE-2.0
6-
Unless required by applicable law or agreed to in writing, software
7-
distributed under the License is distributed on an "AS IS" BASIS,
8-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
See the License for the specific language governing permissions and
10-
limitations under the License.
1+
#
2+
# Copyright (c) nexB Inc. and others.
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
# Visit https://aboutcode.org and https://github.com/nexB/ for support and download.
6+
# ScanCode is a trademark of nexB Inc.
7+
#
8+
# Licensed under the Apache License, Version 2.0 (the "License");
9+
# you may not use this file except in compliance with the License.
10+
# You may obtain a copy of the License at
11+
#
12+
# http://www.apache.org/licenses/LICENSE-2.0
13+
#
14+
# Unless required by applicable law or agreed to in writing, software
15+
# distributed under the License is distributed on an "AS IS" BASIS,
16+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
# See the License for the specific language governing permissions and
18+
# limitations under the License.
19+
#

‎README.rst‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ identify redistributable source code used in your project to help you comply
2121
with open source licenses conditions.
2222

2323
This version of the AboutCode Toolkit follows the ABOUT specification version 3.2.1 at:
24-
https://github.com/nexB/aboutcode-toolkit/blob/develop/docs/source/specification.rst
24+
https://aboutcode-toolkit.readthedocs.io/en/latest/specification.html
2525

2626
Build and tests status
2727
----------------------
@@ -59,17 +59,17 @@ Checkout or download and extract the AboutCode Toolkit from:
5959
https://github.com/nexB/aboutcode-toolkit/
6060

6161
To install all the needed dependencies in a virtualenv, run (on posix):
62-
source configure
62+
./configure
6363
or on windows:
6464
configure
6565

6666

6767
Activate the virtualenv
6868
-----------------------
6969
To activate the virtualenv, run (on posix):
70-
source bin/activate
70+
source venv/bin/activate
7171
or on windows:
72-
bin\\activate
72+
venv\\bin\\activate
7373

7474

7575
Deactivate the virtualenv
@@ -88,21 +88,22 @@ i.e. MAJOR.MINOR.PATCH format
8888
3. PATCH version when making backwards compatible bug fixes.
8989

9090

91-
REFERENCE
92-
---------
93-
See https://github.com/nexB/aboutcode-toolkit/blob/master/REFERENCE.rst for reference
91+
DOCUMENTATION and REFERENCE
92+
---------------------------
93+
See https://aboutcode-toolkit.readthedocs.io/en/latest/ for documentation and
94+
https://aboutcode-toolkit.readthedocs.io/en/latest/reference.html for reference
9495
on aboutcode-toolkit usage.
9596

9697

9798
TESTS and DEVELOPMENT
9899
---------------------
99100
To install all the needed development dependencies, run (on posix):
100-
source configure etc/conf/dev
101+
source configure --dev
101102
or on windows:
102-
configure etc/conf/dev
103+
configure --dev
103104

104105
To verify that everything works fine you can run the test suite with:
105-
py.test
106+
pytest
106107

107108

108109
HELP and SUPPORT

‎about‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2015 nexB Inc. http://www.nexb.com/ - All rights reserved.
3+
# Copyright (c) nexB Inc. http://www.nexb.com/ - All rights reserved.
44
#
55

66
# cd to the root directory
77
ABOUT_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
88
cd "$ABOUT_ROOT_DIR"
99

10-
CONFIGURED_PYTHON=$ABOUT_ROOT_DIR/bin/python
10+
# where we create a virtualenv
11+
VIRTUALENV_DIR=venv
12+
13+
CONFIGURED_PYTHON=$ABOUT_ROOT_DIR/$VIRTUALENV_DIR/bin/python
1114

1215
if [ ! -f "$CONFIGURED_PYTHON" ]; then
1316
echo "* Configuring AboutCode ..."
1417
source $ABOUT_ROOT_DIR/configure
1518
fi
1619

17-
source $ABOUT_ROOT_DIR/bin/activate
1820

19-
$ABOUT_ROOT_DIR/bin/about "$@"
21+
source $ABOUT_ROOT_DIR/$VIRTUALENV_DIR/bin/activate
22+
23+
$ABOUT_ROOT_DIR/$VIRTUALENV_DIR/bin/about "$@"

‎about.ABOUT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
about_resource: .
22
name: AboutCode-toolkit
3-
version: 6.0.0
3+
version: 7.0.0
44
author: Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez
55
copyright: Copyright (c) 2013-2020 nexB Inc.
66
description: |

0 commit comments

Comments
 (0)