summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDwayne Litzenberger <dlitz@dlitz.net>2016-04-02 04:51:43 -0700
committerDwayne Litzenberger <dlitz@dlitz.net>2016-04-02 04:51:43 -0700
commit4ebf8e6b3ff99bcdf83fcaf0d8623ca555d866af (patch)
tree8784717afe0103dd124556aca83ab1050c3d7775
parent7244b4801f3c72d9bd342029f9f315e1da14cd03 (diff)
downloadpycrypto-2.6.x-ci-wip.tar.gz
Re-enable linux; timeouts=1hour2.6.x-ci-wip2.6.x-ci-appveyor-wip
-rw-r--r--.travis.yml21
1 files changed, 8 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index 4679c34..d6de108 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,23 +2,20 @@
# See https://travis-ci.org/dlitz/pycrypto for build status.
# See https://docs.travis-ci.com/ for general info about the format of this file.
os:
-# - linux
+ - linux
- osx
-#matrix:
-# include:
-# - os: osx
-# language: generic
-# env: PYENV_VERSION=2.1.3
-#addons:
-# apt:
-# packages:
-# - libgmp-dev
+addons:
+ apt:
+ packages:
+ - libgmp-dev
sudo: false
cache:
- #ccache: true
+ timeout: 3600
pip: true
directories:
- $HOME/.pyenv/cache
+# OSX doesn't support `language: python` yet, so we use generic here.
+language: generic
env:
- PYENV_VERSION=2.1.3
- PYENV_VERSION=2.2.3
@@ -45,8 +42,6 @@ env:
# See https://github.com/dlitz/pycrypto/pull/59
# - PYENV_VERSION=pypy-2.3.1
# - PYENV_VERSION=pypy3-2.3.1
-# OSX doesn't support `language: python` yet, so we use generic here.
-language: generic
before_install:
# Unexport variables
- declare +x python_flags