From abca90a128160ce243b1997a224965f76f04db59 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Mon, 7 Nov 2016 17:51:43 -0800 Subject: [PATCH] install the virtualenv package with pip because the apt version is old and conflicts with the recent version of pip we're using --- ansible/roles/brozzler-worker/tasks/main.yml | 1 - ansible/roles/common/tasks/main.yml | 4 ++++ ansible/roles/warcprox/tasks/main.yml | 1 - setup.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ansible/roles/brozzler-worker/tasks/main.yml b/ansible/roles/brozzler-worker/tasks/main.yml index e580cf9..96ec0b2 100644 --- a/ansible/roles/brozzler-worker/tasks/main.yml +++ b/ansible/roles/brozzler-worker/tasks/main.yml @@ -9,7 +9,6 @@ become: true apt: name={{item}} state=present with_items: - - python-virtualenv - vnc4server - chromium-browser - xfonts-base diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index ae6f944..4648629 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -19,6 +19,10 @@ command: python3 setup.py install chdir=/tmp/pip-8.1.2 creates=/usr/local/lib/python2.7/dist-packages/pip-8.1.2-py2.7.egg/pip/__init__.py become: true +- name: run "pip install virtualenv" + command: pip install virtualenv + creates=/usr/local/lib/python3.4/dist-packages/virtualenv.py + become: true - command: id {{user}} register: id_user ignore_errors: true diff --git a/ansible/roles/warcprox/tasks/main.yml b/ansible/roles/warcprox/tasks/main.yml index 78788e2..d1724d4 100644 --- a/ansible/roles/warcprox/tasks/main.yml +++ b/ansible/roles/warcprox/tasks/main.yml @@ -4,7 +4,6 @@ apt: name={{item}} state=present with_items: - gcc - - python-virtualenv - python3.4 - libpython3.4-dev - libffi-dev diff --git a/setup.py b/setup.py index 84a3cc6..4fcf4a7 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ def find_package_data(package): setuptools.setup( name='brozzler', - version='1.1b7.dev111', + version='1.1b7.dev112', description='Distributed web crawling with browsers', url='https://github.com/internetarchive/brozzler', author='Noah Levitt',