From d6fe59fd2e832075905ecb27235640a2776dad7a Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 7 May 2021 14:56:42 +0200
Subject: [PATCH 1/9] Update markers syntax for pytest

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 55fb92c..a3bda44 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,6 +41,6 @@ python_functions = "test"
 
 addopts = [
     "-rfExXw",
-    "--strict",
+    "--strict-markers",
     "--doctest-modules"
 ]

From ca6ab2189a6ff6fd093dc9424aa17183a05e6988 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 7 May 2021 14:59:17 +0200
Subject: [PATCH 2/9] Add fallback version for setuptools_scm

This will work even from a git archive or when git is not installed.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 .gitattributes | 1 +
 pyproject.toml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index b79df5c..96c89ce 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 # Ignore all Git auto CR/LF line endings conversions
 * -text
+pyproject.toml export-subst
diff --git a/pyproject.toml b/pyproject.toml
index a3bda44..52caac4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,6 +3,7 @@ requires = ["setuptools >= 50", "wheel", "setuptools_scm[toml] >= 4"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
+fallback_version = "v9999.$Format:%h-%cs$"
 
 [tool.pytest.ini_options]
 norecursedirs = [

From 1364bbbb9c399bd535686ea4ec6bfc241eb0e689 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 11 May 2021 10:57:19 +0200
Subject: [PATCH 3/9] Add note for setuptools_scam fallback version

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 pyproject.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 52caac4..8eebe91 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,6 +3,8 @@ requires = ["setuptools >= 50", "wheel", "setuptools_scm[toml] >= 4"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
+# this is used populated when creating a git archive
+# and when there is .git dir and/or there is no git installed
 fallback_version = "v9999.$Format:%h-%cs$"
 
 [tool.pytest.ini_options]

From be851b017a6e5c98ad85a84cda8b3f070e7acf34 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 11 May 2021 11:00:26 +0200
Subject: [PATCH 4/9] Use azure-posix.yml for linux and macOS

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 azure-pipelines.yml                         | 10 +++---
 etc/ci/azure-mac.yml                        | 36 ---------------------
 etc/ci/{azure-linux.yml => azure-posix.yml} |  0
 3 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 etc/ci/azure-mac.yml
 rename etc/ci/{azure-linux.yml => azure-posix.yml} (100%)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9a4c950..31ef36f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,7 +7,7 @@
 
 jobs:
 
-    - template: etc/ci/azure-linux.yml
+    - template: etc/ci/azure-posix.yml
       parameters:
           job_name: ubuntu16_cpython
           image_name: ubuntu-16.04
@@ -15,7 +15,7 @@ jobs:
           test_suites:
               all: tmp/bin/pytest -vvs
 
-    - template: etc/ci/azure-linux.yml
+    - template: etc/ci/azure-posix.yml
       parameters:
           job_name: ubuntu18_cpython
           image_name: ubuntu-18.04
@@ -23,7 +23,7 @@ jobs:
           test_suites:
               all: tmp/bin/pytest -n 2 -vvs
 
-    - template: etc/ci/azure-linux.yml
+    - template: etc/ci/azure-posix.yml
       parameters:
           job_name: ubuntu20_cpython
           image_name: ubuntu-20.04
@@ -31,7 +31,7 @@ jobs:
           test_suites:
               all: tmp/bin/pytest -n 2 -vvs
 
-    - template: etc/ci/azure-mac.yml
+    - template: etc/ci/azure-posix.yml
       parameters:
           job_name: macos1014_cpython
           image_name: macos-10.14
@@ -39,7 +39,7 @@ jobs:
           test_suites:
               all: tmp/bin/pytest -n 2 -vvs
 
-    - template: etc/ci/azure-mac.yml
+    - template: etc/ci/azure-posix.yml
       parameters:
           job_name: macos1015_cpython
           image_name: macos-10.15
diff --git a/etc/ci/azure-mac.yml b/etc/ci/azure-mac.yml
deleted file mode 100644
index 752ae2e..0000000
--- a/etc/ci/azure-mac.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-parameters:
-    job_name: ''
-    image_name: ''
-    python_versions: []
-    test_suites: {}
-    python_architecture: x64
-
-jobs:
-    - job: ${{ parameters.job_name }}
-
-      pool:
-          vmImage: ${{ parameters.image_name }}
-
-      strategy:
-          matrix:
-            ${{ each pyver in parameters.python_versions }}:
-              ${{ each tsuite in parameters.test_suites }}:
-                 ${{ format('py{0} {1}', pyver, tsuite.key) }}:
-                     python_version: ${{ pyver }}
-                     test_suite_label: ${{ tsuite.key }}
-                     test_suite: ${{ tsuite.value }}
-      steps:
-          - checkout: self
-            fetchDepth: 10
-
-          - task: UsePythonVersion@0
-            inputs:
-                versionSpec: '$(python_version)'
-                architecture: '${{ parameters.python_architecture }}'
-            displayName: 'Install Python $(python_version)'
-
-          - script: ./configure
-            displayName: 'Run Configure'
-
-          - script: $(test_suite)
-            displayName: 'Run $(test_suite_label) tests with py$(python_version) on ${{ parameters.job_name }}'
diff --git a/etc/ci/azure-linux.yml b/etc/ci/azure-posix.yml
similarity index 100%
rename from etc/ci/azure-linux.yml
rename to etc/ci/azure-posix.yml

From 4f0aecf4f2a01c71b8d0f54987cd68de5f7922c2 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 11 May 2021 11:14:23 +0200
Subject: [PATCH 5/9] Adopt new configure script derived from ScanCode

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 configure              | 164 ++++++++++++++++++++++++----
 configure.bat          | 238 ++++++++++++++++++++++++++---------------
 etc/ci/azure-posix.yml |   7 +-
 etc/ci/azure-win.yml   |   5 +-
 4 files changed, 304 insertions(+), 110 deletions(-)

diff --git a/configure b/configure
index 78e7498..25ab0ce 100755
--- a/configure
+++ b/configure
@@ -1,43 +1,169 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) nexB Inc. and others.
+# Copyright (c) nexB Inc. and others. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
+# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
+# See https://github.com/nexB/ for support or download.
+# See https://aboutcode.org for more information about nexB OSS projects.
 #
 
 set -e
 #set -x
 
-# source this script for a basic setup and configuration for local development
+################################
+# A configuration script to set things up: 
+# create a virtualenv and install or update thirdparty packages.
+# Source this script for initial configuration
+# Use configure --help for details
+#
+# This script will search for a virtualenv.pyz app in etc/thirdparty/virtualenv.pyz
+# Otherwise it will download the latest from the VIRTUALENV_PYZ_URL default
+################################
+CLI_ARGS=$1
 
-CONFIGURE_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+################################
+# Defaults. Change these variables to customize this script
+################################
 
+# Requirement arguments passed to pip and used by default or with --dev.
+REQUIREMENTS="--editable ."
+DEV_REQUIREMENTS="--editable .[testing]"
 
-if [[ "$1" == "--clean" ]]; then
-    rm -rf "$CONFIGURE_ROOT_DIR/tmp"
-    exit
+# where we create a virtualenv
+VIRTUALENV_DIR=tmp
+
+# Cleanable files and directories with the --clean option
+CLEANABLE="
+    build
+	tmp"
+
+# extra  arguments passed to pip
+PIP_EXTRA_ARGS=" "
+
+# the URL to download virtualenv.pyz if needed
+VIRTUALENV_PYZ_URL=https://bootstrap.pypa.io/virtualenv.pyz
+################################
+
+
+################################
+# Current directory where this script lives
+CFG_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+CFG_BIN_DIR=$CFG_ROOT_DIR/$VIRTUALENV_DIR/bin
+
+
+################################
+# Set the quiet flag to empty if not defined 
+if [[ "$CFG_QUIET" == "" ]]; then
+    CFG_QUIET=" "
 fi
 
 
-if [[ "$PYTHON_EXE" == "" ]]; then
-    PYTHON_EXE=python3
+################################
+# find a proper Python to run
+# Use environment variables or a file if available.
+# Otherwise the latest Python by default.
+if [[ "$PYTHON_EXECUTABLE" == "" ]]; then
+    # check for a file named PYTHON_EXECUTABLE 
+    if [ -f "$CFG_ROOT_DIR/PYTHON_EXECUTABLE" ]; then
+        PYTHON_EXECUTABLE=$(cat "$CFG_ROOT_DIR/PYTHON_EXECUTABLE")
+    else
+        PYTHON_EXECUTABLE=python3
+    fi
 fi
 
 
-function setup {
-    # create a virtualenv on Python
-    mkdir -p $CONFIGURE_ROOT_DIR/tmp
-    wget -O $CONFIGURE_ROOT_DIR/tmp/virtualenv.pyz https://bootstrap.pypa.io/virtualenv.pyz
-    $PYTHON_EXE $CONFIGURE_ROOT_DIR/tmp/virtualenv.pyz --wheel embed --pip embed --setuptools embed --seeder pip $CONFIGURE_ROOT_DIR/tmp
-    source $CONFIGURE_ROOT_DIR/tmp/bin/activate
+################################
+cli_help() {
+    echo An initial configuration script
+    echo "  usage: ./configure [options]"
+    echo
+    echo The default is to configure for regular use. Use --dev for development.
+    echo
+    echo The options are:
+    echo " --clean: clean built and installed files and exit."
+    echo " --dev:   configure the environment for development."
+    echo " --help:  display this help message and exit."
+    echo
+    echo By default, the python interpreter version found in the path is used.
+    echo Alternatively, the PYTHON_EXECUTABLE environment variable can be set to
+    echo configure another Python executable interpreter to use. If this is not
+    echo set, a file named PYTHON_EXECUTABLE containing a single line with the
+    echo path of the Python executable to use will be checked last.
+    set +e
+    exit
 }
 
 
-setup
+clean() {
+    # Remove cleanable file and directories and files from the root dir.
+    echo "* Cleaning ..."
+    for cln in $CLEANABLE;
+        do rm -rf "${CFG_ROOT_DIR:?}/${cln:?}";
+    done
+    set +e
+    exit
+}
 
-$CONFIGURE_ROOT_DIR/tmp/bin/pip install -e .[testing]
 
-if [ -f "$CONFIGURE_ROOT_DIR/tmp/bin/activate" ]; then
-    source "$CONFIGURE_ROOT_DIR/tmp/bin/activate"
-fi
+create_virtualenv() {
+    # create a virtualenv for Python
+    # Note: we do not use the bundled Python 3 "venv" because its behavior and
+    # presence is not consistent across Linux distro and sometimes pip is not
+    # included either by default. The virtualenv.pyz app cures all these issues.
+
+    VENV_DIR="$1"
+    if [ ! -f "$CFG_BIN_DIR/python" ]; then
+
+        mkdir -p "$CFG_ROOT_DIR/$VENV_DIR"
+
+        if [ -f "$CFG_ROOT_DIR/etc/thirdparty/virtualenv.pyz" ]; then
+            VIRTUALENV_PYZ="$CFG_ROOT_DIR/etc/thirdparty/virtualenv.pyz"
+        else
+            VIRTUALENV_PYZ="$CFG_ROOT_DIR/$VENV_DIR/virtualenv.pyz"
+            wget -O "$VIRTUALENV_PYZ" "$VIRTUALENV_PYZ_URL"
+        fi
+
+        $PYTHON_EXECUTABLE "$VIRTUALENV_PYZ" \
+            --wheel embed --pip embed --setuptools embed \
+            --seeder pip \
+            --never-download \
+            --no-periodic-update \
+            --no-vcs-ignore \
+            $CFG_QUIET \
+            "$CFG_ROOT_DIR/$VENV_DIR"
+    fi
+}
+
+
+install_packages() {
+    # install requirements in virtualenv
+    # note: --no-build-isolation means that pip/wheel/setuptools will not
+    # be reinstalled a second time and reused from the virtualenv and this
+    # speeds up the installation.
+    # We always have the PEP517 build dependencies installed already.
+
+    "$CFG_BIN_DIR/pip" install \
+        --upgrade \
+        --no-build-isolation \
+        $CFG_QUIET \
+        $PIP_EXTRA_ARGS \
+        $1
+}
+
+
+################################
+# Main command line entry point
+CFG_DEV_MODE=0
+CFG_REQUIREMENTS=$REQUIREMENTS
+
+case "$CLI_ARGS" in
+    --help)    cli_help;;
+    --clean)   clean;;
+    --dev)     CFG_REQUIREMENTS="$DEV_REQUIREMENTS" && CFG_DEV_MODE=1;;
+esac
+
+create_virtualenv "$VIRTUALENV_DIR"
+install_packages "$CFG_REQUIREMENTS"
+. "$CFG_BIN_DIR/activate"
 
 set +e
