Merge branch 'master' into no-peeking

.travis.yml

@@ -1,27 +1,19 @@
-sudo: false
-dist: trusty
 language: python
 
-cache:
-  directories:
-  - /home/travis/download
-  - /home/travis/.cache/pip
-
-matrix:
-  include:
-    # This environment tests that the code works on Python 3.6
-    # and prints a coverage report at the end.
-    - env: PYTHON_VERSION="3.6" COVERAGE="true"
-    # This environment doesn't run tests, but does check for lint violations.
-    # - env: PYTHON_VERSION="3.6" RUN_LINT="true" SKIP_TESTS="true"
+cache: pip
 
 notifications:
   email: false
 
 branches:
-  only: 
+  only:
     - master
 
-install: source build_tools/travis/install.sh
+
+# Trying something new here...
+# install: source build_tools/travis/install.sh
+install:
+  - pip install -r requirements.txt
+
 script: bash build_tools/travis/test_script.sh
 after_success: source build_tools/travis/after_success.sh

requirements.txt

@@ -1,6 +1,9 @@
 torch==1.1.0
 git+git://github.com/rloganiv/allennlp.git@pytorch-grad-clip
 
+# Testing stuff
+pytest
+
 # Coverage reports
 pytest-cov
 codecov