MNT #280

BCDA-APS · Jan 31, 2020 · 9f7dd00 · 9f7dd00
1 parent d7ed82e
commit 9f7dd00
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,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 -c defaults python=$TRAVIS_PYTHON_VERSION numpy requests coverage docopt databroker ophyd bluesky pandas xlrd
+  - conda create -y -n $PY_ENV -c apsu -c nsls2forge -c defaults python=$TRAVIS_PYTHON_VERSION numpy requests coverage docopt databroker ophyd bluesky pandas xlrd epics-base
   - source activate $PY_ENV
   - which pip
   - which python

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -38,6 +38,7 @@ requirements:
     - python
     - bluesky
     - databroker
+    - epics-base
     - event-model>=1.8
     - historydict
     - ophyd=1.4.0rc3

diff --git a/environment.yml b/environment.yml
@@ -1,6 +1,6 @@
 name: apstoolsdoc
 channels:
-- lightsource2-tag
+- nsls2forge
 - defaults
 dependencies:
 - python=3.6

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,7 @@
 attrs>=17.4.0
 bluesky
 databroker[all]
+epics-base
 event-model>=1.10
 historydict
 jsonschema>3