diff --git a/.travis.yml b/.travis.yml index fedc47d..afd1a50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,25 +7,29 @@ os: - linux env: - matrix: - - PYTHON_EXE="`pyenv install -s 2.7.13 && pyenv local 2.7.13`" - - PYTHON_EXE="`pyenv install -s 3.5.3 && pyenv local 3.5.3`" - - PYTHON_EXE="`pyenv install -s 3.6.1 && pyenv local 3.6.1`" + matrix: + - PYTHON_EXE="`pyenv install -s 2.7.13 && pyenv local 2.7.13`" + - PYTHON_EXE="`pyenv install -s 3.5.3 && pyenv local 3.5.3`" + - PYTHON_EXE="`pyenv install -s 3.6.1 && pyenv local 3.6.1`" install: - - pyenv install --list - - ./configure + - pyenv install --list + - ./configure + +before_script: + - pip install aboutcode-toolkit + - about-code check --show-all . script: - - "bin/py.test -vvs" + - "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}" + 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}" diff --git a/README.rst b/README.rst index 65e78f9..77f24fb 100644 --- a/README.rst +++ b/README.rst @@ -11,7 +11,7 @@ https://spdx.org/sites/cpstandard/files/pages/files/spdxversion2.1.pdf#page=95&z license: apache-2.0 -Python: 2.7 and 3.4+ +Python: 2.7 and 3.5+ Build and tests status ====================== diff --git a/etc/scripts/irc-notify.py.ABOUT b/etc/scripts/irc-notify.py.ABOUT index 9bf9c6d..cca515e 100644 --- a/etc/scripts/irc-notify.py.ABOUT +++ b/etc/scripts/irc-notify.py.ABOUT @@ -1,22 +1,11 @@ +about_resource: irc-notify.py name: irc-notify.py version: def54f8166089b733d166665fdabcad4cdc526d8 download_url: https://raw.githubusercontent.com/gridsync/gridsync/def54f8166089b733d166665fdabcad4cdc526d8/misc/irc-notify.py description: Quick and dirty IRC notification script. -home_url: https://github.com/gridsync/gridsync +homepage_url: https://github.com/gridsync/gridsync owner: Christopher R. Wood copyright: Copyright (C) 2015-2016 Christopher R. Wood -dje_license_key: gpl-2.0-plus -license_text_file: gpl-2.0.LICENSE -notice_text: | - This program is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 2 of the License, or (at your option) any later - version. - - This program is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with this - program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, - Fifth Floor, Boston, MA 02110-1301 USA. +license_expression: gpl-2.0-plus +license_file: gpl-2.0.LICENSE +notice_file: irc-notify.py.NOTICE \ No newline at end of file diff --git a/etc/scripts/irc-notify.py.NOTICE b/etc/scripts/irc-notify.py.NOTICE new file mode 100644 index 0000000..7c28423 --- /dev/null +++ b/etc/scripts/irc-notify.py.NOTICE @@ -0,0 +1,12 @@ +This program is free software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any later +version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this +program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/license-expression.ABOUT b/license-expression.ABOUT index ddf6fb1..ac3771a 100644 --- a/license-expression.ABOUT +++ b/license-expression.ABOUT @@ -3,7 +3,7 @@ name: license-expression copyright: Copyright (c) 2017 nexB Inc. and others. -dje_license: apache-2.0 -license_text_file: apache-2.0.LICENSE +license_expression: apache-2.0 +license_file: apache-2.0.LICENSE -home_url: https://github.com/nexB/license-expression +homepage_url: https://github.com/nexB/license-expression diff --git a/src/license_expression/_pyahocorasick.ABOUT b/src/license_expression/_pyahocorasick.ABOUT index 720c0a8..f57983a 100644 --- a/src/license_expression/_pyahocorasick.ABOUT +++ b/src/license_expression/_pyahocorasick.ABOUT @@ -3,8 +3,8 @@ download_url: https://github.com/WojciechMula/pyahocorasick/tree/ec2fb9cb393f571 name: pyahocorasick-python version: ec2fb9 -home_url: https://github.com/WojciechMula/pyahocorasick -dje_license: public-domain +homepage_url: https://github.com/WojciechMula/pyahocorasick +license_expression: public-domain copyright: originally authored by Wojciech Mula, modified by the license_expression authors. diff --git a/thirdparty/base/certifi.ABOUT b/thirdparty/base/certifi.ABOUT index 3c76447..78c3a43 100644 --- a/thirdparty/base/certifi.ABOUT +++ b/thirdparty/base/certifi.ABOUT @@ -7,8 +7,8 @@ download_url: https://pypi.python.org/packages/eb/01/c1f58987b777d6c4ec535b4e004 name: certifi owner: Kenneth Reitz contact: me@kennethreitz.com -home_url: http://certifi.io/ +homepage_url: http://certifi.io/ -dje_license: mpl-2.0 -license_text_file: mpl-2.0.LICENSE +license_expression: mpl-2.0 +license_file: mpl-2.0.LICENSE notice_file: certifi.NOTICE \ No newline at end of file diff --git a/thirdparty/base/pip.ABOUT b/thirdparty/base/pip.ABOUT index af01588..2bd06a8 100644 --- a/thirdparty/base/pip.ABOUT +++ b/thirdparty/base/pip.ABOUT @@ -5,11 +5,10 @@ version: 9.0.1 name: pip owner: The pip developers contact: python-virtualenv@groups.google.com -home_url: http://www.pip-installer.org +homepage_url: http://www.pip-installer.org -author_file: pip.AUTHORS -dje_license: mit, OTHER TODO -license_text_file: pip.LICENSE +license_expression: mit, OTHER TODO +license_file: pip.LICENSE vcs_tool: git vcs_repository: https://github.com/pypa/pip.git diff --git a/thirdparty/base/pip.AUTHORS b/thirdparty/base/pip.AUTHORS deleted file mode 100644 index 321c6a5..0000000 --- a/thirdparty/base/pip.AUTHORS +++ /dev/null @@ -1,134 +0,0 @@ -Adam Wentz -Alex Gaynor -Alex Grönholm -Alex Morega -Alexandre Conrad -Anatoly Techtonik -Andrei Geacar -Andrey Bulgakov -Anrs Hu -Anton Patrushev -Antti Kaihola -Armin Ronacher -Ashley Manton -Baptiste Mispelon -Ben Darnell -Ben Rosser -Bernardo B. Marques -Bradley Ayers -Brian Rosner -Carl Meyer -Chris McDonough -Christian Oudard -Clay McClure -Cody Soyland -Craig Kerstiens -Cristian Sorinel -Dan Sully -Daniel Holth -Daniel Jost -Dave Abrahams -David Aguilar -David Black -David Evans -David Pursehouse -Dmitry Gladkov -Donald Stufft -Dongweiming -Endoh Takanao -enoch -Erik M. Bray -Francesco -Gabriel de Perthuis -Garry Polley -Geoffrey Lehée -George Song -Georgi Valkov -Herbert Pfennig -Hsiaoming Yang -Hugo Lopes Tavares -Hynek Schlawack -Ian Bicking -Igor Sobreira -Ilya Baryshev -Ionel Maries Cristian -Jakub Stasiak -Jakub Vysoky -James Cleveland -Jannis Leidel -Jay Graves -Jeff Dairiki -Jim Garrison -John-Scott Atlakson -Jon Parise -Jonas Nockert -Jorge Niedbalski -Josh Bronson -Josh Hansen -Kamal Bin Mustafa -Kelsey Hightower -Kenneth Belitzky -Kenneth Reitz -Kevin Frommelt -Kumar McMillan -Lev Givon -Lincoln de Sousa -Luke Macken -Marc Abramowitz -Marc Tamlyn -Marcus Smith -Markus Hametner -Masklinn -Matt Maker -Matthew Iversen -Maxime Rouyrre -Michael Williamson -Miguel Araujo Perez -Monty Taylor -Nick Stenning -Nowell Strite -Oliver Tonnhofer -Olivier Girardot -Ollie Rutherfurd -Oren Held -Oscar Benjamin -Patrick Dubroy -Patrick Jenkins -Paul Moore -Paul Nasrat -Paul Oswald -Paul van der Linden -Peter Waller -Phil Freo -Phil Whelan -Piet Delport -Preston Holmes -Przemek Wrzos -Qiangning Hong -Rafael Caricio -Ralf Schmitt -Rene Dudfield -Roey Berman -Ronny Pfannschmidt -Rory McCann -Ross Brattain -Sergey Vasilyev -Seth Woodworth -Simon Cross -Stavros Korokithakis -Stefan Scherfke -Steven Myint -Stéphane Klein -Takayuki SHIMIZUKAWA -Thomas Fenzl -Thomas Johansson -Toshio Kuratomi -Travis Swicegood -Vinay Sajip -Vitaly Babiy -W. Trevor King -Wil Tan -Yoval P -Yu Jian -Zearin -Zhiping Deng \ No newline at end of file diff --git a/thirdparty/base/setuptools.ABOUT b/thirdparty/base/setuptools.ABOUT index 4448760..c31b4b9 100644 --- a/thirdparty/base/setuptools.ABOUT +++ b/thirdparty/base/setuptools.ABOUT @@ -7,7 +7,7 @@ download_url: https://pypi.python.org/packages/fc/cb/748dcabb152fbc7eceaf585d052 name: setuptools owner: Python Packaging Authority contact: distutils-sig@python.org -home_url: https://pypi.python.org/pypi/setuptools +homepage_url: https://pypi.python.org/pypi/setuptools -dje_license: mit -license_text_file: setuptools.LICENSE \ No newline at end of file +license_expression: mit +license_file: setuptools.LICENSE \ No newline at end of file diff --git a/thirdparty/base/six.ABOUT b/thirdparty/base/six.ABOUT index 1138733..619b7ce 100644 --- a/thirdparty/base/six.ABOUT +++ b/thirdparty/base/six.ABOUT @@ -4,9 +4,9 @@ download_url: https://pypi.python.org/packages/py2.py3/s/six/six-1.10.0-py2.py3- name: six description: Python 2 and 3 compatibility utilities -home_url: http://bitbucket.org/gutworth/six -dje_license: mit -license_text_file: six.LICENSE +homepage_url: http://bitbucket.org/gutworth/six +license_expression: mit +license_file: six.LICENSE owner: Benjamin Peterson contact: http://www.benjamin-peterson.org/ diff --git a/thirdparty/base/virtualenv.ABOUT b/thirdparty/base/virtualenv.ABOUT index 0f32a5e..8b632dd 100644 --- a/thirdparty/base/virtualenv.ABOUT +++ b/thirdparty/base/virtualenv.ABOUT @@ -6,12 +6,12 @@ vcs_tool: git vcs_repository: https://github.com/pypa/virtualenv.git name: virtualenv -home_url: http://virtualenv.org/ +homepage_url: http://virtualenv.org/ owner: The virtualenv developers license_url: https://raw.github.com/pypa/virtualenv/develop/LICENSE.txt -license_text_file: virtualenv.LICENSE -dje_license: mit +license_file: virtualenv.LICENSE +license_expression: mit copyright: Copyright (c) 2007 Ian Bicking and Contributors Copyright (c) 2009 Ian Bicking, The Open Planning Project Copyright (c) 2011-2015 The virtualenv developers diff --git a/thirdparty/base/virtualenv.py.ABOUT b/thirdparty/base/virtualenv.py.ABOUT index e9bc39c..640f01b 100644 --- a/thirdparty/base/virtualenv.py.ABOUT +++ b/thirdparty/base/virtualenv.py.ABOUT @@ -6,12 +6,12 @@ vcs_tool: git vcs_repository: https://github.com/pypa/virtualenv.git name: virtualenv -home_url: http://virtualenv.org/ +homepage_url: http://virtualenv.org/ owner: The virtualenv developers license_url: https://raw.github.com/pypa/virtualenv/develop/LICENSE.txt -license_text_file: virtualenv.LICENSE -dje_license: mit +license_file: virtualenv.LICENSE +license_expression: mit copyright: Copyright (c) 2007 Ian Bicking and Contributors Copyright (c) 2009 Ian Bicking, The Open Planning Project Copyright (c) 2011-2015 The virtualenv developers diff --git a/thirdparty/base/wheel.ABOUT b/thirdparty/base/wheel.ABOUT index 42c0b92..b9f7fed 100644 --- a/thirdparty/base/wheel.ABOUT +++ b/thirdparty/base/wheel.ABOUT @@ -3,10 +3,10 @@ version: 0.30.0a0 download_url: https://pypi.python.org/packages/83/53/e120833aa2350db333df89a40dea3b310dd9dabf6f29eaa18934a597dc79/wheel-0.30.0a0-py2.py3-none-any.whl#md5=ffa1ee60be515c04b4c13fd13feea27a name: wheel -home_url: https://bitbucket.org/pypa/wheel +homepage_url: https://bitbucket.org/pypa/wheel vcs_tool: hg vcs_repository: https://bitbucket.org/pypa/wheel copyright: copyright (c) 2012-2014 Daniel Holth and contributors. -dje_license: mit -license_text_file: wheel.LICENSE \ No newline at end of file +license_expression: mit +license_file: wheel.LICENSE \ No newline at end of file diff --git a/thirdparty/base/wincertstore.ABOUT b/thirdparty/base/wincertstore.ABOUT index d664865..4064dd7 100644 --- a/thirdparty/base/wincertstore.ABOUT +++ b/thirdparty/base/wincertstore.ABOUT @@ -4,10 +4,10 @@ download_url: https://pypi.python.org/packages/2.7/w/wincertstore/wincertstore-0 name: wincertstore -dje_license: psf -license_text_file: wincertstore.LICENSE +license_expression: psf +license_file: wincertstore.LICENSE contact: christian@python.org owner: Christian Heimes -home_url: https://bitbucket.org/tiran/wincertstore +homepage_url: https://bitbucket.org/tiran/wincertstore description: Python module to extract CA and CRL certs from Windows' cert store (ctypes based). diff --git a/thirdparty/dev/apipkg.ABOUT b/thirdparty/dev/apipkg.ABOUT index af140f9..c0b1b14 100644 --- a/thirdparty/dev/apipkg.ABOUT +++ b/thirdparty/dev/apipkg.ABOUT @@ -3,8 +3,8 @@ download_url: https://pypi.python.org/packages/94/72/fd4f2e46ce7b0d388191c819ef6 version: 1.4.1 name: apipkg -home_url: https://bitbucket.org/hpk42/apipkg +homepage_url: https://bitbucket.org/hpk42/apipkg owner: Holger Krekel -dje_license: mit -license_text_file: apipkg.LICENSE +license_expression: mit +license_file: apipkg.LICENSE copyright: Copyright (c) 2009 holger krekel diff --git a/thirdparty/dev/colorama.ABOUT b/thirdparty/dev/colorama.ABOUT index 2a3e734..978b1a6 100644 --- a/thirdparty/dev/colorama.ABOUT +++ b/thirdparty/dev/colorama.ABOUT @@ -4,9 +4,8 @@ version: 0.3.9 name: colorama description: Cross-platform colored terminal text. -home_url: https://github.com/tartley/colorama +homepage_url: https://github.com/tartley/colorama owner: Jonathan Hartley contact: tartley@tartley.com -dje_license: bds-new -keywords: color colour terminal text ansi windows crossplatform xplatform -license_text_file: colorama.LICENSE +license_expression: bds-new +license_file: colorama.LICENSE diff --git a/thirdparty/dev/pluggy.ABOUT b/thirdparty/dev/pluggy.ABOUT index 584f788..9cb87f3 100644 --- a/thirdparty/dev/pluggy.ABOUT +++ b/thirdparty/dev/pluggy.ABOUT @@ -4,8 +4,8 @@ version: 0.4.0 name: pluggy description: plugin and hook calling mechanisms for python -home_url: https://github.com/pytest-dev/pluggy +homepage_url: https://github.com/pytest-dev/pluggy owner: Holger Krekel contact: holger at merlinux.eu -dje_license: mit -license_text_file: pluggy.LICENSE \ No newline at end of file +license_expression: mit +license_file: pluggy.LICENSE \ No newline at end of file diff --git a/thirdparty/dev/py.ABOUT b/thirdparty/dev/py.ABOUT index ac878af..65b0863 100644 --- a/thirdparty/dev/py.ABOUT +++ b/thirdparty/dev/py.ABOUT @@ -4,9 +4,9 @@ download_url: https://pypi.python.org/packages/53/67/9620edf7803ab867b175e4fd23c name: py description: library with cross-python path, ini-parsing, io, code, log facilities -home_url: http://py.readthedocs.org/ +homepage_url: http://py.readthedocs.org/ owner: holger krekel, Ronny Pfannschmidt, Benjamin Peterson and others -contatct: pytest-dev@python.org -dje_license: mit -license_text_file: py.LICENSE +contact: pytest-dev@python.org +license_expression: mit +license_file: py.LICENSE copyright: copyright (c) 2004-2014 Holger Krekel and others diff --git a/thirdparty/dev/pytest.ABOUT b/thirdparty/dev/pytest.ABOUT index db705db..e245945 100644 --- a/thirdparty/dev/pytest.ABOUT +++ b/thirdparty/dev/pytest.ABOUT @@ -3,10 +3,10 @@ download_url: https://pypi.python.org/packages/43/67/bd3a6148fc8a2d989ded3af3191 version: 3.1.1 name: pytest -description: pytest: simple powerful testing with Python -home_url: http://pytest.org +description: "pytest: simple powerful testing with Python" +homepage_url: http://pytest.org owner: Holger Krekel, Benjamin Peterson, Ronny Pfannschmidt, Floris Bruynooghe and others contact: holger at merlinux.eu -dje_license: mit -license_text_file: pytest.LICENSE +license_expression: mit +license_file: pytest.LICENSE copyright: Copyright Holger Krekel and others, 2004-2014 diff --git a/thirdparty/dev/tox.ABOUT b/thirdparty/dev/tox.ABOUT index 0cc681d..b9d90cc 100644 --- a/thirdparty/dev/tox.ABOUT +++ b/thirdparty/dev/tox.ABOUT @@ -4,8 +4,8 @@ version: 2.7.0 name: tox description: virtualenv-based automation of test activities -home_url: https://tox.readthedocs.org/ +homepage_url: https://tox.readthedocs.org/ owner: Holger Krekel contact: holger@merlinux.eu -dje_license: mit -license_text_file: tox.LICENSE +license_expression: mit +license_file: tox.LICENSE diff --git a/thirdparty/prod/boolean.py.ABOUT b/thirdparty/prod/boolean.py.ABOUT index 220bf74..31eb628 100644 --- a/thirdparty/prod/boolean.py.ABOUT +++ b/thirdparty/prod/boolean.py.ABOUT @@ -5,7 +5,7 @@ download_url: https://pypi.python.org/packages/80/f3/0508ae7ba76b02f7fd666b70576 name: boolean.py copyright: Copyright (c) 2009-2016 Sebastian Kraemer, basti.kr@gmail.com and others -dje_license: bsd-simplified -license_text_file: boolean.py.LICENSE +license_expression: bsd-simplified +license_file: boolean.py.LICENSE -home_url: https://github.com/bastikr/boolean.py +homepage_url: https://github.com/bastikr/boolean.py