summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2019-12-29 05:23:44 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2019-12-30 18:28:26 (GMT)
commitb62749ff5d1efd32dbef28345d06919e5a9acd78 (patch)
treea7f80e8134250bb5dc872da70d9f87459d39fa28
parent4d267b3046804ea7424a956980b98c14ed6e19ad (diff)
downloadSCons-b62749ff5d1efd32dbef28345d06919e5a9acd78.zip
SCons-b62749ff5d1efd32dbef28345d06919e5a9acd78.tar.gz
SCons-b62749ff5d1efd32dbef28345d06919e5a9acd78.tar.bz2
Remove Python 2.7 from CI
-rw-r--r--.appveyor.yml20
-rw-r--r--.travis.yml49
2 files changed, 1 insertions, 68 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 0287df9..a5d7dbe 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -49,12 +49,6 @@ install:
# split builds into sets of four jobs due to appveyor per-job time limit
environment:
matrix:
- - WINPYTHON: "Python27"
- PYTHON: "2.7"
- PYVER: 27
- BUILD_JOB_NUM: 1
- COVERAGE: 0
-
- WINPYTHON: "Python35"
PYTHON: "3.5"
PYVER: 35
@@ -79,12 +73,6 @@ environment:
BUILD_JOB_NUM: 1
COVERAGE: 0
- # - WINPYTHON: "Python27"
- # PYTHON: "2.7"
- # PYVER: 27
- # BUILD_JOB_NUM: 2
- # COVERAGE: 0
-
# - WINPYTHON: "Python35"
# PYTHON: "3.5"
# PYVER: 35
@@ -116,15 +104,13 @@ matrix:
exclude:
# test python 3.5 on Visual Studio 2015 image
- image: Visual Studio 2015
- WINPYTHON: "Python27"
- - image: Visual Studio 2015
WINPYTHON: "Python36"
- image: Visual Studio 2015
WINPYTHON: "Python37"
- image: Visual Studio 2015
WINPYTHON: "Python38"
- # test python 2.7, 3.8 on Visual Studio 2017 image
+ # test python 3.8 on Visual Studio 2017 image
- image: Visual Studio 2017
WINPYTHON: "Python35"
- image: Visual Studio 2017
@@ -134,16 +120,12 @@ matrix:
# test python 3.7 on Visual Studio 2019 image
- image: Visual Studio 2019
- WINPYTHON: "Python27"
- - image: Visual Studio 2019
WINPYTHON: "Python35"
- image: Visual Studio 2019
WINPYTHON: "Python36"
# skip on Ubuntu
- image: Ubuntu
- WINPYTHON: "Python27"
- - image: Ubuntu
WINPYTHON: "Python35"
- image: Ubuntu
WINPYTHON: "Python36"
diff --git a/.travis.yml b/.travis.yml
index 4431eb1..0c84271 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,13 +64,6 @@ jobs:
sudo: required
- <<: *test_job
- python: 2.7
- env:
- - PYVER=27
- - PYTHON=2.7
- sudo: required
-
- - <<: *test_job
python: 3.5
env:
- PYVER=35
@@ -165,45 +158,3 @@ jobs:
- PYVER=37
- PYTHON=3.7
- BUILD_JOB_NUM=1
-#
-# - <<: *coverage_jobs
-# env:
-# - PYVER=27
-# - PYTHON=2.7
-# - BUILD_JOB_NUM=2
-# - <<: *coverage_jobs
-# env:
-# - PYVER=27
-# - PYTHON=2.7
-# - BUILD_JOB_NUM=3
-# - <<: *coverage_jobs
-# env:
-# - PYVER=27
-# - PYTHON=2.7
-# - BUILD_JOB_NUM=4
-
-# - <<: *coverage_jobs
-# python: 3.6
-# env:
-# - PYVER=36
-# - PYTHON=3.6
-# - BUILD_JOB_NUM=1
-# - <<: *coverage_jobs
-# python: 3.6
-# env:
-# - PYVER=36
-# - PYTHON=3.6
-# - BUILD_JOB_NUM=2
-# - <<: *coverage_jobs
-# python: 3.6
-# env:
-# - PYVER=36
-# - PYTHON=3.6
-# - BUILD_JOB_NUM=3
-# - <<: *coverage_jobs
-# python: 3.6
-# env:
-# - PYVER=36
-# - PYTHON=3.6
-# - BUILD_JOB_NUM=4
-