Merge pull request #3551 from jzoldak/zoldak/remove-pip-accel

Remove partially implemented pip-accel code

playbooks/roles/jenkins_worker/defaults/main.yml

@@ -18,21 +18,3 @@ packer_url: "https://releases.hashicorp.com/packer/0.8.6/packer_0.8.6_linux_amd6
 # custom firefox
 custom_firefox_version: 42.0
 custom_firefox_url: "https://ftp.mozilla.org/pub/firefox/releases/{{ custom_firefox_version }}/linux-x86_64/en-US/firefox-{{ custom_firefox_version }}.tar.bz2"
-
-# Pip-accel itself and other workarounds that need to be installed with pip
-pip_accel_reqs:
-  # Install Shapely with pip as it does not install cleanly
-  # with pip-accel because it has a weird setup.py
-  - "Shapely==1.2.16"
-  # Install unittest2 which is needed by lettuce
-  # but also pip-accel has trouble with determining that.
-  # unittest2>=0.8.0 (from testtools>=0.9.34->python-subunit->lettuce==0.2.20)
-  - "unittest2>=0.8.0"
-  # There is a bug in pip 1.4.1 by which --exists-action is broken.
-  # This is fixed in pip 1.5.x, but alas pip-accel is not yet compatible with pip 1.5.x.
-  # Remove when we can upgrade to a version of pip-accel that supports pip 1.5.x.
-  - "git+https://github.com/jzoldak/pip.git@v1.4.1patch772#egg=pip"
-  # Install pip-accel itself (using pip)
-  - "pip-accel==0.21.1"
-  # pip-accel only makes the s3 functionality available if boto is installed
-  - "boto=={{ common_boto_version }}"

playbooks/roles/jenkins_worker/tasks/python_platform_worker.yml

@@ -13,23 +13,8 @@
     depth=1
   become_user: "{{ jenkins_user }}"
 
-# pip-accel skipped due to conflicting versions of pip required
-# by the pip-accel package and edx-platform
-# - name: Pip installs that are needed for pip-accel to work for us
-#   pip: >
-#     name="{{ item }}"
-#     virtualenv={{ jenkins_home }}/edx-venv
-#     virtualenv_command=virtualenv-2.7
-#   become_user: "{{ jenkins_user }}"
-#   with_items: pip_accel_reqs
 
 # Install the platform requirements using pip.
-# Installing the platform requirements using pip-accel
-# would allow the binary distributions to be downloaded from S3
-# rather than compiled each time. This was previously enabled,
-# but reverted back to pip because the current version of pip-accel
-# (0.22.4) is only compatible with pip >= 1.4, < 1.5 and the current
-# version of pip in edx-platform is 6.0.8.
 - name: Install edx-platform requirements using pip
   pip: >
     requirements={{ jenkins_home }}/shallow-clone/requirements/edx/{{ item }}

playbooks/roles/jenkins_worker/tasks/system.yml

@@ -46,15 +46,3 @@
 - name: add preview.localhost to /etc/hosts
   shell: sed -i -r 's/^127.0.0.1\s+.*$/127.0.0.1 localhost preview.localhost/' /etc/hosts
   become: yes
-
-# Set up configuration for pip-accel for caching python requirements
-- name: Create directory for pip-accel config file
-  file: path={{ jenkins_home }}/.pip-accel state=directory
-    owner={{ jenkins_user }} group={{ jenkins_group }} mode=0777 recurse=yes
-  when: platform_worker is defined
-
-- name: Create pip-accel config file
-  template:
-    src=pip-accel.conf.j2 dest={{ jenkins_home }}/.pip-accel/pip-accel.conf
-    owner={{ jenkins_user }} group={{ jenkins_group }} mode=0664
-  when: platform_worker is defined

playbooks/roles/jenkins_worker/templates/pip-accel.conf.j2

-[pip-accel]
-auto-install = no
-data-directory = ~/.pip-accel
-download-cache = ~/.pip/download-cache
-s3-bucket = edx-platform.pip-accel-cache
-s3-prefix = precise64
-s3-readonly = no