Update release scripts

We now release only for one Python version.

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

Author: pombredanne

etc/release/scancode-create-release.sh

@@ -17,16 +17,15 @@
 
 # Supported current app Python version and OS
 # one archive or installer is built for each python x OS combo
-PYTHON_APP_DOT_VERSIONS="3.6 3.7 3.8 3.9"
+PYTHON_APP_DOT_VERSIONS="3.9"
 
-PYTHON_PYPI_TESTS_DOT_VERSIONS="3.6 3.7 3.8 3.9"
+PYTHON_PYPI_TESTS_DOT_VERSIONS="3.9"
 
 PYPI_LINKS=https://thirdparty.aboutcode.org/pypi
 
 OPERATING_SYSTEMS="linux macos windows"
 
-QUIET=""
-#QUIET="--quiet"
+QUIET="--quiet"
 
 
 ################################################################################
@@ -298,13 +297,12 @@ function build_app_archive {
         fi
 
         # 1. Collect thirdparty deps only for the subset for this Python/operating_system
-        $BIN_DIR/python etc/scripts/fetch_requirements.py \
-            --requirements-file=requirements.txt \
-            --thirdparty-dir=thirdparty \
+        $BIN_DIR/python etc/scripts/fetch_thirdparty.py \
+            --requirements=requirements.txt \
+            --dest=thirdparty \
             --python-version=$python_app_version \
             --operating-system=$operating_system \
-            --with-about \
-            --remote-links-url=$PYPI_LINKS
+            --wheels
 
         # 2. Create tarball or zip.
         # For now as a shortcut we use the Python setup.py sdist to create a tarball.
@@ -330,12 +328,10 @@ function build_source_archive {
     mkdir -p thirdparty
 
     # 1. collect thirdparty deps sources
-    $BIN_DIR/python etc/scripts/fetch_requirements.py \
-        --requirements-file=requirements.txt \
-        --thirdparty-dir=thirdparty \
-        --with-about \
-        --only-sources \
-        --remote-links-url=$PYPI_LINKS
+    $BIN_DIR/python etc/scripts/fetch_thirdparty.py \
+        --requirements=requirements.txt \
+        --dest=thirdparty \
+        --sdists
 
     # 2. Create tarball
     # For now as a shortcut we use the Python setup.py sdist to create a tarball.
@@ -372,7 +368,7 @@ fi
 
 
 # wheels
-build_wheels
+#build_wheels
 
 # build the app combos on the current App Python
 for operating_system in $OPERATING_SYSTEMS

etc/scripts/fetch_thirdparty.py

@@ -269,11 +269,11 @@ def fetch_thirdparty(
                 if TRACE:
                     if not fetched:
                         print(
-                            f"    ====> Sdist already available: {name}=={version} on: {environment}"
+                            f"    ====> Sdist already available: {name}=={version}"
                         )
                     else:
                         print(
-                            f"    ====> Sdist fetched: {fetched} for {name}=={version} on: {environment}"
+                            f"    ====> Sdist fetched: {fetched} for {name}=={version}"
                         )
 
             except utils_thirdparty.DistributionNotFound as e:

etc/scripts/utils_thirdparty.py

@@ -112,7 +112,7 @@
 """
 
 TRACE = True
-TRACE_DEEP = False
+TRACE_DEEP = True
 TRACE_ULTRA_DEEP = False
 
 # Supported environments
@@ -233,7 +233,7 @@ def download_wheel(
     tuple of lists of (fetched_wheel_filenames, existing_wheel_filenames)
     """
     if TRACE_DEEP:
-        print(f"  download_wheel: {name}=={version}: {environment}")
+        print(f"  download_wheel: {name}=={version}: {environment} and index_urls: {index_urls}")
 
     fetched_wheel_filenames = []
     existing_wheel_filenames = []
@@ -546,7 +546,7 @@ def get_best_download_url(
         If none is found, return a synthetic remote URL.
         """
         for index_url in index_urls:
-            pypi_package = get_pypi_package(
+            pypi_package = get_pypi_package_data(
                 name=self.normalized_name,
                 version=self.version,
                 index_url=index_url,
@@ -1494,8 +1494,8 @@ def dists_from_paths_or_urls(cls, paths_or_urls):
         >>> assert expected == result
         """
         dists = []
-        if TRACE_DEEP:
-            print("   ###paths_or_urls:", paths_or_urls)
+        if TRACE_ULTRA_DEEP:
+            print("     ###paths_or_urls:", paths_or_urls)
         installable = [f for f in paths_or_urls if f.endswith(EXTENSIONS_INSTALLABLE)]
         for path_or_url in installable:
             try:
@@ -1703,7 +1703,7 @@ def _fetch_links(self, name, _LINKS={}):
             _LINKS[index_url] = [l for l in links if l.endswith(EXTENSIONS)]
 
         links = _LINKS[index_url]
-        if TRACE_DEEP:
+        if TRACE_ULTRA_DEEP:
             print(f"          Found links {links!r}")
         return links
 
@@ -1824,18 +1824,20 @@ def get_pypi_repo(index_url, _PYPI_REPO={}):
     return _PYPI_REPO[index_url]
 
 
-def get_pypi_package(name, version, index_url, verbose=TRACE_DEEP):
+def get_pypi_package_data(name, version, index_url, verbose=TRACE_DEEP):
     """
     Return a PypiPackage or None.
     """
     try:
+        if verbose:
+            print(f"    get_pypi_package_data: Fetching {name} @ {version} info from {index_url}")
         package = get_pypi_repo(index_url).get_package(name, version)
         if verbose:
-            print(f"    get_pypi_package: {name} @ {version} info from {index_url}: {package}")
+            print(f"      get_pypi_package_data: Fetched")# {package}")
         return package
 
     except RemoteNotFetchedException as e:
-        print(f"Failed to fetch PyPI package {name} @ {version} info from {index_url}: {e}")
+        print(f"      get_pypi_package_data: Failed to fetch PyPI package {name} @ {version} info from {index_url}: {e}")
 
 
 ################################################################################