From 5d6beda897085ae7a0f60d4faf14309b4be6ef18 Mon Sep 17 00:00:00 2001 From: Philippe Ombredanne Date: Tue, 27 Oct 2020 22:29:51 +0100 Subject: [PATCH] Drop Python 2 from CI #295 Signed-off-by: Philippe Ombredanne --- .travis.yml | 32 -------- appveyor.yml | 2 - azure-pipelines.yml | 195 +++++++------------------------------------- 3 files changed, 29 insertions(+), 200 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ee14b40503..587d5498aeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,27 +15,6 @@ matrix: language: generic python: - - os: osx - env: - - PYTHON="2.7.15" - - TEST_SUITE="bin/py.test -vvs --reruns 3 tests/scancode" - language: generic - python: - - - os: linux - sudo: required - env: TEST_SUITE="bin/py.test -vvs --reruns 3 tests/scancode" - language: python - python: "2.7" - dist: xenial - - - os: linux - sudo: required - env: TEST_SUITE="bin/py.test -vvs --reruns 3 tests/scancode" - language: python - python: "2.7" - dist: bionic - - os: linux sudo: required env: TEST_SUITE="bin/py.test -vvs --reruns 3 tests/scancode" @@ -101,14 +80,3 @@ script: # - ./bin/py.test -n 2 -vvs tests/scancode # - echo $TEST_SUITE - $TEST_SUITE - -notifications: - irc: - channels: - - "chat.freenode.net#aboutcode" - on_success: change - on_failure: always - use_notice: true - skip_join: true - template: - - "%{repository_slug}#%{build_number} (%{branch}-%{commit}:%{author})-%{message}- %{build_url}" diff --git a/appveyor.yml b/appveyor.yml index 1dadef43355..c309fb6dad4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,8 +5,6 @@ ################################################################################ environment: matrix: - - PYTHON: "C:\\Python27" - - PYTHON: "C:\\Python27-x64" - PYTHON: "C:\\Python36" - PYTHON: "C:\\Python36-x64" # - PYTHON: "C:\\Python37" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5f4542de849..09703bfdb72 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,20 +1,45 @@ ################################################################################ -# We use Azure to run the full tests suites on Pythons 2.7 and 3.6 +# We use Azure to run the full tests suites on Python 3.6 # on Windows (32 and 64), macOS and Linux (64 various distro) ################################################################################ jobs: +######################################################################## +# RELEASE on 3.6. Also check that we can pip install +######################################################################## + + - job: Build_release_archive_py3 + pool: + vmImage: ubuntu-16.04 + steps: + - checkout: self + fetchDepth: 10 + + - task: UsePythonVersion@0 + inputs: + versionSpec: '3.6' + displayName: 'Install Python 3.6' + + - script: ./etc/release/release.sh + displayName: 'Build installable releases' + + - script: ./etc/release/pip-install.sh + displayName: 'Test pip wheel installation' + + - script: ./etc/release/pip-install-editable.sh + displayName: 'Test pip editable installation' + ################################################################################ -# These jobs are using VMs and Azure-provided Pythons 2.7 +# These jobs are using VMs and Azure-provided Pythons 3.6 ################################################################################ - template: etc/ci/azure-linux.yml parameters: - job_name: vm_ubuntu16_py27 + job_name: vm_ubuntu16_py36 image_name: ubuntu-16.04 - python_versions: ['2.7'] + python_versions: ['3.6'] test_suites: misc: | bin/py.test -n 2 -vvs --reruns=3 --test-suite=all \ @@ -63,168 +88,6 @@ jobs: --cov=src --cov-report=term --cov-report=xml bin/codecov --token "$CODECOV_TOKEN" - - template: etc/ci/azure-win.yml - parameters: - job_name: Win2016_32_py27 - image_name: vs2017-win2016 - python_versions: ['2.7'] - python_architecture: x86 - test_suites: - misc: Scripts\py.test -vvs --reruns=3 --ignore=tests\scancode --ignore=tests\cluecode --ignore=tests\licensedcode - scancode: Scripts\py.test -vvs --reruns=3 tests\scancode - lic_cluecode: Scripts\py.test -vvs --reruns=3 tests\cluecode tests\licensedcode - - - template: etc/ci/azure-win.yml - parameters: - job_name: Win2016_64_py27 - image_name: vs2017-win2016 - python_versions: ['2.7'] - python_architecture: x64 - test_suites: - misc: Scripts\py.test -vvs --reruns=3 --ignore=tests\scancode --ignore=tests\cluecode --ignore=tests\licensedcode - scancode: Scripts\py.test -vvs --reruns=3 tests\scancode - lic_cluecode: Scripts\py.test -vvs --reruns=3 tests\cluecode tests\licensedcode - - - template: etc/ci/azure-mac.yml - parameters: - job_name: macos1015_py27 - image_name: macos-10.15 - python_versions: ['2.7'] - test_suites: - all: bin/py.test -n 2 -vvs --reruns=3 --ignore=tests/scancode - scancode: bin/py.test -vvs --reruns=3 tests/scancode - - -################################################################################ -# These jobs are using containers and their own Python 2.7 -################################################################################ - - - template: etc/ci/azure-container-deb.yml - parameters: - job_name: ubuntu18_py27 - container: 'ubuntu:bionic' - python_path: python2.7 - python_version: '2.7' - install_python: sudo apt-get install -y python python-dev - test_suite_label: all - test_suite: bin/py.test -n 2 -vvs --reruns=3 - -# - template: etc/ci/azure-container-rpm.yml -# parameters: -# job_name: centos7_py27 -# container: centos:7 -# python_path: python2.7 -# python_version: '2.7' -# install_python: sudo yum install -y python python27-devel -# test_suite_label: all -# test_suite: bin/py.test -n 2 -vvs --reruns=3 -# -# - template: etc/ci/azure-container-rpm.yml -# parameters: -# job_name: manylinux1_py27 -# container: quay.io/pypa/manylinux1_x86_64:latest -# python_path: /opt/python/cp27-cp27mu/bin/python -# python_version: '2.7' -# install_packages: echo "No extra packages for now" -# install_python: echo "Python is pre-installed" -# test_suite_label: all -# test_suite: bin/py.test -n 2 -vvs --reruns=3 -# -# - template: etc/ci/azure-container-rpm.yml -# parameters: -# job_name: manylinux2010_py27 -# container: quay.io/pypa/manylinux2010_x86_64:latest -# python_path: /opt/python/cp27-cp27mu/bin/python -# python_version: '2.7' -# install_packages: echo "No extra packages for now" -# install_python: echo "Python is pre-installed" -# test_suite_label: all -# test_suite: bin/py.test -n 2 -vvs --reruns=3 -# -# - template: etc/ci/azure-container-rpm.yml -# parameters: -# job_name: fedora30_py27 -# container: fedora:30 -# package_manager: dnf -# python_path: python2.7 -# python_version: '2.7' -# install_python: | -# set -e -x -# sudo dnf install -y python2 python2-devel -# test_suite_label: all -# test_suite: bin/py.test -n 2 -vvs --reruns=3 -# -# - template: etc/ci/azure-container-deb.yml -# parameters: -# job_name: debian9_py27 -# container: debian:stretch -# python_path: python2.7 -# python_version: '2.7' -# install_python: sudo apt-get install -y python python-dev -# test_suite_label: all -# test_suite: bin/py.test -n 2 -vvs --reruns=3 - - -######################################################################## -# RELEASE on 2.7. Also check that we can pip install -######################################################################## - - - job: Build_release_archive_py2 - pool: - vmImage: ubuntu-16.04 - steps: - - checkout: self - fetchDepth: 10 - - - task: UsePythonVersion@0 - inputs: - versionSpec: '2.7' - displayName: 'Install Python 2.7' - - - script: ./etc/release/release.sh - displayName: 'Build installable releases' - - - script: ./etc/release/pip-install2.sh - displayName: 'Test pip installation' - - -######################################################################## -# RELEASE on 3.6. Also check that we can pip install -######################################################################## - - - job: Build_release_archive_py3 - pool: - vmImage: ubuntu-16.04 - steps: - - checkout: self - fetchDepth: 10 - - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.6' - displayName: 'Install Python 3.6' - - - script: ./etc/release/release.sh - displayName: 'Build installable releases' - - - script: ./etc/release/pip-install.sh - displayName: 'Test pip wheel installation' - - - script: ./etc/release/pip-install-editable.sh - displayName: 'Test pip editable installation' - -################################################################################ -# These jobs are using VMs and Azure-provided Pythons 3.6 -################################################################################ - - - template: etc/ci/azure-linux.yml - parameters: - job_name: vm_ubuntu16_py36 - image_name: ubuntu-16.04 - python_versions: ['3.6'] - test_suites: - all: bin/py.test -n 2 -vvs --reruns=3 - - template: etc/ci/azure-mac.yml parameters: job_name: macos1015_py36