Relax YAML version requirements

.travis.yml

@@ -1,22 +1,10 @@
 language: python
 
 python:
-  - "2.7"
   - "3.6"
 
 install:
     - ./configure etc/conf/dev
 
 script:
     - bin/py.test -vvs
-
-notifications:
-    irc:
-        channels:
-          - "chat.freenode.net#aboutcode"
-    on_success: change
-    on_failure: always
-    use_notice: true
-    skip_join: true
-    template:
-      - "%{repository_slug}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} : %{build_url}"

NOTICE

@@ -1,4 +1,4 @@
- Copyright (c) 2013-2020 nexB Inc. http://www.nexb.com/ - All rights reserved.
+ Copyright (c) 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

README.rst

@@ -20,7 +20,7 @@ In addition, this tool is able to generate attribution notices and
 identify redistributable source code used in your project to help you comply
 with open source licenses conditions.
 
-This version of the AboutCode Toolkit follows the ABOUT specification version 3.1.4 at:
+This version of the AboutCode Toolkit follows the ABOUT specification version 3.2.1 at:
 https://github.com/nexB/aboutcode-toolkit/blob/develop/SPECIFICATION.rst
 
 
@@ -38,7 +38,7 @@ Build and tests status
 
 REQUIREMENTS
 ------------
-The AboutCode Toolkit is tested with Python 2.7 and 3.6 on Linux, Mac and Windows.
+The AboutCode Toolkit is tested with Python 3 only on Linux, Mac and Windows.
 You will need to install a Python interpreter if you do not have one already
 installed.
 

about.ABOUT

@@ -1,6 +1,6 @@
 about_resource: .
 name: AboutCode-toolkit
-version: 5.1.0
+version: 6.0.0
 author: Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez
 copyright: Copyright (c) 2013-2020 nexB Inc.
 description: |

about.bat

@@ -1,5 +1,5 @@
 @echo OFF
-@rem  Copyright (c) 2014 nexB Inc. http://www.nexb.com/ - All rights reserved.
+@rem  Copyright (c) nexB Inc. http://www.nexb.com/ - All rights reserved.
 @rem  
 
 

appveyor.yml

@@ -9,9 +9,3 @@ test_script:
     - set
     - bin/activate
     - pytest -vvs tests
-
-on_success:
-  - "python etc/scripts/irc-notify.py aboutcode [{project_name}:{branch}] {short_commit}: \"{message}\" ({author}) {color_green}Succeeded,Details: {build_url},Commit: {commit_url}"
-
-on_failure:
-  - "python etc/scripts/irc-notify.py aboutcode [{project_name}:{branch}] {short_commit}: \"{message}\" ({author}) {color_red}Failed,Details: {build_url},Commit: {commit_url}"

etc/conf/base.txt

@@ -6,15 +6,15 @@ pip
 wincertstore
 
 # used for templating
-jinja2>=2.9.6
-MarkupSafe>=1.0.0
+jinja2
+MarkupSafe
 
-click==6.7
+click
 
 # used by schematics
 six
 
-PyYAML >= 3.0, < 4.0
+saneyaml
 attrs
 
 # license expression support

etc/configure.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2018 nexB Inc. http://www.nexb.com/ - All rights reserved.
+# Copyright (c) nexB Inc. http://www.nexb.com/ - All rights reserved.
 
 """
 This script is a configuration helper to select pip requirement files to install

setup.cfg

@@ -1,11 +1,8 @@
-[bdist_wheel]
-universal = 1
-
 [metadata]
 license_file = NOTICE
 
 [aliases]
-release = clean --all sdist --formats=bztar,zip bdist_wheel 
+release = clean --all sdist bdist_wheel 
 
 [tool:pytest]
 norecursedirs =

setup.py

@@ -1,11 +1,8 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from __future__ import absolute_import
-from __future__ import print_function
-
-from glob import glob
 import io
+from glob import glob
 from os.path import basename
 from os.path import dirname
 from os.path import join
@@ -24,7 +21,7 @@ def read(*names, **kwargs):
 
 setup(
     name='aboutcode-toolkit',
-    version='5.1.0',
+    version='6.0.0',
     license='Apache-2.0',
     description=(
         'AboutCode-toolkit is a tool to document the provenance (origin and license) of '
@@ -49,10 +46,11 @@ def read(*names, **kwargs):
     classifiers=[
         'Development Status :: 4 - Beta',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
@@ -67,23 +65,13 @@ def read(*names, **kwargs):
         'attribution', 'software', 'inventory',
     ],
     install_requires=[
-        'jinja2 >= 2.9, < 3.0',
-
+        'jinja2',
         'click',
-
-        "backports.csv ; python_version<'3.6'",
-
-        # required by saneyaml
-        'PyYAML >= 3.11, <=3.13',
-        'saneyaml',
-
+        'saneyaml >= 0.5.2',
         'boolean.py >= 3.5, < 4.0',
         'license_expression >= 0.94',
         'packageurl_python >= 0.9.0',
     ],
-    extras_require={
-        ":python_version < '3.6'": ['backports.csv'],
-    },
     entry_points={
         'console_scripts': [
             'about=attributecode.cmd:about',