Skip to content

Commit

Permalink
Update CI (#1178)
Browse files Browse the repository at this point in the history
* Using tox-venv no longer necessary

VirtualEnv rewrite should fix compatibility issues

* Update travis conf

- Set os option
- Use Ubuntu bionic
- Remove deprecated sudo flag
- Update 'matrix' to 'jobs'

* Add Python 3.8 to Azure config

* Use tox-factor for tox test env selection

This should fix Azure builds so they don't run all tox test envs.

* Fixup tox Python env factor
  • Loading branch information
rpkilby committed Mar 4, 2020
1 parent e71d235 commit 873786e
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 25 deletions.
30 changes: 17 additions & 13 deletions .azure_pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,25 @@

strategy:
matrix:
# For some reason, Python 3.4 tries to install Django 2.0 - disabling for now
# PY34:
# PYTHON_VERSION: '3.4'
PY35:
PYTHON_VERSION: '3.5'
TOXENV: django111, django20, django21
TOXFACTOR: py35
PY36:
PYTHON_VERSION: '3.6'
PY36_isort:
PYTHON_VERSION: '3.6'
TOXENV: isort,lint,docs
PY36_warnings:
PYTHON_VERSION: '3.6'
TOXENV: warnings
TOXFACTOR: py36
PY37:
PYTHON_VERSION: '3.7'
TOXFACTOR: py37
PY38:
PYTHON_VERSION: '3.8'
TOXFACTOR: py38

PY38_isort:
PYTHON_VERSION: '3.8'
TOXENV: isort,lint,docs
PY38_warnings:
PYTHON_VERSION: '3.8'
TOXENV: warnings

steps:
- task: UsePythonVersion@0
Expand All @@ -32,12 +35,13 @@ steps:
displayName: Ensure latest setuptools

- script: |
pip install coverage tox tox-venv unittest-xml-reporting
pip install coverage tox tox-factor unittest-xml-reporting
displayName: Install deps

- script: |
pip --version
tox --skip-missing-interpreters true
tox --version
tox
displayName: Run tox

- script: |
Expand Down Expand Up @@ -67,4 +71,4 @@ steps:
pip install codecov
codecov
displayName: Codecov
condition: false
condition: false
19 changes: 9 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
sudo: false

dist: xenial
os: linux
dist: bionic
language: python
python:
- "3.5"
- "3.6"
- "3.7"
- "3.8"

cache: pip

install:
- pip install coverage tox tox-travis tox-venv
- pip install coverage tox tox-factor

script:
- coverage erase
- tox

matrix:
jobs:
fast_finish: true
include:
- { python: "3.5", env: TOXFACTOR=py35 }
- { python: "3.6", env: TOXFACTOR=py36 }
- { python: "3.7", env: TOXFACTOR=py37 }
- { python: "3.8", env: TOXFACTOR=py38 }

- python: "3.8"
env: TOXENV=isort,lint,docs
- python: "3.8"
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ envlist =
{py35,py36}-django20,
{py35,py36,py37}-django21,
{py35,py36,py37}-django22,
{py36,py37,38}-django30,
{py36,py37,38}-latest,
{py36,py37,py38}-django30,
{py36,py37,py38}-latest,
isort,lint,docs,warnings,


Expand Down

0 comments on commit 873786e

Please sign in to comment.