diff --git a/configure.bat b/configure.bat
index 00cb101..8c497ba 100644
--- a/configure.bat
+++ b/configure.bat
@@ -1,120 +1,180 @@
 @echo OFF
 @setlocal
-@rem Copyright (c) nexB Inc. http://www.nexb.com/ - All rights reserved.
+
+@rem Copyright (c) nexB Inc. and others. All rights reserved.
+@rem SPDX-License-Identifier: Apache-2.0
+@rem See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
+@rem See https://github.com/nexB/ for support or download.
+@rem See https://aboutcode.org for more information about nexB OSS projects.
+
 
 @rem ################################
-@rem # A configuration script for Windows
-@rem #
-@rem # The options and (optional) arguments are:
-@rem #  --clean : this is exclusive of anything else and cleans the environment
-@rem #    from built and installed files
-@rem #
-@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 # A configuration script to set things up: 
+@rem # create a virtualenv and install or update thirdparty packages.
+@rem # Source this script for initial configuration
+@rem # Use configure --help for details
+
+@rem # This script will search for a virtualenv.pyz app in etc\thirdparty\virtualenv.pyz
+@rem # Otherwise it will download the latest from the VIRTUALENV_PYZ_URL default
 @rem ################################
 
-@rem Current directory where this .bat files lives
-set CFG_ROOT_DIR=%~dp0
-@rem path where a configured Python should live in the current virtualenv if installed
-set CONFIGURED_PYTHON=%CFG_ROOT_DIR%tmp\Scripts\python.exe
-set PYTHON_EXECUTABLE=
 
