Merge pull request #128 from caktus/configure-requirements

Allow configuring requirements file
caktus · Mar 21, 2016 · 881f195 · 881f195
2 parents 26463db + d635e38
commit 881f195
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,6 +2,12 @@ Margarita
 
 Changes - always add to the top.
 
+v 1.6.6 on Mar 21, 2016
+-----------------------
+
+* You can now configure which requirements file to use by specifying
+  `requirements_file`
+
 v 1.6.5 on Mar 15, 2016
 -----------------------
 

diff --git a/project/venv.sls b/project/venv.sls
@@ -25,9 +25,9 @@ pip_requirements:
   pip.installed:
     - bin_env: {{ vars.venv_dir }}
 {% if grains['environment'] == 'local' %}
-    - requirements: {{ vars.build_path(vars.source_dir, 'requirements/dev.txt') }}
+    - requirements: {{ vars.build_path(vars.source_dir, pillar.get('requirements_file', 'requirements/dev.txt')) }}
 {% else %}
-    - requirements: {{ vars.build_path(vars.source_dir, 'requirements/production.txt') }}
+    - requirements: {{ vars.build_path(vars.source_dir, pillar.get('requirements_file', 'requirements/production.txt')) }}
 {% endif %}
     - upgrade: true
     - require: