diff --git a/.azure/ci-linux-job.yml b/.azure/ci-linux-job.yml index ba9dea24..79b8a4db 100644 --- a/.azure/ci-linux-job.yml +++ b/.azure/ci-linux-job.yml @@ -5,11 +5,7 @@ jobs: 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' @@ -38,14 +34,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<45" wheel + python -m pip install -U pip "setuptools<45" wheel python -m pip install -r requirements.txt displayName: 'Install Python dependencies' diff --git a/.azure/ci-macos-job.yml b/.azure/ci-macos-job.yml index 727c592f..d42219c7 100644 --- a/.azure/ci-macos-job.yml +++ b/.azure/ci-macos-job.yml @@ -5,11 +5,7 @@ jobs: pool: 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' @@ -41,7 +37,7 @@ jobs: - script: | curl -O https://bootstrap.pypa.io/get-pip.py $PYTHON get-pip.py - $PYTHON -m pip install -U "setuptools<45" wheel + $PYTHON -m pip install -U "setuptools<45" wheel $PYTHON -m pip install -r requirements.txt displayName: 'Install Python dependencies' diff --git a/.azure/ci-windows-job.yml b/.azure/ci-windows-job.yml index fadb1f98..89b66307 100644 --- a/.azure/ci-windows-job.yml +++ b/.azure/ci-windows-job.yml @@ -6,7 +6,7 @@ jobs: #vmImage: 'vs2015-win2012r2' vmImage: 'vs2017-win2016' strategy: - matrix: + matrix: Py36_x86: python.version: '3.6' python.arch: x86 @@ -42,7 +42,7 @@ jobs: submodules: recursive - task: UsePythonVersion@0 - inputs: + inputs: versionSpec: '$(python.version)' architecture: '$(python.arch)' @@ -54,7 +54,7 @@ jobs: - bash: | curl -O https://bootstrap.pypa.io/get-pip.py python get-pip.py - python -m pip install -U "setuptools<45" wheel + python -m pip install -U "setuptools<45" wheel python -m pip install -r requirements.txt displayName: 'Install Python dependencies'