Merge pull request #54 from nuwang/master

Added pip_extra_args parameter
galaxyproject · Jan 27, 2019 · 26eabd0 · 26eabd0
2 parents b16be13 + e4bbbdf
commit 26eabd0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tasks/dependencies.yml b/tasks/dependencies.yml
@@ -11,7 +11,7 @@
     - name: Install Galaxy base dependencies
       pip:
         requirements: "{{ galaxy_requirements_file }}"
-        extra_args: "--index-url https://wheels.galaxyproject.org/simple/ --extra-index-url https://pypi.python.org/simple"
+        extra_args: "--index-url https://wheels.galaxyproject.org/simple/ --extra-index-url https://pypi.python.org/simple {{ pip_extra_args | default('') }}"
         virtualenv: "{{ galaxy_venv_dir }}"
         virtualenv_command: "{{ pip_virtualenv_command | default( 'virtualenv' ) }}"
       environment:
@@ -27,7 +27,7 @@
     - name: Install Galaxy conditional dependencies
       pip:
         name: "{{ conditional_dependencies.stdout_lines }}"
-        extra_args: "--index-url https://wheels.galaxyproject.org/simple/ --extra-index-url https://pypi.python.org/simple"
+        extra_args: "--index-url https://wheels.galaxyproject.org/simple/ --extra-index-url https://pypi.python.org/simple {{ pip_extra_args | default('') }}"
         virtualenv: "{{ galaxy_venv_dir }}"
         virtualenv_command: "{{ pip_virtualenv_command | default( 'virtualenv' ) }}"
       environment:

diff --git a/tasks/virtualenv.yml b/tasks/virtualenv.yml
@@ -8,6 +8,7 @@
   pip:
     name: pip
     virtualenv: "{{ galaxy_venv_dir }}"
+    extra_args: "{{ pip_extra_args | default('') }}"
     virtualenv_command: "{{ pip_virtualenv_command | default('virtualenv') }}"
     virtualenv_python: python2.7
   environment:
@@ -17,6 +18,7 @@
   pip:
     name: pip
     state: latest
+    extra_args: "{{ pip_extra_args | default('') }}"
     virtualenv: "{{ galaxy_venv_dir }}"
     virtualenv_command: "{{ pip_virtualenv_command | default('virtualenv') }}"
   environment: