diff --git a/.travis.yml b/.travis.yml index 782c598f83..17bffbd05c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,5 +25,8 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo mkdir -p $SWBASE && sudo chown $USER $SWBASE; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl https://download.calibre-ebook.com/travis/sw-osx.tar.bz2 | tar xj -C $SWBASE; fi - npm install --no-optional rapydscript-ng && echo $PATH && which rapydscript && rapydscript --version + - python $SW/bin/easy_install --user "pip==9.0.1" + - pip install --user -r requirements.txt - python setup.py bootstrap --ephemeral + script: python setup.py test diff --git a/appveyor.yml b/appveyor.yml index 6c18c61e53..4d8531fd7f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ os: Visual Studio 2015 clone_folder: C:\calibre clone_depth: 5 branches: - only: + only: - vs2015 cache: @@ -19,7 +19,9 @@ platform: - x64 before_build: - - C:\Python35-x64\python.exe setup/win-ci.py sw + - C:\Python35-x64\python.exe setup/win-ci.py sw + - C:\sw\private\python\easy_install.exe --user "pip==9.0.1" + - C:\sw\private\python\pip install --user -r requirements.txt build_script: - C:\sw\private\python\python.exe setup/win-ci.py build diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000..ade8b82800 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +# Note, this file is work-in-progress, and is partial only. +mock==2.0.0