PKG more requirements

BCDA-APS · Apr 16, 2019 · fa0c82e · fa0c82e
1 parent 6fd10e2
commit fa0c82e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ before_script:
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH=$HOME/miniconda/bin:$PATH
   - export PY_ENV=travis-$TRAVIS_PYTHON_VERSION
-  - conda create -y -n $PY_ENV -c lightsource2-tag python=$TRAVIS_PYTHON_VERSION numpy requests coverage docopt databroker
+  - conda create -y -n $PY_ENV -c lightsource2-tag -c defaults python=$TRAVIS_PYTHON_VERSION numpy requests coverage docopt databroker pandas xlrd
   - source activate $PY_ENV
   - which pip
   - which python

diff --git a/apstools/__init__.py b/apstools/__init__.py
@@ -25,7 +25,7 @@
 __package_name__ = __project__
 __long_description__ = __description__
 
-__install_requires__ = ('databroker')
+__install_requires__ = ('databroker', 'pandas', 'xlrd')
 __install_requires__ = ()       # TODO: for conda build now
 __classifiers__ = [
     'Development Status :: 5 - Production/Stable',

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -38,12 +38,16 @@ requirements:
     - databroker
     - bluesky
     - pyRestTable
+    - pandas
+    - xlrd
   run:
     - python
     - ophyd
     - databroker
     - bluesky
     - pyRestTable
+    - pandas
+    - xlrd
 
 test:
   imports:

diff --git a/requirements.txt b/requirements.txt
@@ -2,3 +2,5 @@ versioneer
 coverage
 coveralls
 pyRestTable
+pandas
+xlrd
diff --git a/tests/test_excel.py b/tests/test_excel.py
@@ -14,7 +14,6 @@
 
 import apstools.utils
 
-
 class Test_Demo3(unittest.TestCase):
 
     xl_file = os.path.join(PATH, "demo3.xlsx")