Merge pull request #4391 from edx/jibsheet/remove-xqueue-prerequirements

We don't need to pin back setuptools anymore

playbooks/roles/xqueue/defaults/main.yml

@@ -127,8 +127,7 @@ xqueue_auth_config:
 
 xqueue_source_repo: "https://github.com/edx/xqueue.git"
 xqueue_version: 'master'
-xqueue_pre_requirements_file:       "{{ xqueue_code_dir }}/pre-requirements.txt"
-xqueue_post_requirements_file:      "{{ xqueue_code_dir }}/requirements.txt"
+xqueue_requirements_file:      "{{ xqueue_code_dir }}/requirements.txt"
 xqueue_openstack_requirements_file: "{{ xqueue_code_dir }}/openstack-requirements.txt"
 
 # These packages are required for the xqueue server,

playbooks/roles/xqueue/tasks/deploy.yml

@@ -68,17 +68,14 @@
     - install
     - install:code
 
-# Install the python pre requirements and post requirements into {{ xqueue_venv_dir }}
-- name: "Install python pre-requirements and post-requirements"
+# Install the python requirements into {{ xqueue_venv_dir }}
+- name: "Install python requirements"
   pip:
-    requirements: "{{ item }}"
+    requirements: "{{ xqueue_requirements_file }}"
     virtualenv: "{{ xqueue_venv_dir }}"
     state: present
     extra_args: "-i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w"
   become_user: "{{ xqueue_user }}"
-  with_items:
-    - "{{ xqueue_pre_requirements_file }}"
-    - "{{ xqueue_post_requirements_file }}"
   tags:
     - install
     - install:app-requirements