Merge pull request #1180 from PeterDSteinberg/conda-pkg-add-mock

add mock as a requirement of Tax-Calc conda recipe and environment.yml
PSLmodels · Mar 1, 2017 · fce60dd · fce60dd
2 parents 889570c + 47f88a5
commit fce60dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -7,6 +7,7 @@ requirements:
     - pytest
     - setuptools
     - python
+    - mock
     - numpy ==1.10.4
     - pandas <=0.18.0
     - numba
@@ -16,6 +17,7 @@ requirements:
     - pytest
     - setuptools
     - python
+    - mock
     - numpy ==1.10.4
     - pandas <=0.18.0
     - numba

diff --git a/environment.yml b/environment.yml
@@ -10,8 +10,8 @@ dependencies:
 - six
 - ipython
 - ipython-notebook
-- mock
 - pep8
 - pylint
+- mock
 - pip:
   - pytest-pep8
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,8 +10,8 @@ dependencies: @@
     - six
     - ipython
     - ipython-notebook
-    - mock
     - pep8
     - pylint
+    - mock
     - pip:
       - pytest-pep8