diff --git a/.travis.yml b/.travis.yml index 3b25e1dc..54a235da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,26 @@ language: python + python: -- '2.7' + - '2.7' + +env: + global: + - PYTEST="bin/py.test -n 2 -vvs" + + matrix: + - TEST_SUITE="$PYTEST" + - TEST_SUITE="./etc/release/release.sh" + install: - ./configure -script: bin/py.test -n 2 + +script: + - $TEST_SUITE + notifications: slack: on_success: always on_failure: always rooms: - - secure: VODG+P5REBhL7psD3XydwJBbEpB+3HBKsmEIHEgxrdPDvY/KDP35JTpJdkzhb+nc7EvIPdgVbVcpbiacDtXOskk4Si7X9sAXnQt+P0LTol5Pk0/qbC5BlS+HebPB5LUmUv4gYBhyLHbWvxOrBOJ9K7fNuH2I1+NWRUzHUWmlNwqwVvWZwuFNISVEqVvVP/+a9NUYJLYKR9h6TOXjCCVUdOfho4RW/0MPG5+R337QgaAFzoi90Ug3vR/IU29e1PMWbAxgxMVcDt+cSdqcu7mkn6esPIglxFW4rW2qWZFLRfOdJqvq0QTvx/zK2BYl1U5fHxyslb5eO1UhzfQjpSQcgy/Ex7K62YB7B6hVaOWg7j7/3+hbVARe0MKOFwDYEeQkLA5PQcquk7rAvnr2QfAesENXDIzxL/ghXzB94JAqm4pcElMfZIV/H9+5FSsW1OmOEF2g+HnytyCYGyRFZIgKahVHt+QUFXny9D53UujqqZe4Za223D4tRCToHkKpHvRkbPP66XRSxHDuoLRzO3hJLHAxHfoV+1rIkFq+ymryaobUX1kojHx8ihRDZn/ptNGIIm+GGDBQQwXcjf0oQW4keeKnA9bvi5MtHIjpGEZimW0UK1EvgtP0cN/xBEr2EHJDinFYpWoF1zX61P/S34z6OOAlt8NARLyZy/R+9ck8lRQ= + - secure: VODG+P5REBhL7psD3XydwJBbEpB+3HBKsmEIHEgxrdPDvY/KDP35JTpJdkzhb+nc7EvIPdgVbVcpbiacDtXOskk4Si7X9sAXnQt+P0LTol5Pk0/qbC5BlS+HebPB5LUmUv4gYBhyLHbWvxOrBOJ9K7fNuH2I1+NWRUzHUWmlNwqwVvWZwuFNISVEqVvVP/+a9NUYJLYKR9h6TOXjCCVUdOfho4RW/0MPG5+R337QgaAFzoi90Ug3vR/IU29e1PMWbAxgxMVcDt+cSdqcu7mkn6esPIglxFW4rW2qWZFLRfOdJqvq0QTvx/zK2BYl1U5fHxyslb5eO1UhzfQjpSQcgy/Ex7K62YB7B6hVaOWg7j7/3+hbVARe0MKOFwDYEeQkLA5PQcquk7rAvnr2QfAesENXDIzxL/ghXzB94JAqm4pcElMfZIV/H9+5FSsW1OmOEF2g+HnytyCYGyRFZIgKahVHt+QUFXny9D53UujqqZe4Za223D4tRCToHkKpHvRkbPP66XRSxHDuoLRzO3hJLHAxHfoV+1rIkFq+ymryaobUX1kojHx8ihRDZn/ptNGIIm+GGDBQQwXcjf0oQW4keeKnA9bvi5MtHIjpGEZimW0UK1EvgtP0cN/xBEr2EHJDinFYpWoF1zX61P/S34z6OOAlt8NARLyZy/R+9ck8lRQ= email: false diff --git a/NOTICE b/NOTICE index aa8ae413..b762628c 100644 --- a/NOTICE +++ b/NOTICE @@ -1,7 +1,7 @@ Software license ================ -Copyright (c) 2017 nexB Inc. and others. All rights reserved. +Copyright (c) 2017-2018 nexB Inc. and others. All rights reserved. http://nexb.com and https://github.com/nexB/deltacode/ The DeltaCode software is licensed under the Apache License version 2.0. Data generated with DeltaCode require an acknowledgment. diff --git a/README.rst b/README.rst index 4326c315..24264917 100644 --- a/README.rst +++ b/README.rst @@ -30,10 +30,9 @@ For example:: -Once you have the two codebase scans, simply install/configure -deltacode, and run it on the two scans:: +Once you have the two codebase scans, simply run deltacode on the two scans:: - (deltacode) $ deltacode --help + $ ./deltacode --help Usage: deltacode [OPTIONS] Identify the changes that need to be made to the 'old' scan file (-o or @@ -54,7 +53,7 @@ deltacode, and run it on the two scans:: files in the .json or .csv output. If not selected, only changed files are included. - (deltacode) $ deltacode -n ~/psql-10.0-fileinfo.json -o ~/psql-9.6-fileinfo.json -j ~/psql-10.0-psql-9.6-delta.json + $ ./deltacode -n ~/psql-10.0-fileinfo.json -o ~/psql-9.6-fileinfo.json -j ~/psql-10.0-psql-9.6-delta.json ========= Problems? diff --git a/configure b/configure index 772ec6ac..56425d22 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017 nexB Inc. http://www.nexb.com/ - All rights reserved. +# Copyright (c) 2017-2018 nexB Inc. http://www.nexb.com/ - All rights reserved. # ################################ # change these variables to customize this script locally diff --git a/configure.bat b/configure.bat index 23ba25ae..cefa461e 100644 --- a/configure.bat +++ b/configure.bat @@ -1,6 +1,6 @@ @echo OFF -@rem Copyright (c) 2015 nexB Inc. http://www.nexb.com/ - All rights reserved. +@rem Copyright (c) 2015-2018 nexB Inc. http://www.nexb.com/ - All rights reserved. @rem ################################ @rem # change these variables to customize this script locally diff --git a/deltacode.ABOUT b/deltacode.ABOUT index 0897e755..7be6fe49 100644 --- a/deltacode.ABOUT +++ b/deltacode.ABOUT @@ -16,4 +16,4 @@ license: apache-2.0 license_text_file: apache-2.0.LICENSE notice_file: NOTICE -copyright: Copyright (c) 2017 nexB Inc. and others +copyright: Copyright (c) 2017-2018 nexB Inc. and others diff --git a/etc/conf/base.py b/etc/conf/base.py index 14a10ef2..8df435d5 100644 --- a/etc/conf/base.py +++ b/etc/conf/base.py @@ -8,8 +8,8 @@ def unsupported(): print('Unsupported OS/platform.') - print('See https://github.com/nexB/scancode-toolkit/ for supported OS/platforms.') - print('Enter a ticket https://github.com/nexB/scancode-toolkit/issues asking for support of your OS/platform combo.') + print('See https://github.com/nexB/deltacode/ for supported OS/platforms.') + print('Enter a ticket https://github.com/nexB/deltacode/issues asking for support of your OS/platform combo.') sys.exit(1) if sys.maxsize > 2 ** 32: @@ -36,4 +36,4 @@ def unsupported(): arches = supported_combos[os] if arch not in arches: - unsupported() \ No newline at end of file + unsupported() diff --git a/etc/configure.py b/etc/configure.py index 8bf4b9e2..4426d5f7 100644 --- a/etc/configure.py +++ b/etc/configure.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright (c) 2015 nexB Inc. http://www.nexb.com/ - All rights reserved. +# Copyright (c) 2018 nexB Inc. http://www.nexb.com/ - All rights reserved. """ This script a configuration helper to select pip requirement files to install diff --git a/etc/release/release.sh b/etc/release/release.sh index 7aec2f97..feb466d4 100755 --- a/etc/release/release.sh +++ b/etc/release/release.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017 nexB Inc. http://www.nexb.com/ - All rights reserved. +# Copyright (c) 2018 nexB Inc. http://www.nexb.com/ - All rights reserved. # # ScanCode release script diff --git a/setup.py b/setup.py index bddf296a..fea30146 100644 --- a/setup.py +++ b/setup.py @@ -75,8 +75,8 @@ def read(*names, **kwargs): name='deltacode', version=get_version(), license='Apache-2.0', - description='Delta-related utilities.', - long_description='Delta-related utilities.', + description='Utility for comparing codebases using scancode-toolkit', + long_description=read('README.rst'), author='nexB Inc.', author_email='info@nexb.com', url='https://github.com/nexb/deltacode', @@ -89,9 +89,7 @@ def read(*names, **kwargs): # complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', - 'Operating System :: POSIX :: Linux', - 'Operating System :: MacOS :: MacOS X', - 'Operating System :: Microsoft :: Windows', + 'License :: OSI Approved :: Apache Software License', 'Programming Language :: Python', 'Programming Language :: Python :: 2.7', 'Topic :: Utilities', diff --git a/src/deltacode/NOTICE b/src/deltacode/NOTICE index aa8ae413..b762628c 100644 --- a/src/deltacode/NOTICE +++ b/src/deltacode/NOTICE @@ -1,7 +1,7 @@ Software license ================ -Copyright (c) 2017 nexB Inc. and others. All rights reserved. +Copyright (c) 2017-2018 nexB Inc. and others. All rights reserved. http://nexb.com and https://github.com/nexB/deltacode/ The DeltaCode software is licensed under the Apache License version 2.0. Data generated with DeltaCode require an acknowledgment. diff --git a/src/deltacode/__init__.py b/src/deltacode/__init__.py index a8503410..bc79838e 100644 --- a/src/deltacode/__init__.py +++ b/src/deltacode/__init__.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2017 nexB Inc. and others. All rights reserved. +# Copyright (c) 2017-2018 nexB Inc. and others. All rights reserved. # http://nexb.com and https://github.com/nexB/deltacode/ # The DeltaCode software is licensed under the Apache License version 2.0. # Data generated with DeltaCode require an acknowledgment. diff --git a/src/deltacode/cli.py b/src/deltacode/cli.py index 65a5cc0b..669deb62 100644 --- a/src/deltacode/cli.py +++ b/src/deltacode/cli.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2017 nexB Inc. and others. All rights reserved. +# Copyright (c) 2017-2018 nexB Inc. and others. All rights reserved. # http://nexb.com and https://github.com/nexB/deltacode/ # The DeltaCode software is licensed under the Apache License version 2.0. # Data generated with DeltaCode require an acknowledgment. diff --git a/src/deltacode/models.py b/src/deltacode/models.py index f5c9ecae..46d5ce00 100644 --- a/src/deltacode/models.py +++ b/src/deltacode/models.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2017 nexB Inc. and others. All rights reserved. +# Copyright (c) 2017-2018 nexB Inc. and others. All rights reserved. # http://nexb.com and https://github.com/nexB/deltacode/ # The DeltaCode software is licensed under the Apache License version 2.0. # Data generated with DeltaCode require an acknowledgment. diff --git a/src/deltacode/utils.py b/src/deltacode/utils.py index fe4a37cb..9686634f 100644 --- a/src/deltacode/utils.py +++ b/src/deltacode/utils.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2017 nexB Inc. and others. All rights reserved. +# Copyright (c) 2017-2018 nexB Inc. and others. All rights reserved. # http://nexb.com and https://github.com/nexB/deltacode/ # The DeltaCode software is licensed under the Apache License version 2.0. # Data generated with DeltaCode require an acknowledgment. diff --git a/tests/test_cli.py b/tests/test_cli.py index 70617262..97fd6302 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2017 nexB Inc. and others. All rights reserved. +# Copyright (c) 2017-2018 nexB Inc. and others. All rights reserved. # http://nexb.com and https://github.com/nexB/deltacode/ # The DeltaCode software is licensed under the Apache License version 2.0. # Data generated with DeltaCode require an acknowledgment. @@ -42,7 +42,7 @@ def load_csv(location): """ - Copied from https://github.com/nexB/scancode-toolkit/blob/848de9fa4aaa1bd487b1cb36a8559a473e6459af/etc/scripts/test_json2csv.py + Copied from https://github.com/nexB/scancode-toolkit/blob/develop/etc/scripts/test_json2csv.py Load a CSV file at location and return a tuple of (field names, list of rows as mappings field->value). """ @@ -56,7 +56,7 @@ def check_csvs( result_file, expected_file, regen=False): """ - Copied from https://github.com/nexB/scancode-toolkit/blob/848de9fa4aaa1bd487b1cb36a8559a473e6459af/etc/scripts/test_json2csv.py + Copied from https://github.com/nexB/scancode-toolkit/blob/develop/etc/scripts/test_json2csv.py Load and compare two CSVs. `ignore_keys`, a tuple of keys that will be ignored in the comparisons, has been removed from this function as unnecessary. diff --git a/tests/test_deltacode.py b/tests/test_deltacode.py index 484cacc5..d8b50d73 100644 --- a/tests/test_deltacode.py +++ b/tests/test_deltacode.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2017 nexB Inc. and others. All rights reserved. +# Copyright (c) 2017-2018 nexB Inc. and others. All rights reserved. # http://nexb.com and https://github.com/nexB/deltacode/ # The DeltaCode software is licensed under the Apache License version 2.0. # Data generated with DeltaCode require an acknowledgment. diff --git a/tests/test_models.py b/tests/test_models.py index b8c14f6f..0e165f93 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2017 nexB Inc. and others. All rights reserved. +# Copyright (c) 2017-2018 nexB Inc. and others. All rights reserved. # http://nexb.com and https://github.com/nexB/deltacode/ # The DeltaCode software is licensed under the Apache License version 2.0. # Data generated with DeltaCode require an acknowledgment. diff --git a/tests/test_utils.py b/tests/test_utils.py index 9d3ba8ae..5d940e43 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2017 nexB Inc. and others. All rights reserved. +# Copyright (c) 2017-2018 nexB Inc. and others. All rights reserved. # http://nexb.com and https://github.com/nexB/deltacode/ # The DeltaCode software is licensed under the Apache License version 2.0. # Data generated with DeltaCode require an acknowledgment.