From 6290e70c80ebbf5bb286f5f781c479e852a666cf Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 29 Nov 2016 21:30:23 +0100 Subject: [PATCH] partially remove virtualenv/pip version requirement, fixes #1738 Is needed only for python 3.2 support. For normal development, we expect you have py34+ for borg 1.1. For vagrant, it is still needed because of older VMs like wheezy (py32). Not needed for Travis-CI any more, we moved to trusty VMs (py34) there. --- .travis/install.sh | 4 ++-- requirements.d/development.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 6a2e9cb7c..309a3e9df 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -31,9 +31,9 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then ;; esac pyenv rehash - python -m pip install --user 'virtualenv<14.0' + python -m pip install --user virtualenv else - pip install 'virtualenv<14.0' + pip install virtualenv sudo apt-get update sudo apt-get install -y liblz4-dev sudo apt-get install -y libacl1-dev diff --git a/requirements.d/development.txt b/requirements.d/development.txt index a0cb3c2ac..f14c3abf5 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,4 +1,4 @@ -virtualenv<14.0 +virtualenv tox pytest pytest-cov