Merge pull request #129 from nexB/bump-scancode

Bump scancode-toolkit to 3.1.0

Author: steven-esser

configure

@@ -1,27 +1,37 @@
 #!/bin/bash
 #
-# Copyright (c) 2017-2018 nexB Inc. http://www.nexb.com/ - All rights reserved.
+# Copyright (c) nexB Inc. http://www.nexb.com/ - All rights reserved.
 #
+
+set -e
+
 ################################
 # change these variables to customize this script locally
 ################################
 # you can define one or more thirdparty dirs, each prefixed with TPP_DIR
-export TPP_DIR_BASE="thirdparty/base"
-export TPP_DIR_PROD="thirdparty/prod"
-export TPP_DIR_DEV="thirdparty/dev"
+export TPP_DIR="thirdparty"
 
 # default configurations for dev
 CONF_DEFAULT="etc/conf/dev"
 #################################
 
 CFG_CMD_LINE_ARGS="$@"
 
-if [ "$1" == "" ]; then
+if [[ "$1" == "" ]]; then
     # default for dev conf if not argument is provided
     CFG_CMD_LINE_ARGS=$CONF_DEFAULT
 fi
 
-python2.7 etc/configure.py $CFG_CMD_LINE_ARGS
-if [ -f "bin/activate" ]; then
-    source bin/activate
+CONFIGURE_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+if [[ "$PYTHON_EXE" == "" ]]; then
+    PYTHON_EXE=python
 fi
+
+$PYTHON_EXE "$CONFIGURE_ROOT_DIR/etc/configure.py" $CFG_CMD_LINE_ARGS
+
+if [ -f "$CONFIGURE_ROOT_DIR/bin/activate" ]; then
+    source "$CONFIGURE_ROOT_DIR/bin/activate"
+fi
+
+set +e

configure.bat

@@ -1,48 +1,114 @@
 @echo OFF
+setlocal
+@rem Copyright (c) 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 # A configuration script for Windows
+@rem # The possible options and arguments are:
+@rem #  --clean : this is exclusive of anything else and cleans the environment
+@rem #    from built and installed files
+@rem #  <some conf path> : this must be the last argument and sets the path to a
+@rem #    configuration directory to use.
+@rem #  --python < path to python.exe> : this must be the first argument and set
+@rem #    the path to the Python executable to use. If < path to python.exe> is
+@rem #    set to "path", then the executable will be the python.exe available
+@rem #    in the PATH.
+@rem ################################
 
 @rem ################################
-@rem # change these variables to customize this script locally
+@rem # Defaults. Change these variables to customize this script locally
 @rem ################################
 @rem # you can define one or more thirdparty dirs, each prefixed with TPP_DIR
-set TPP_DIR_BASE=thirdparty/base
-set TPP_DIR_PROD=thirdparty/prod
-set TPP_DIR_DEV=thirdparty/dev
+set TPP_DIR=thirdparty
 
+@rem # A fallback Python location.
+@rem # To use a given interpreter, you should use the --python option with a
+@rem # value pointing to your Python executable
+set DEFAULT_PYTHON=C:\Python27\python.exe
 
 @rem # default configurations for dev
-set CONF_DEFAULT="etc/conf/dev"
+set "CONF_DEFAULT=etc/conf/dev"
 @rem #################################
 
-set CFG_CMD_LINE_ARGS= 
-@rem Collect/Slurp all command line arguments in a variable
-:collectarg
- if ""%1""=="""" (
-    goto continue
- )
- call set CFG_CMD_LINE_ARGS=%CFG_CMD_LINE_ARGS% %1
- shift
- goto collectarg
+set CFG_ROOT_DIR=%~dp0
+
+set CONFIGURED_PYTHON=%CFG_ROOT_DIR%Scripts\python.exe
+
+set "CFG_CMD_LINE_ARGS= "
+
+python --version
+python -c "import sys;print(sys.executable)"
+
 
-:continue
+@rem parse command line options and arguments 
+if ""%1""=="""" (
+    set CFG_CMD_LINE_ARGS=%CONF_DEFAULT%
+    goto python
+)
+
+if ""%1""==""--clean"" (
+    set CFG_CMD_LINE_ARGS=--clean
+    goto python
+)
 
