From 4ebf8e6b3ff99bcdf83fcaf0d8623ca555d866af Mon Sep 17 00:00:00 2001
From: Dwayne Litzenberger <dlitz@dlitz.net>
Date: Sat, 2 Apr 2016 04:51:43 -0700
Subject: Re-enable linux; timeouts=1hour

---
 .travis.yml | 21 ++++++++-------------
 1 file 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
-- 
cgit v1.2.1