Merge pull request #477 from jdebacker/pb2

make package dependencies consistent
PSLmodels · Aug 4, 2019 · 6795dc5 · 6795dc5
2 parents 49593bc + 11e5131
commit 6795dc5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,5 @@
-include ogusa/data/*
-include ccc/default_parameters.json
+include ogusa/data/ability/*
+include ogusa/data/demographic/*
+include ogusa/data/labor/*
+include ogusa/default_parameters.json
 include ogusa/OGUSAplots.mplstyle
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -13,6 +13,7 @@ requirements:
     - scipy
     - matplotlib
     - dask
+    - mkl
 
   run:
     - python
@@ -21,6 +22,7 @@ requirements:
     - scipy
     - matplotlib
     - dask
+    - mkl
 
 about:
   home: https://github.com/PSLmodels/OG-USA/

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
     'packages': ['ogusa'],
     'include_package_data': True,
     'name': 'ogusa',
-    'install_requires': ['numpy', 'pandas', 'taxcalc', 'dask', 'scipy', 'matplotlib', 'mkl'],
+    'install_requires': ['taxcalc', 'dask', 'scipy', 'matplotlib', 'mkl'],
     'package_data': {
                      'ogusa': [
                                'parameters_metadata.json',