Merge branch 'develop'

Author: chinyeungli

README.rst

@@ -10,7 +10,6 @@ third-party software components that you use in your project.
 You start by storing ABOUT files (a small YAML formatted text file with field/value pairs)
 side-by-side with each of the third-party software components you use.
 Each ABOUT file documents origin and license for one software.
-For more information on the ABOUT file format, visit http://www.dejacode.org
 There are many examples of ABOUT files (valid or invalid) in the testdata/
 directory of the whole repository.
 

REFERENCE.rst

@@ -83,8 +83,8 @@ Options
     $ about attrib --vartext "title=Attribution Notice" --vartext "header=Product 101" LOCATION OUTPUT
 
         Users can use the following in the template to get the vartext:
-        {{ vartext_dict['title'] }}
-        {{ vartext_dict['header'] }} 
+        {{ variables['title'] }}
+        {{ variables['header'] }} 
 
     --verbose
 

about.ABOUT

@@ -1,8 +1,8 @@
 about_resource: .
 name: AboutCode-toolkit
-version: 4.0.1
+version: 4.0.2
 author: Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez
-copyright: Copyright (c) 2013-2019 nexB Inc.
+copyright: Copyright (c) 2013-2020 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)

docs/CHANGELOG.rst

@@ -1,3 +1,11 @@
+2020-05-05
+    Release 4.0.2
+
+    * Upgrade license-expression library to v1.2
+    * Fix the missing `multi_sort` filter for Jinja2
+    * Update help text for `--vartext`
+
+
 2019-10-17
     Release 4.0.1
 

setup.py

@@ -24,7 +24,7 @@ def read(*names, **kwargs):
 
 setup(
     name='aboutcode-toolkit',
-    version='4.0.1',
+    version='4.0.2',
     license='Apache-2.0',
     description=(
         'AboutCode-toolkit is a tool to document the provenance (origin and license) of '

src/attributecode/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf8 -*-
 
 # ============================================================================
-#  Copyright (c) 2013-2019 nexB Inc. http://www.nexb.com/ - All rights reserved.
+#  Copyright (c) 2013-2020 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,12 +31,12 @@
 
 import saneyaml
 
-__version__ = '4.0.1'
+__version__ = '4.0.2'
 
 __about_spec_version__ = '3.1.4'
 
 __copyright__ = """
-Copyright (c) 2013-2019 nexB Inc. All rights reserved. http://dejacode.org
+Copyright (c) 2013-2020 nexB Inc. All rights reserved. http://dejacode.org
 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

src/attributecode/attrib.py

@@ -2,7 +2,7 @@
 # -*- coding: utf8 -*-
 
 # ============================================================================
-#  Copyright (c) 2013-2019 nexB Inc. http://www.nexb.com/ - All rights reserved.
+#  Copyright (c) 2013-2020 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
@@ -32,6 +32,7 @@
 from attributecode.licenses import COMMON_LICENSES
 from attributecode.model import parse_license_expression
 from attributecode.util import add_unc
+from attributecode.attrib_util import multi_sort
 
 
 DEFAULT_TEMPLATE_FILE = os.path.join(
@@ -145,6 +146,7 @@ def check_template(template_string):
     message) if the template is invalid or None if it is valid.
     """
     try:
+        jinja2.filters.FILTERS['multi_sort'] = multi_sort
         jinja2.Template(template_string)
     except (jinja2.TemplateSyntaxError, jinja2.TemplateAssertionError) as e:
         return e.lineno, e.message

src/attributecode/cmd.py

@@ -107,7 +107,7 @@ def about():
 
 def validate_key_values(ctx, param, value):
     """
-    Return the a dict of {key: [values,...] if valid or raise a UsageError
+    Return the a dict of {key: value} if valid or raise a UsageError
     otherwise.
     """
     if not value:
@@ -523,7 +523,7 @@ def get_error_messages(errors, quiet=False, verbose=False):
 def parse_key_values(key_values):
     """
     Given a list of "key=value" strings, return:
-    - a dict {key: [value, value, ...]}
+    - a dict {key: value}
     - a sorted list of unique error messages for invalid entries where there is
       a missing a key or value.
     """
@@ -545,9 +545,7 @@ def parse_key_values(key_values):
             errors.add('missing <value> in "{key_value}".'.format(**locals()))
             continue
 
-        values = parsed_key_values[key]
-        if value not in values:
-            parsed_key_values[key].append(value)
+        parsed_key_values[key] = value
 
     return dict(parsed_key_values), sorted(errors)
 

tests/test_cmd.py

@@ -307,8 +307,8 @@ def test_parse_key_values_simple(self):
             'keY=bar',
         ]
         expected = {
-            'key': ['value', 'bar'],
-            'this': ['THat']
+            'key': 'bar',
+            'this': 'THat'
             }
         keyvals, errors = cmd.parse_key_values(test)
         assert expected == keyvals
@@ -323,7 +323,7 @@ def test_parse_key_values_with_errors(self):
             'FOO=bar'
         ]
         expected = {
-            'foo': ['bar'],
+            'foo': 'bar',
         }
         keyvals, errors = cmd.parse_key_values(test)
         assert expected == keyvals