From ef0ed84180f9247e7cf2402b780536c359c4778e Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 5 May 2019 18:49:44 -0400 Subject: Replace debian wheezy with ubuntu trusty (#4871) * Try running tests without wheezy * Added a trusty builder * Update our supported versions in docs --- .travis.yml | 6 +++--- docs/installation.rst | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 760f97b9..930f6ea1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,9 +65,6 @@ matrix: - python: 2.7 services: docker env: TOXENV=py27 DOCKER=pyca/cryptography-runner-centos7 - - python: 2.7 - services: docker - env: TOXENV=py27 DOCKER=pyca/cryptography-runner-wheezy - python: 2.7 services: docker env: TOXENV=py27 DOCKER=pyca/cryptography-runner-jessie @@ -86,6 +83,9 @@ matrix: - python: 3.7 services: docker env: TOXENV=py37 DOCKER=pyca/cryptography-runner-sid + - python: 2.7 + services: docker + env: TOXENV=py27 DOCKER=pyca/cryptography-runner-ubuntu-trusty - python: 2.7 services: docker env: TOXENV=py27 DOCKER=pyca/cryptography-runner-ubuntu-rolling diff --git a/docs/installation.rst b/docs/installation.rst index 5b2854d9..65d24da5 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -14,9 +14,9 @@ Currently we test ``cryptography`` on Python 2.7, 3.4+, and PyPy 5.4+ on these operating systems. * x86-64 CentOS 7.x -* macOS 10.12 Sierra, 10.11 El Capitan +* macOS 10.12 Sierra, 10.10 Yosemite * x86-64 Ubuntu 14.04, 16.04, and rolling -* x86-64 Debian Wheezy (7.x), Jessie (8.x), Stretch (9.x), and Sid (unstable) +* x86-64 Debian Jessie (8.x), Stretch (9.x), Buster (10.x), and Sid (unstable) * x86-64 Alpine (latest) * 32-bit and 64-bit Python on 64-bit Windows Server 2012 -- cgit v1.2.3