Merge pull request #3029 from nexB/release-31-0-0rc3-prep

Prepare Release 31.0.0rc3

Author: pombredanne

.cirrus.yml

@@ -4,7 +4,7 @@ env:
 
 py36_task:
     env:
-        PYTHON_EXE: /usr/local/bin/python3.6
+        PYTHON_EXE: /usr/local/bin/python3.8
 
     freebsd_instance:
         matrix:
@@ -14,7 +14,7 @@ py36_task:
     install_script:
         - sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
         - pkg upgrade -y
-        - pkg install -y python36 bash libxml2 libxslt
+        - pkg install -y python38 bash libxml2 libxslt
 
     script:
         - ./configure

CHANGELOG.rst

@@ -8,6 +8,8 @@ Changelog
 This is a major release with important bug and security fixes, new and improved
 features and API changes.
 
+Note that we no longer support Python 3.6. Use Python 3.7+ instead.
+
 
 Important API changes:
 ~~~~~~~~~~~~~~~~~~~~~~~~

Dockerfile

@@ -7,7 +7,7 @@
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 
-FROM python:3.6-slim-buster 
+FROM python:3.8-slim-buster 
 
 # Requirements as per https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html
 RUN apt-get update \

INSTALL.rst

@@ -16,9 +16,9 @@ Prerequisites
 -------------
 
 Before installing ScanCode make sure you have  installed these prerequisites.
-The main one is to have Python installed version 3.6, 3.7, 3.8 or 3.9.
+The main one is to have Python installed version 3.7, 3.8, 3.9 or 3.10
 
-- For Linux(Ubuntu): ``sudo apt install python3.6-dev bzip2 xz-utils zlib1g libxml2-dev libxslt1-dev``
+- For Linux(Ubuntu): ``sudo apt install python3.8-dev bzip2 xz-utils zlib1g libxml2-dev libxslt1-dev``
 - For MacOS: Install Python 3.x from https://www.python.org/
 - For Windows: Install Python 3.x from https://www.python.org/  using the 64 bits amd64 variant
 - For FreeBSD: (this needs to be documented)

README.rst

@@ -133,7 +133,7 @@ Installation
 ============
 
 Before installing ScanCode make sure that you have installed the prerequisites
-properly. This means installing Python 3.9 for x86/64 architectures. (Python 3.6+ is supported).
+properly. This means installing Python 3.98 for x86/64 architectures. (Python 3.7+ is supported).
 
 See `prerequisites <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#prerequisites>`_
 for detailed information on the support platforms and Python versions.

appveyor.yml

@@ -5,10 +5,10 @@
 ################################################################################
 environment:
     matrix:
-        - PYTHON: "C:\\Python36-x64"
 #        - PYTHON: "C:\\Python37-x64"
-#        - PYTHON: "C:\\Python38-x64"
+        - PYTHON: "C:\\Python38-x64"
 #        - PYTHON: "C:\\Python39-x64"
+#        - PYTHON: "C:\\Python310-x64"
 
 
 build: off

azure-pipelines.yml

@@ -82,7 +82,7 @@ jobs:
       parameters:
           job_name: ubuntu18_cpython
           image_name: ubuntu-18.04
-          python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
+          python_versions: ['3.7', '3.8', '3.9', '3.10']
           python_architecture: x64
           test_suites:
               all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
@@ -91,7 +91,7 @@ jobs:
       parameters:
           job_name: ubuntu20_cpython
           image_name: ubuntu-20.04
-          python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
+          python_versions: ['3.7', '3.8', '3.9', '3.10']
           python_architecture: x64
           test_suites:
               all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
@@ -100,7 +100,7 @@ jobs:
       parameters:
           job_name: macos1015_cpython_1
           image_name: macos-10.15
-          python_versions: ['3.6', '3.7', '3.8']
+          python_versions: ['3.7', '3.8']
           python_architecture: x64
           test_suites:
               all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
@@ -127,7 +127,7 @@ jobs:
       parameters:
           job_name: win2019_cpython_1
           image_name: windows-2019
-          python_versions: ['3.6', '3.7', '3.8']
+          python_versions: ['3.7', '3.8']
           python_architecture: x64
           test_suites:
               all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
@@ -169,7 +169,7 @@ jobs:
       parameters:
           job_name: ubuntu20_test_all_supported_click_versions
           image_name: ubuntu-20.04
-          python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
+          python_versions: ['3.7', '3.8', '3.9', '3.10']
           python_architecture: x64
           test_suites:
               click_versions: |
@@ -181,128 +181,6 @@ jobs:
                  done
 
 