-@rem default to dev configuration when no args are passed
-if "%CFG_CMD_LINE_ARGS%"==" " (
-    set CFG_CMD_LINE_ARGS="%CONF_DEFAULT%"
-    goto configure
+
+if ""%1""==""--python"" (
+    set PROVIDED_PYTHON=%2
+    if ""%3""=="""" (
+        set CFG_CMD_LINE_ARGS=%CONF_DEFAULT%
+    ) else (
+        set CFG_CMD_LINE_ARGS=%3
+    )
+    goto python
+) else (
+    set CFG_CMD_LINE_ARGS=%1
+    goto python
 )
 
-if "%CFG_CMD_LINE_ARGS%"=="  --init" (
-    set CFG_CMD_LINE_ARGS="%CONF_INIT%"
-    goto configure
+
+@rem Pick a Python interpreter
+:python
+
+if exist "%CONFIGURED_PYTHON%" (
+    if not ""%1""==""--clean"" (
+        @rem we do not want to use the configured Python in clean... it will be deleted
+        set PYTHON_EXECUTABLE=%CONFIGURED_PYTHON%
+        goto run
+    )
 )
 
-:configure
-call c:\Python27\python.exe etc/configure.py %CFG_CMD_LINE_ARGS%
-if exist bin\activate (
-    bin\activate
+if ""%PROVIDED_PYTHON%""==""path"" (
+    @rem use a bare python available in the PATH
+    set PYTHON_EXECUTABLE=python
+    goto run
 )
-goto EOS
 
-:EOS
+if exist "%PROVIDED_PYTHON%" (
+    set PYTHON_EXECUTABLE=%PROVIDED_PYTHON%
+    goto run
+)
+
+if exist %DEFAULT_PYTHON% (
+    set PYTHON_EXECUTABLE=%DEFAULT_PYTHON%
+    goto run
+)
+
+if not exist "%PYTHON_EXECUTABLE%" (
+    echo * Unable to find an installation of Python.
+    exit /b 1
+)
+
+:run
+
+call ""%PYTHON_EXECUTABLE%"" "%CFG_ROOT_DIR%etc\configure.py" %CFG_CMD_LINE_ARGS%
+
+@rem Return a proper return code on failure
+if %errorlevel% neq 0 (
+    exit /b %errorlevel%
+)
+
+@rem Activate the virtualenv
+endlocal
+if exist "%CFG_ROOT_DIR%Scripts\activate" (
+    "%CFG_ROOT_DIR%Scripts\activate"
+)

etc/conf/base.py

@@ -1,32 +1,38 @@
+from __future__ import absolute_import
 
 import sys
 
+"""
+This base config script gets automatically executed for all platforms via
+configure.
+"""
 
 """
 Check that we run a supported OS and architecture.
 """
 
-def unsupported():
-    print('Unsupported OS/platform.')
-    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.')
+
+def unsupported(platform):
+    print('Unsupported OS/platform %r.' % 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.')
     sys.exit(1)
 
+
 if sys.maxsize > 2 ** 32:
     arch = '64'
 else:
     arch = '32'
 
 sys_platform = str(sys.platform).lower()
-if 'linux' in sys_platform:
+if sys_platform.startswith('linux'):
     os = 'linux'
-elif'win32' in sys_platform:
+elif 'win32' in sys_platform:
     os = 'win'
 elif 'darwin' in sys_platform:
     os = 'mac'
 else:
-    unsupported()
-
+    unsupported(sys_platform)
 
 supported_combos = {
     'linux': ['32', '64'],
@@ -36,4 +42,4 @@ def unsupported():
 
 arches = supported_combos[os]
 if arch not in arches:
-    unsupported()
+    unsupported(os + arch)

etc/conf/dev/base.txt

@@ -0,0 +1,13 @@
+# Testing
+aboutcode-toolkit
+apipkg
+py
+pytest
+colorama
+execnet
+pytest-xdist
+bumpversion
+coverage
+pytest-cov
+codecov
+pytest-rerunfailures

etc/conf/dev/requirements_base.txt

@@ -4,6 +4,7 @@ setuptools
 wheel
 pip
 wincertstore
+six
 
 # Self
 -e .