Refine release scripts

 * in particular ensure that a release can be built of an hardcoded
   version even if the git checkout is dirty
 * add --no-tests option to release script to help with respinning
   a release

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

etc/release/release.sh

@@ -13,8 +13,8 @@ set -e
 
 echo "###  BUILDING ScanCode release ###"
 
-echo -n "  RELEASE: Cleaning previous release archives, then setup and config: "
-rm -rf dist/
+echo "  RELEASE: Cleaning previous release archives, then setup and config: "
+rm -rf dist/ build/
 
 # backup dev manifests
 cp MANIFEST.in MANIFEST.in.dev 
@@ -26,12 +26,12 @@ cp etc/release/setup.cfg.release setup.cfg
 
 ./configure --clean
 export CONFIGURE_QUIET=1
-./configure etc/conf
+./configure etc/conf --no-reindex-licenses
 
 echo "  RELEASE: Building release archives..."
 
 # build a zip and tar.bz2
-bin/python setup.py --quiet release
+bin/python setup.py --quiet release --use-default-version
 
 # restore dev manifests
 mv MANIFEST.in.dev MANIFEST.in
@@ -44,7 +44,7 @@ function test_scan {
     extract_command=$2
     for archive in *.$file_extension;
         do
-            echo -n "    RELEASE: Testing release archive: $archive ... "
+            echo "    RELEASE: Testing release archive: $archive ... "
             $($extract_command $archive)
             extract_dir=$(ls -d */)
             cd $extract_dir
@@ -72,14 +72,16 @@ function test_scan {
 }
 
 cd dist
-echo "  RELEASE: Testing..."
 if [ "$1" != "--no-tests" ]; then
+    echo "  RELEASE: Testing..."
     test_scan bz2 "tar -xf"
     test_scan zip "unzip -q"
+else
+    echo "  RELEASE: !!!!NOT Testing..."
 fi
 
 
-echo "###  RELEASE is ready for publishing ###"
+echo "###  RELEASE is ready for publishing  ###"
 
 set +e
 set +x

setup.py

@@ -11,6 +11,7 @@
 from os.path import join
 from os.path import splitext
 import re
+import sys
 
 from setuptools import find_packages
 from setuptools import setup
@@ -19,11 +20,26 @@
 version = '2.0.0rc3'
 
 
-def get_version(default=version, template='{tag}.{distance}.{commit}{dirty}'):
+#### Small hack to force using a plain version number if the option
+#### --plain-version is passed to setup.py
+
+USE_DEFAULT_VERSION = False
+try:
+    sys.argv.remove('--use-default-version')
+    USE_DEFAULT_VERSION = True
+except ValueError:
+    pass
+####
+
+def get_version(default=version, template='{tag}.{distance}.{commit}{dirty}',
+                use_default=USE_DEFAULT_VERSION):
     """
-    Return a version collected from git if possible or fall back to an hard-coded
-    version otherwise.
+    Return a version collected from git if possible or fall back to an
+    hard-coded default version otherwise. If `use_default` is True,
+    always use the default version.
     """
+    if use_default:
+        return default
     try:
         tag, distance, commit, dirty = get_git_version()
         if not distance and not dirty:
@@ -135,8 +151,8 @@ def read(*names, **kwargs):
         # caching
         'zc.lockfile >= 1.0.0, < 2.0.0',
         'yg.lockfile >= 2.0.0, < 3.0.0',
-            # used by yg.lockfile 
-            'contextlib2', 'pytz', 'tempora', 'jaraco.timing', 
+            # used by yg.lockfile
+            'contextlib2', 'pytz', 'tempora', 'jaraco.timing',
         'psutil >= 5.0.0, < 6.0.0',
 
         # textcode