update conda build scripts to include explicit epics base version

epics-base · Jan 24, 2019 · ad3cfc1 · ad3cfc1
1 parent 6ca153e
commit ad3cfc1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/tools/conda/pvapy-conda/Makefile b/tools/conda/pvapy-conda/Makefile
@@ -2,6 +2,8 @@
 TOP = ../../..
 DEPLOY_CONF = $(TOP)/configure/DEPLOY.conf
 PVA_PY_VERSION=$(shell cat $(DEPLOY_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
+EPICS_BASE_VERSION=$(shell cat $(DEPLOY_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
+BOOST_VERSION=$(shell cat $(DEPLOY_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
 ifeq ($(PVA_PY_VERSION),)
     PVA_PY_VERSION=$(shell git rev-parse --short HEAD)
 endif

diff --git a/tools/conda/pvapy-conda/meta.yaml b/tools/conda/pvapy-conda/meta.yaml
@@ -1,10 +1,12 @@
 package:
   name: pvapy
-  version: 1.2.0rc4
+  version: 1.3.0
 
 source:
-  git_rev: master
-  git_url: https://github.com/epics-base/pvaPy
+#  git_rev: master
+#  git_url: https://github.com/epics-base/pvaPy
+  path: ../../..
+
 
 build:
   number: 1
@@ -16,15 +18,15 @@ requirements:
   build:
     - python
     - sphinx
-    - numpy 
-    - epics-base
-    - pvapy-boost
+    - numpy>1.15
+    - epics-base=7.0.2
+    - pvapy-boost=1.69.0
 
   run:
     - python
-    - numpy 
-    - epics-base
-    - pvapy-boost
+    - numpy>1.15
+    - epics-base=7.0.2
+    - pvapy-boost=1.69.0
 
 about:
   home: https://github.com/epics-base/pvaPy

diff --git a/tools/conda/pvapy-conda/meta.yaml.template b/tools/conda/pvapy-conda/meta.yaml.template
@@ -3,8 +3,10 @@ package:
   version: PVA_PY_VERSION
 
 source:
-  git_rev: PVA_PY_GIT_VERSION
-  git_url: https://github.com/epics-base/pvaPy
+#  git_rev: PVA_PY_GIT_VERSION
+#  git_url: https://github.com/epics-base/pvaPy
+  path: ../../..
+
 
 build:
   number: 1