-################################################################################
-# These jobs are using containers and their own Python 3.6
-################################################################################
-
-#    - template: etc/ci/azure-container-deb.yml
-#      parameters:
-#          job_name: ubuntu18c
-#          container: ubuntu:bionic
-#          python_path: python3.6
-#          python_version: '3.6'
-#          install_python: sudo apt-get install -y python3.6 python3.6-venv python3.6-dev
-#          test_suite_label: all
-#          test_suite: venv/bin/pytest -n 3 -vvs tests/scancode
-
-
-#    - template: etc/ci/azure-container-deb.yml
-#      parameters:
-#          job_name: ubuntu20c
-#          container: ubuntu:focal
-#          python_path: python3.8
-#          python_version: '3.8'
-#          install_python: sudo apt-get install -y python3.8 python3.8-venv python3.8-dev
-#          test_suite_label: all
-#          test_suite: venv/bin/pytest -n 3 -vvs tests/scancode
-
-
-#    - template: etc/ci/azure-container-rpm.yml
-#      parameters:
-#          job_name: centos7c
-#          container: centos:7
-#          python_path: python3.6
-#          python_version: '3.6'
-#          install_python: |
-#              set -e -x
-#              sudo yum install -y epel-release
-#              sudo yum install -y python36 python36-devel python36-virtualenv
-#          test_suite_label: all
-#          test_suite: venv/bin/pytest -n 2 -vvs
-#
-#    - template: etc/ci/azure-container-rpm.yml
-#      parameters:
-#          job_name: manylinux1_py36
-#          container: quay.io/pypa/manylinux1_x86_64:latest
-#          python_path: /opt/python/cp36-cp36m/bin/python
-#          python_version: '3.6'
-#          install_packages: echo "No extra packages for now"
-#          install_python: echo "Python is pre-installed"
-#          test_suite_label: all
-#          test_suite: venv/bin/pytest -n 2 -vvs
-#
-#    - template: etc/ci/azure-container-rpm.yml
-#      parameters:
-#          job_name: manylinux2010_py36
-#          container: quay.io/pypa/manylinux2010_x86_64:latest
-#          python_path: /opt/python/cp36-cp36m/bin/python
-#          python_version: '3.6'
-#          install_packages: echo "No extra packages for now"
-#          install_python: echo "Python is pre-installed"
-#          test_suite_label: all
-#          test_suite: venv/bin/pytest -n 2 -vvs
-
-
-################################################################################
-# These jobs are using containers and their own Python 3.7
-################################################################################
-
-#    - template: etc/ci/azure-container-rpm.yml
-#      parameters:
-#          job_name: fedora30c
-#          container: fedora:30
-#          package_manager: dnf
-#          python_path: python3.7
-#          python_version: '3.7'
-#          install_python: |
-#              set -e -x
-#              sudo dnf install -y python3 python3-devel python3-virtualenv
-#          test_suite_label: all
-#          test_suite: venv/bin/pytest -n 2 -vvs
-#
-#    - template: etc/ci/azure-container-rpm.yml
-#      parameters:
-#          job_name: manylinux2010_py37
-#          container: quay.io/pypa/manylinux2010_x86_64:latest
-#          python_path: /opt/python/cp37-cp37m/bin/python
-#          python_version: '3.7'
-#          install_packages: echo "No extra packages for now"
-#          install_python: echo "Python is pre-installed"
-#          test_suite_label: all
-#          test_suite: venv/bin/pytest -n 2 -vvs
-
-
-################################################################################
-# These jobs are using containers and their own Python 3.6: FAILING FOR NOW
-################################################################################
-
-# here we build from sources
-#    - template: etc/ci/azure-container-deb.yml
-#      parameters:
-#          job_name: debian9c
-#          container: debian:stretch
-#          python_path: python3.6
-#          python_version: '3.6'
-#          install_python: |
-#            set -e -x
-#            sudo apt-get install -y \
-#                libncurses5-dev libncursesw5-dev libreadline6-dev \
-#                libdb-dev libgdbm-dev libsqlite3-dev libssl-dev \
-#                libbz2-dev libexpat1-dev liblzma-dev zlib1g-dev \
-#                libcurl4-openssl-dev libpam0g-dev \
-#                libsqlite3-dev tk-dev libffi-dev \
-#                curl
-#            export PYVER=3.6.8
-#            curl -o Python-$PYVER.tgz https://www.python.org/ftp/python/$PYVER/Python-$PYVER.tgz
-#            tar -xvf Python-$PYVER.tgz
-#            cd Python-$PYVER
-#            ./configure --enable-optimizations
-#            make -j8
-#            sudo make altinstall
-#          test_suite_label: basic tests
-#          test_suite: venv/bin/pytest -n 2 -vvs
-
-
 ################################################################################
 # Tests using a plain pip install to get the latest of all wheels
 ################################################################################
@@ -312,79 +190,47 @@ jobs:
       parameters:
           job_name: ubuntu18_cpython_latest_from_pip
           image_name: ubuntu-18.04
-          python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
+          python_versions: ['3.7', '3.8', '3.9', '3.10']
           test_suites:
               all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
 
     - template: etc/ci/azure-posix.yml
       parameters:
           job_name: ubuntu20_cpython_latest_from_pip
           image_name: ubuntu-20.04
-          python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
-          test_suites:
-              all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
-
-    - template: etc/ci/azure-posix.yml
-      parameters:
-          job_name: macos1015_cpython_latest_from_pip1
-          image_name: macos-10.15
-          python_versions: ['3.6', '3.7']
+          python_versions: ['3.7', '3.8', '3.9', '3.10']
           test_suites:
               all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
 
     - template: etc/ci/azure-posix.yml
       parameters:
