From 139a6e9e41dc3dd006483a4d53259addc4401fa1 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Sat, 23 Jun 2018 18:03:51 -0700 Subject: [PATCH] Revert "Speed up Travis by reusing pip wheel cache across builds (#324)" This reverts commit 47e689a89b3f5f0969595b17d2ec59ea3caffb3b. --- .travis.yml | 8 +------- setup.py | 11 +++-------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index f272ab38..91009165 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,7 @@ python: # Executed for 3.5 AND 3.5 as the first "test" stage: script: - - pip install -U pip wheel - - pip install .[test] - - pytest - -cache: - directories: - - $HOME/.cache/pip + - python setup.py test # This defines further stages that execute after the tests jobs: diff --git a/setup.py b/setup.py index 67253a7f..79b1a519 100644 --- a/setup.py +++ b/setup.py @@ -47,15 +47,10 @@ setup( datasette=datasette.cli:cli ''', setup_requires=['pytest-runner'], - extras_require={ - 'test': [ - 'pytest==3.6.0', - 'aiohttp==2.3.2', - 'beautifulsoup4==4.6.0', - ] - }, tests_require=[ - 'datasette[test]', + 'pytest==3.6.0', + 'aiohttp==2.3.2', + 'beautifulsoup4==4.6.0', ], classifiers=[ 'Development Status :: 4 - Beta',