From c30bcc8ad6f29a25204003307d1bc528d829d429 Mon Sep 17 00:00:00 2001 From: Wyatt Anderson Date: Fri, 13 Dec 2019 13:21:01 -0500 Subject: [PATCH 1/2] Fix CI by pinning pytest requirement --- .travis.yml | 3 +-- requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe55b138..8db5d1a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python install: - - pip install git+https://github.com/Psycojoker/baron.git - - pip install pytest + - pip install -r requirements.txt - find . -name '*.pyc' -delete - python setup.py install python: diff --git a/requirements.txt b/requirements.txt index ec62a101..cf4c68fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ baron -pytest +pytest<4 +more-itertools<8 pygments From 19567051e848993ea963f1c3a58134759f30fd9f Mon Sep 17 00:00:00 2001 From: Wyatt Anderson Date: Fri, 13 Dec 2019 13:25:57 -0500 Subject: [PATCH 2/2] Remove Python 2.6 CI support since Travis dropped it --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8db5d1a2..c37cabc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ install: - find . -name '*.pyc' -delete - python setup.py install python: - - "2.6" - "2.7" - "3.4" - "3.5"