-          job_name: macos1015_cpython_latest_from_pip2
+          job_name: macos1015_cpython_latest_from_pip
           image_name: macos-10.15
-          python_versions: ['3.8', '3.9', '3.10']
-          test_suites:
-              all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
-
-    - template: etc/ci/azure-posix.yml
-      parameters:
-          job_name: macos11_cpython_latest_from_pip1
-          image_name: macos-11
-          python_versions: ['3.7', '3.8', ]
+          python_versions: ['3.7', '3.8', '3.9', '3.10']
           test_suites:
               all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
 
     - template: etc/ci/azure-posix.yml
       parameters:
-          job_name: macos11_cpython_latest_from_pip2
+          job_name: macos11_cpython_latest_from_pip
           image_name: macos-11
-          python_versions: ['3.9', '3.10']
+          python_versions: ['3.7', '3.8', '3.9', '3.10']
           test_suites:
               all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
 
     - template: etc/ci/azure-win.yml
       parameters:
-          job_name: win2019_cpython_latest_from_pip1
-          image_name: windows-2019
-          python_versions: ['3.6', '3.7']
-          test_suites:
-              all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] &&  venv\Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
-
-    - template: etc/ci/azure-win.yml
-      parameters:
-          job_name: win2019_cpython_latest_from_pip2
+          job_name: win2019_cpython_latest_from_pip
           image_name: windows-2019
-          python_versions: ['3.8', '3.9', '3.10']
-          test_suites:
-              all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] &&  venv\Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
-
-    - template: etc/ci/azure-win.yml
-      parameters:
-          job_name: win2022_cpython_latest_from_pip1
-          image_name: windows-2022
-          python_versions: ['3.7', '3.8']
+          python_versions: ['3.7', '3.8', '3.9', '3.10']
           test_suites:
               all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] &&  venv\Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
 
     - template: etc/ci/azure-win.yml
       parameters:
-          job_name: win2022_cpython_latest_from_pip2
+          job_name: win2022_cpython_latest_from_pip
           image_name: windows-2022
-          python_versions: ['3.9', '3.10']
+          python_versions: ['3.7', '3.8', '3.9', '3.10']
           test_suites:
               all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] &&  venv\Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
 

docs/source/contribute/contrib_dev.rst

@@ -186,7 +186,7 @@ recursive dependencies.
 
 There are utility scripts in ``etc/release`` that can help with the dependencies
 management process in particular to build or update wheels with native code for
-multiple OSes (Linux, macOS and Windows) and multiple Python versions (3.6+),
+multiple OSes (Linux, macOS and Windows) and multiple Python versions (3.7+),
 which is not a completely simple operation (and requires eventually 12 wheels
 and one source distribution to be published as we support 3 OSes and 4 Python
 versions).

docs/source/getting-started/install.rst

@@ -31,7 +31,7 @@ There are four main ways to install ScanCode.
 Before Installing
 -----------------
 
-- ScanCode requires a Python version 3.6, 3.7, 3.8. or 3.9 and is
+- ScanCode requires a Python version 3.7, 3.8, 3.9  or 3.10 and is
   tested on Linux, macOS, and Windows. It should work fine on FreeBSD.
 
 
@@ -55,8 +55,8 @@ System Requirements
 Prerequisites
 ^^^^^^^^^^^^^
 
-ScanCode needs a Python 3.6+ interpreter; We support all Python versions from
-3.6 to 3.9.
+ScanCode needs a Python 3.7+ interpreter; We support all Python versions from
+3.7 to 3.10.
 
 - **On Linux**:
 
@@ -74,23 +74,23 @@ ScanCode needs a Python 3.6+ interpreter; We support all Python versions from
 
     - On RPM-based distros run::
 
-          sudo yum install python3.6-devel zlib bzip2-libs xz-libs libxml2-devel libxslt-devel libpopt0
+          sudo yum install python3.8-devel zlib bzip2-libs xz-libs libxml2-devel libxslt-devel libpopt0
 
     - On Fedora 22 and later run::
 
-          sudo dnf install python3.6-devel xz-libs zlib libxml2-devel libxslt-devel bzip2-libs libpopt0
+          sudo dnf install python3.8-devel xz-libs zlib libxml2-devel libxslt-devel bzip2-libs libpopt0
 
 
     If these packages are not available from your package manager, you must
     compile them  from sources.
 
 - **On Mac**:
 
-    Download and install Python 3.6 or higher from https://www.python.org/
+    Download and install Python 3.7 or higher from https://www.python.org/
 
 - **On Windows**:
 
-    Download and install Python 3.6 or higher from https://www.python.org/
+    Download and install Python 3.7 or higher from https://www.python.org/
 
     .. Note::
 

etc/scripts/utils_requirements.py

@@ -8,6 +8,8 @@
 # See https://github.com/nexB/skeleton for support or download.
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
+
+import os
 import re
 import subprocess