+@rem ################################
+@rem # Defaults. Change these variables to customize this script
+@rem ################################
+
+@rem # Requirement arguments passed to pip and used by default or with --dev.
+set "REQUIREMENTS=--editable ."
+set "DEV_REQUIREMENTS=--editable .[testing]"
+
+@rem # where we create a virtualenv
+set "VIRTUALENV_DIR=tmp"
+
+@rem # Cleanable files and directories to delete with the --clean option
+set "CLEANABLE=build tmp"
 
-@rem parse command line options and arguments
-:collectopts
-if "%1" EQU "--help" (goto cli_help)
-if "%1" EQU "--clean" (call rmdir /s /q "%CFG_ROOT_DIR%tmp") && call exit /b
-if "%1" EQU "--python" (set PROVIDED_PYTHON=%~2) && shift && shift && goto collectopts
+@rem # extra  arguments passed to pip
+set "PIP_EXTRA_ARGS= "
 
-@rem If we have a pre-configured Python in our virtualenv, reuse this as-is and run
-if exist ""%CONFIGURED_PYTHON%"" (
-    set PYTHON_EXECUTABLE=%CONFIGURED_PYTHON%
-    goto run
+@rem # the URL to download virtualenv.pyz if needed
+set VIRTUALENV_PYZ_URL=https://bootstrap.pypa.io/virtualenv.pyz
+@rem ################################
+
+
+@rem ################################
+@rem # Current directory where this script lives
+set CFG_ROOT_DIR=%~dp0
+set "CFG_BIN_DIR=%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"
+
+
+@rem ################################
+@rem # Set the quiet flag to empty if not defined 
+if not defined CFG_QUIET (
+    set "CFG_QUIET= "
 )
 
-@rem If we have a command arg for Python use this as-is
-if ""%PROVIDED_PYTHON%""==""path"" (
-    @rem use a bare python available in the PATH
-    set PYTHON_EXECUTABLE=python
-    goto run
+
+@rem ################################
+@rem # Main command line entry point
+set CFG_DEV_MODE=0
+set "CFG_REQUIREMENTS=%REQUIREMENTS%"
+
+if "%1" EQU "--help"   (goto cli_help)
+if "%1" EQU "--clean"  (goto clean)
+if "%1" EQU "--dev"    (
+    set "CFG_REQUIREMENTS=%DEV_REQUIREMENTS%"
+    set CFG_DEV_MODE=1
 )
-if exist ""%PROVIDED_PYTHON%"" (
-    set PYTHON_EXECUTABLE=%PROVIDED_PYTHON%
-    goto run
+if "%1" EQU "--python"  (
+    echo "The --python is now DEPRECATED. Use the PYTHON_EXECUTABLE environment
+    echo "variable instead. Run configure --help for details."
+    exit /b 0
 )
 
+@rem ################################
+@rem # find a proper Python to run
+@rem # Use environment variables or a file if available.
+@rem # Otherwise the latest Python by default.
+if not defined PYTHON_EXECUTABLE (
+    @rem # check for a file named PYTHON_EXECUTABLE 
+    if exist ""%CFG_ROOT_DIR%\PYTHON_EXECUTABLE"" (
+        set /p PYTHON_EXECUTABLE=<""%CFG_ROOT_DIR%\PYTHON_EXECUTABLE""
+    ) else (
+        set "PYTHON_EXECUTABLE=py"
+    )
+)
 
-@rem otherwise we search for a suitable Python interpreter
-:find_python
-@rem First check the existence of the "py" launcher (available in Python 3)
-@rem if we have it, check if we have a py -3 installed with the good version or a py 2.7
-@rem if not, check if we have an old py 2.7
-@rem exist if all fails
+:create_virtualenv
+@rem # create a virtualenv for Python
+@rem # Note: we do not use the bundled Python 3 "venv" because its behavior and
+@rem # presence is not consistent across Linux distro and sometimes pip is not
+@rem # included either by default. The virtualenv.pyz app cures all these issues.
 
-where py >nul 2>nul
-if %ERRORLEVEL% == 0 (
-    @rem we have a py launcher, check for the availability of our required Python 3 version
-    py -3.6 --version >nul 2>nul
-    if %ERRORLEVEL% == 0 (
-        set PYTHON_EXECUTABLE=py -3.6
-    ) else (
-        @rem we have no required python 3, let's try python 2:
-        py -2 --version >nul 2>nul
-        if %ERRORLEVEL% == 0 (
-            set PYTHON_EXECUTABLE=py -2
-        ) else (
-            @rem we have py and no python 3 and 2, exit
-            echo * Unable to find an installation of Python.
-            exit /b 1
-        )
+if not exist ""%CFG_BIN_DIR%\python.exe"" (
+    if not exist "%CFG_BIN_DIR%" (
+        mkdir %CFG_BIN_DIR%
     )
-) else (
-    @rem we have no py launcher, check for a default Python 2 installation
-    if not exist ""%DEFAULT_PYTHON2%"" (
-       echo * Unable to find an installation of Python.
-       exit /b 1
+
+    if exist ""%CFG_ROOT_DIR%\etc\thirdparty\virtualenv.pyz"" (
+        %PYTHON_EXECUTABLE% "%CFG_ROOT_DIR%\etc\thirdparty\virtualenv.pyz" ^
+            --wheel embed --pip embed --setuptools embed ^
+            --seeder pip ^
+            --never-download ^
+            --no-periodic-update ^
+            --no-vcs-ignore ^
+            %CFG_QUIET% ^
+            %CFG_ROOT_DIR%\%VIRTUALENV_DIR%
     ) else (
-        set PYTHON_EXECUTABLE=%DEFAULT_PYTHON2%
+        if not exist ""%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\virtualenv.pyz"" (
+            curl -o "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\virtualenv.pyz" %VIRTUALENV_PYZ_URL%
+
+            if %ERRORLEVEL% neq 0 (
+                exit /b %ERRORLEVEL%
+            )
+        )
+        %PYTHON_EXECUTABLE% "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\virtualenv.pyz" ^
+            --wheel embed --pip embed --setuptools embed ^
+            --seeder pip ^
+            --never-download ^
+            --no-periodic-update ^
+            --no-vcs-ignore ^
+            %CFG_QUIET% ^
+            %CFG_ROOT_DIR%\%VIRTUALENV_DIR%
     )
 )
 
+if %ERRORLEVEL% neq 0 (
+    exit /b %ERRORLEVEL%
+)
+
 
-:run
-@rem without this things may not always work on Windows 10, but this makes things slower
-set PYTHONDONTWRITEBYTECODE=1
+:install_packages
+@rem # install requirements in virtualenv
+@rem # note: --no-build-isolation means that pip/wheel/setuptools will not
+@rem # be reinstalled a second time and reused from the virtualenv and this
+@rem # speeds up the installation.
+@rem # We always have the PEP517 build dependencies installed already.
 
-call mkdir "%CFG_ROOT_DIR%tmp"
-call curl -o "%CFG_ROOT_DIR%tmp\virtualenv.pyz" https://bootstrap.pypa.io/virtualenv.pyz
-call %PYTHON_EXECUTABLE% "%CFG_ROOT_DIR%tmp\virtualenv.pyz"  --wheel embed --pip embed --setuptools embed --seeder pip  "%CFG_ROOT_DIR%tmp"
-call "%CFG_ROOT_DIR%tmp\Scripts\activate"
-call "%CFG_ROOT_DIR%tmp\Scripts\pip" install -e .[testing]
+%CFG_BIN_DIR%\pip install ^
+    --upgrade ^
+    --no-build-isolation ^
+    %CFG_QUIET% ^
+    %PIP_EXTRA_ARGS% ^
+    %CFG_REQUIREMENTS%
 
-@rem Return a proper return code on failure
 if %ERRORLEVEL% neq 0 (
     exit /b %ERRORLEVEL%
 )
-endlocal
-goto activate
 
+exit /b 0
+
+
+@rem ################################
 
 :cli_help
-echo A configuration script for Windows
-echo usage: configure [options] [path/to/config/directory]
-echo.
-echo The options and arguments are:
-echo  --clean : this is exclusive of anything else and cleans the environment
-echo    from built and installed files
-echo.
-echo  --python path/to/python.exe : this is set to the path of an alternative
-echo    Python executable to use. If path/to/python.exe is set to "path",
-echo    then the executable will be the python.exe available in the PATH.
-echo.
-
-
-:activate
-@rem Activate the virtualenv
-if exist "%CFG_ROOT_DIR%tmp\Scripts\activate" (
-    "%CFG_ROOT_DIR%tmp\Scripts\activate"
+    echo An initial configuration script
+    echo "  usage: configure [options]"
+    echo " "
+    echo The default is to configure for regular use. Use --dev for development.
+    echo " "
+    echo The options are:
+    echo " --clean: clean built and installed files and exit."
+    echo " --dev:   configure the environment for development."
+    echo " --help:  display this help message and exit."
+    echo " "
+    echo By default, the python interpreter version found in the path is used.
+    echo Alternatively, the PYTHON_EXECUTABLE environment variable can be set to
+    echo configure another Python executable interpreter to use. If this is not
+    echo set, a file named PYTHON_EXECUTABLE containing a single line with the
+    echo path of the Python executable to use will be checked last.
+    exit /b 0
+
+
+:clean
+@rem # Remove cleanable file and directories and files from the root dir.
+echo "* Cleaning ..."
+for %%F in (%CLEANABLE%) do (
+    rmdir /s /q "%CFG_ROOT_DIR%\%%F" >nul 2>&1
+    del /f /q "%CFG_ROOT_DIR%\%%F" >nul 2>&1
 )
+exit /b 0
diff --git a/etc/ci/azure-posix.yml b/etc/ci/azure-posix.yml
index 752ae2e..0921d9b 100644
--- a/etc/ci/azure-posix.yml
+++ b/etc/ci/azure-posix.yml
@@ -19,6 +19,7 @@ jobs:
                      python_version: ${{ pyver }}
                      test_suite_label: ${{ tsuite.key }}
                      test_suite: ${{ tsuite.value }}
+
       steps:
           - checkout: self
             fetchDepth: 10
@@ -29,7 +30,11 @@ jobs:
                 architecture: '${{ parameters.python_architecture }}'
             displayName: 'Install Python $(python_version)'
 
-          - script: ./configure
+          - script: |
+                python3 --version
+                python$(python_version) --version
+                echo "python$(python_version)" > PYTHON_EXECUTABLE
+                ./configure --dev
             displayName: 'Run Configure'
 
           - script: $(test_suite)
diff --git a/etc/ci/azure-win.yml b/etc/ci/azure-win.yml
index afe1686..03d8927 100644
--- a/etc/ci/azure-win.yml
+++ b/etc/ci/azure-win.yml
@@ -29,7 +29,10 @@ jobs:
                 architecture: '${{ parameters.python_architecture }}'
             displayName: 'Install Python $(python_version)'
 
-          - script: configure --python path
+          - script: |
+               python --version
+               echo | set /p=python> PYTHON_EXECUTABLE
+               configure --dev
             displayName: 'Run Configure'
 
           - script: $(test_suite)

From aa04429ae6e5d05ef8ee2a0fbad9872014463a25 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 11 May 2021 11:17:09 +0200
Subject: [PATCH 6/9] Add notes on customization

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 README.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.rst b/README.rst
index a0e682f..a291173 100644
--- a/README.rst
+++ b/README.rst
@@ -32,3 +32,12 @@ Update an existing project
     git merge skeleton/main --allow-unrelated-histories
 
 This is also the workflow to use when updating the skeleton files in any given repository.
+
+
+Customizing
+-----------
+
+You typically want to perform these customizations:
+
+- remove or update the src/README.rst and tests/README.rst files
+- check the configure and configure.bat defaults

From 56ada8fffacac14140bf016fd3f6bee4f4615fcc Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 11 May 2021 11:19:12 +0200
Subject: [PATCH 7/9] Adopt new configure --dev convention

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7a342df..1b52eb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ python:
   - "3.8"
 
 # Scripts to run at install stage
-install: ./configure
+install: ./configure --dev
 
 # Scripts to run at script stage
 script: tmp/bin/pytest

From 0dbcdc9f6c929b3d030910a69e5566c149e15d7a Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 11 May 2021 11:21:48 +0200
Subject: [PATCH 8/9] Clarify CHANGELOG to be Rst

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 CHANGELOG.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5f8bc8d..fc2b6e3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,8 @@
-Release notes
--------------
-### Version 0.0.0
+Changelog
+=========
+
+
+v0.0.0
+------
 
 *xxxx-xx-xx* -- Initial release.

From d21aef35a61675289bbebf963030b539c10a7b28 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 11 May 2021 11:22:22 +0200
Subject: [PATCH 9/9] Add skeleton release notes to README.rst

This was they do not end up in the template CHANGELOG.rst

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 README.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.rst b/README.rst
index a291173..b84a049 100644
--- a/README.rst
+++ b/README.rst
@@ -41,3 +41,10 @@ You typically want to perform these customizations:
 
 - remove or update the src/README.rst and tests/README.rst files
 - check the configure and configure.bat defaults
+
+
+Release Notes
+-------------
+
+- 2021-05-11: adopt new configure scripts from ScanCode TK that allows correct
+  configuration of which Python version is used.