Update CI configuration to match master

This commit is contained in:
Scott Talbert
2021-01-20 20:02:48 -05:00
parent 95c3c7db94
commit f4982db0fe
3 changed files with 40 additions and 30 deletions

View File

@@ -1,14 +1,11 @@
jobs:
- job: Linux_CI
timeoutInMinutes: 90
displayName: 'Linux CI'
pool:
vmImage: 'Ubuntu 16.04'
strategy:
matrix:
Py27:
python: 'python2.7'
make_venv: 'python2.7 -m virtualenv venv'
venv_pkg: 'python-virtualenv'
matrix:
Py36:
python: 'python3.6'
make_venv: 'python3.6 -m venv venv'
@@ -21,7 +18,10 @@ jobs:
python: 'python3.8'
make_venv: 'python3.8 -m venv venv'
venv_pkg: 'python3.8-venv'
maxParallel: 4
Py39:
python: 'python3.9'
make_venv: 'python3.9 -m venv venv'
venv_pkg: 'python3.9-venv'
variables: {'PYTHONUNBUFFERED': '1'}
@@ -37,14 +37,14 @@ jobs:
sudo apt-get install -y libgtk-3-dev libjpeg-dev libtiff-dev \
libsdl2-dev libgstreamer-plugins-base1.0-dev libnotify-dev \
libsm-dev libwebkit2gtk-4.0-dev libxtst-dev \
libgl1-mesa-dev libglu1-mesa-dev $VENV_PKG
libgl1-mesa-dev libglu1-mesa-dev $VENV_PKG
displayName: 'Install deb package requirements'
- script: |
$PYTHON --version
$PYTHON --version
$MAKE_VENV
source venv/bin/activate
python -m pip install -U pip setuptools wheel
python -m pip install -U pip setuptools wheel
python -m pip install -r requirements.txt
displayName: 'Install Python dependencies'

View File

@@ -1,14 +1,11 @@
jobs:
- job: MacOS_CI
timeoutInMinutes: 90
displayName: 'MacOS CI'
pool:
vmImage: 'macOS-10.13'
vmImage: 'macOS-10.14'
strategy:
matrix:
Py27:
python_version: '2.7.16'
python_pkg: 'python-2.7.16-macosx10.9.pkg'
python: 'python2.7'
matrix:
Py36:
python_version: '3.6.8'
python_pkg: 'python-3.6.8-macosx10.9.pkg'
@@ -21,7 +18,10 @@ jobs:
python_version: '3.8.0'
python_pkg: 'python-3.8.0-macosx10.9.pkg'
python: 'python3.8'
maxParallel: 4
Py39:
python_version: '3.9.0'
python_pkg: 'python-3.9.0-macosx10.9.pkg'
python: 'python3.9'
variables: {'PYTHONUNBUFFERED': '1'}
@@ -40,7 +40,7 @@ jobs:
- script: |
curl -O https://bootstrap.pypa.io/get-pip.py
$PYTHON get-pip.py
$PYTHON -m pip install -U setuptools wheel
$PYTHON -m pip install -U setuptools wheel
$PYTHON -m pip install -r requirements.txt
displayName: 'Install Python dependencies'

View File

@@ -1,11 +1,12 @@
jobs:
- job: Windows_CI
timeoutInMinutes: 90
displayName: 'Windows CI'
pool:
#vmImage: 'vs2015-win2012r2'
vmImage: 'vs2017-win2016'
strategy:
matrix:
matrix:
Py36_x86:
python.version: '3.6'
python.arch: x86
@@ -14,6 +15,15 @@ jobs:
python.version: '3.7'
python.arch: x86
addToPath: true
Py38_x86:
python.version: '3.8'
python.arch: x86
addToPath: true
# Py39_x86:
# python.version: '3.9'
# python.arch: x86
# addToPath: true
Py36_x64:
python.version: '3.6'
python.arch: x64
@@ -22,16 +32,14 @@ jobs:
python.version: '3.7'
python.arch: x64
addToPath: true
maxParallel: 4
# Py38_x86:
# python.version: '3.8'
# python.arch: x86
# addToPath: true
# Py38_x64:
# python.version: '3.8'
# python.arch: x64
# addToPath: true
Py38_x64:
python.version: '3.8'
python.arch: x64
addToPath: true
# Py39_x64:
# python.version: '3.9'
# python.arch: x64
# addToPath: true
variables: {'PYTHONUNBUFFERED': '1'}
@@ -41,19 +49,21 @@ jobs:
submodules: recursive
- task: UsePythonVersion@0
inputs:
inputs:
versionSpec: '$(python.version)'
architecture: '$(python.arch)'
- bash: |
which python
python -c "import sys; print(sys.version); print(sys.prefix)"
# check what Pythons are available
ls -al /c/hostedtoolcache/windows/Python
displayName: 'Check Python'
- bash: |
curl -O https://bootstrap.pypa.io/get-pip.py
python get-pip.py
python -m pip install -U setuptools wheel
python -m pip install -U setuptools wheel
python -m pip install -r requirements.txt
displayName: 'Install Python dependencies'