diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2019-05-05 18:49:44 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-05-05 18:49:44 -0400 |
| commit | ef0ed84180f9247e7cf2402b780536c359c4778e (patch) | |
| tree | d0aeaf5bea6abd1995782a2a805afa18ece0276d | |
| parent | 6ec71fd04502e3fa43183fa8ecb0916e8fb3a1fd (diff) | |
| download | cryptography-ef0ed84180f9247e7cf2402b780536c359c4778e.tar.gz cryptography-ef0ed84180f9247e7cf2402b780536c359c4778e.tar.bz2 cryptography-ef0ed84180f9247e7cf2402b780536c359c4778e.zip | |
Replace debian wheezy with ubuntu trusty (#4871)
* Try running tests without wheezy
* Added a trusty builder
* Update our supported versions in docs
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | 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 @@ -67,9 +67,6 @@ matrix: 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 - python: 3.4 services: docker @@ -88,6 +85,9 @@ matrix: 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 - python: 3.7 services: docker 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 |