Skip to content

Commit db1103b

Browse files
committed
Update copyright date and documentation for version 4.
1 parent 3569635 commit db1103b

File tree

8 files changed

+169
-105
lines changed

8 files changed

+169
-105
lines changed

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2013-2017 nexB Inc. http://www.nexb.com/ - All rights reserved.
1+
Copyright (c) 2013-2019 nexB Inc. http://www.nexb.com/ - All rights reserved.
22
Licensed under the Apache License, Version 2.0 (the "License");
33
you may not use this file except in compliance with the License.
44
You may obtain a copy of the License at

SPECIFICATION.rst

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ABOUT File Specification v3.1.3
1+
ABOUT File Specification v3.1.4
22

33

44
Purpose
@@ -197,6 +197,15 @@ above the ABOUT file directory, using a relative POSIX path::
197197
licenses:
198198
- file: ../docs/ruby.README
199199

200+
In addition, there may be cases that a license can have 2 or more referenced license files.
201+
If this is the case, a comma ',' is used to identify multiple files
202+
For instance::
203+
204+
license_expression: gpl-2.0-plus
205+
licenses:
206+
- key: gpl-2.0-plus
207+
file: COPYING, COPYING.LESSER
208+
200209
Field referencing a URL
201210
~~~~~~~~~~~~~~~~~~~~~~~
202211

about.ABOUT

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
about_resource: .
22
name: AboutCode-toolkit
3-
version: 3.4.0.pre1
3+
version: 4.0.0
44
author:
55
- >-
66
Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez
7-
copyright: Copyright (c) 2013-2017 nexB Inc.
7+
copyright: Copyright (c) 2013-2019 nexB Inc.
88
description: |-
99
AboutCode Toolkit is a tool to process ABOUT files. An ABOUT file
1010
provides a simple way to document the provenance (origin and license)

docs/CHANGELOG.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
2019-XX-XX
1+
2019-10-09
22

3-
Release 4.0.0.pre1
3+
Release 4.0.0
44

55
* Support filenames/path with special characters #310 #378 #392
66
* Update ABOUT file format to match the specification
@@ -19,7 +19,7 @@
1919
* New UrlListField introduced for list of urls
2020
* The UrlField is now only taking single URL value
2121
* The owner is now a StringField instead of ListField
22-
* Format the ordering of the genreated ABOUT file (See https://github.com/nexB/aboutcode-toolkit/issues/349#issuecomment-438871444)
22+
* Format the ordering of the generated ABOUT file (See https://github.com/nexB/aboutcode-toolkit/issues/349#issuecomment-438871444)
2323
* '+' and '(' and ')' is now supported in license_expression
2424
* The key 'about_resource_path' is removed
2525
* Revert back the requirement of the 'name' field

docs/UsingAboutCodetoDocumentYourSoftwareAssets.md

Lines changed: 149 additions & 94 deletions
Large diffs are not rendered by default.
-3.99 MB
Binary file not shown.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def read(*names, **kwargs):
2424

2525
setup(
2626
name='aboutcode-toolkit',
27-
version='4.0.0.pre1',
27+
version='4.0.0',
2828
license='Apache-2.0',
2929
description=(
3030
'AboutCode-toolkit is a tool to document the provenance (origin and license) of '

src/attributecode/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- coding: utf8 -*-
33

44
# ============================================================================
5-
# Copyright (c) 2013-2017 nexB Inc. http://www.nexb.com/ - All rights reserved.
5+
# Copyright (c) 2013-2019 nexB Inc. http://www.nexb.com/ - All rights reserved.
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
@@ -31,9 +31,9 @@
3131

3232
import saneyaml
3333

34-
__version__ = '4.0.0.pre1'
34+
__version__ = '4.0.0'
3535

36-
__about_spec_version__ = '3.1'
36+
__about_spec_version__ = '3.1.4'
3737

3838
__copyright__ = """
3939
Copyright (c) 2013-2019 nexB Inc. All rights reserved. http://dejacode.org

0 commit comments

Comments
 (0)