Merge pull request #2680 from nexB/release-preparation-2021-08

Release preparation for  2021.08

Author: pombredanne

etc/release/scancode-create-release.sh

@@ -21,6 +21,8 @@ PYTHON_APP_DOT_VERSIONS="3.6 3.7 3.8 3.9"
 
 PYTHON_PYPI_TESTS_DOT_VERSIONS="3.6 3.7 3.8 3.9"
 
+PYPI_LINKS=https://thirdparty.aboutcode.org/pypi
+
 OPERATING_SYSTEMS="linux macos windows"
 
 QUIET=""
@@ -272,9 +274,9 @@ function build_app_archive {
         mkdir -p thirdparty
 
         if [ "$operating_system" == "windows" ]; then
-            echo -n "py -$python_app_dot_version">PYTHON_EXECUTABLE
+            echo -n "py -$python_app_dot_version" > PYTHON_EXECUTABLE
         else
-            echo -n "python$python_app_dot_version">PYTHON_EXECUTABLE
+            echo -n "python$python_app_dot_version" > PYTHON_EXECUTABLE
         fi
 
         # 1. Collect thirdparty deps only for the subset for this Python/operating_system
@@ -339,7 +341,7 @@ if [ "$CLI_ARGS" != "--continue" ]; then
 
     echo "## RELEASE: Clean and configure, then regen license index"
     ./configure --clean
-    PYPI_LINKS=$PYPI_LINKS ./configure --local 
+    ./configure --local 
     source bin/activate
     scancode --reindex-licenses
 

etc/release/utils_thirdparty.py

@@ -172,11 +172,20 @@ def fetch_wheels(
     else:
         force_pinned = False
 
-    rrp = list(get_required_remote_packages(
-        requirements_file=requirements_file,
-        force_pinned=force_pinned,
-        remote_links_url=remote_links_url,
-    ))
+    try:
+        rrp = list(get_required_remote_packages(
+            requirements_file=requirements_file,
+            force_pinned=force_pinned,
+            remote_links_url=remote_links_url,
+        ))
+    except Exception as e:
+        raise Exception(
+            dict(
+                requirements_file=requirements_file,
+                force_pinned=force_pinned,
+                remote_links_url=remote_links_url,
+            )
+        ) from e
 
     fetched_filenames = set()
     for name, version, package in rrp:
@@ -211,6 +220,7 @@ def fetch_wheels(
             print(f'Missed package {nv} in remote repo, has only:')
             for pv in rr.get_versions(n):
                 print('  ', pv)
+        raise Exception('Missed some packages in remote repo')
 
 
 def fetch_sources(
@@ -261,6 +271,8 @@ def fetch_sources(
             fetched = package.fetch_sdist(dest_dir=dest_dir)
             error = f'Failed to fetch' if not fetched else None
             yield package, error
+    if missed:
+        raise Exception(f'Missing source packages in {remote_links_url}', missed)
 
 ################################################################################
 #
@@ -2317,7 +2329,7 @@ def get_required_remote_packages(
         repo = get_remote_repo(remote_links_url=remote_links_url)
     else:
         # a local path
-        assert os.path.exists(remote_links_url)
+        assert os.path.exists(remote_links_url), f'Path does not exist: {remote_links_url}'
         repo = get_local_repo(directory=remote_links_url)
 
     for name, version in required_name_versions:

etc/thirdparty/virtualenv.pyz

@@ -1,7 +1,7 @@
 about_resource: virtualenv.pyz
 name: get-virtualenv
 version: 20.6.0
-download_url: https://github.com/pypa/get-virtualenv/raw/20.6.0/public/virtualenv.pyz
+download_url: https://github.com/pypa/get-virtualenv/raw/20.7.2/public/virtualenv.pyz
 description: virtualenv is a tool to create isolated Python environments.
 homepage_url: https://github.com/pypa/virtualenv
 license_expression: lgpl-2.1-plus AND (bsd-new OR apache-2.0) AND mit AND python AND bsd-new
@@ -10,4 +10,4 @@ copyright: Copyright (c) The Python Software Foundation and others
 redistribute: yes
 attribute: yes
 track_changes: yes
-package_url: pkg:github/pypa/get-virtualenv@20.6.0#public/virtualenv.pyz
+package_url: pkg:github/pypa/get-virtualenv@20.7.2#public/virtualenv.pyz