Update copyright date and documentation for version 4.

nexB · Oct 9, 2019 · db1103b · db1103b
1 parent 3569635
commit db1103b
Show file tree

Hide file tree

Showing 8 changed files with 169 additions and 105 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,4 +1,4 @@
- Copyright (c) 2013-2017 nexB Inc. http://www.nexb.com/ - All rights reserved.
+ Copyright (c) 2013-2019 nexB Inc. http://www.nexb.com/ - All rights reserved.
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/SPECIFICATION.rst b/SPECIFICATION.rst
@@ -1,4 +1,4 @@
-ABOUT File Specification v3.1.3
+ABOUT File Specification v3.1.4
 
 
 Purpose
@@ -197,6 +197,15 @@ above the ABOUT file directory, using a relative POSIX path::
     licenses:
         -   file: ../docs/ruby.README
 
+In addition, there may be cases that a license can have 2 or more referenced license files.
+If this is the case, a comma ',' is used to identify multiple files
+For instance::
+
+    license_expression: gpl-2.0-plus
+    licenses:
+        -   key: gpl-2.0-plus
+            file: COPYING, COPYING.LESSER
+
 Field referencing a URL
 ~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/about.ABOUT b/about.ABOUT
@@ -1,10 +1,10 @@
 about_resource: .
 name: AboutCode-toolkit
-version: 3.4.0.pre1
+version: 4.0.0
 author:
     - >-
         Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez
-copyright: Copyright (c) 2013-2017 nexB Inc.
+copyright: Copyright (c) 2013-2019 nexB Inc.
 description: |-
     AboutCode Toolkit is a tool to process ABOUT files. An ABOUT file
     provides a simple way to document the provenance (origin and license)

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -1,6 +1,6 @@
-2019-XX-XX
+2019-10-09
 
-    Release 4.0.0.pre1
+    Release 4.0.0
 
     * Support filenames/path with special characters #310 #378 #392
     * Update ABOUT file format to match the specification
@@ -19,7 +19,7 @@
     * New UrlListField introduced for list of urls
     * The UrlField is now only taking single URL value
     * The owner is now a StringField instead of ListField
-    * Format the ordering of the genreated ABOUT file (See https://github.com/nexB/aboutcode-toolkit/issues/349#issuecomment-438871444)
+    * Format the ordering of the generated ABOUT file (See https://github.com/nexB/aboutcode-toolkit/issues/349#issuecomment-438871444)
     * '+' and '(' and ')' is now supported in license_expression
     * The key 'about_resource_path' is removed
     * Revert back the requirement of the 'name' field

diff --git a/docs/UsingAboutCodetoDocumentYourSoftwareAssets.md b/docs/UsingAboutCodetoDocumentYourSoftwareAssets.md
diff --git a/docs/UsingAboutCodetoDocumentYourSoftwareAssets.pdf b/docs/UsingAboutCodetoDocumentYourSoftwareAssets.pdf
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def read(*names, **kwargs):
 
 setup(
     name='aboutcode-toolkit',
-    version='4.0.0.pre1',
+    version='4.0.0',
     license='Apache-2.0',
     description=(
         'AboutCode-toolkit is a tool to document the provenance (origin and license) of '

diff --git a/src/attributecode/__init__.py b/src/attributecode/__init__.py
@@ -2,7 +2,7 @@
 # -*- coding: utf8 -*-
 
 # ============================================================================
-#  Copyright (c) 2013-2017 nexB Inc. http://www.nexb.com/ - All rights reserved.
+#  Copyright (c) 2013-2019 nexB Inc. http://www.nexb.com/ - All rights reserved.
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
@@ -31,9 +31,9 @@
 
 import saneyaml
 
-__version__ = '4.0.0.pre1'
+__version__ = '4.0.0'
 
-__about_spec_version__ = '3.1'
+__about_spec_version__ = '3.1.4'
 
 __copyright__ = """
 Copyright (c) 2013-2019 nexB Inc. All rights reserved. http://dejacode.org