Skip to content

Commit

Permalink
update conda/pip package dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
sveseli committed Nov 18, 2019
1 parent 36ae0dd commit 11595e5
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 29 deletions.
4 changes: 2 additions & 2 deletions configure/BUILD.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BUILD_NUMBER=1
EPICS_BASE_VERSION=7.0.3
EPICS_BASE_VERSION=7.0.3.1
BOOST_VERSION=1.70.0
PVA_PY_VERSION=2.0.0
PVA_PY_VERSION=2.0.1
PVA_PY_GIT_VERSION=master
9 changes: 9 additions & 0 deletions documentation/RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
## Release 2.0.1 (2019/11/18)

- no source code changes
- conda/pip package dependencies:
- EPICS BASE = 7.0.3.1
- BOOST = 1.70.0
- NUMPY > 1.15

## Release 2.0.0 (2019/08/09)

- added MultiChannel class, which allows simultaneous retrieval of PV data
from multiple channels
- added getName() method to the Channel class python interface
Expand Down
4 changes: 2 additions & 2 deletions tools/conda/epics-base-conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package:
name: epics-base
version: 7.0.3
version: 7.0.3.1

source:
url: https://epics.anl.gov/download/base/base-7.0.3.tar.gz
url: https://epics.anl.gov/download/base/base-7.0.3.1.tar.gz

build:
number: 1
Expand Down
15 changes: 2 additions & 13 deletions tools/conda/pvapy-conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: pvapy
version: 2.0.0
version: 2.0.1

source:
path: ../../..
Expand All @@ -17,20 +17,9 @@ test:
source_files:
- test

# Python build version requirement is temporary due to bug in conda's
# 3.7.4 build which results in the following behavior:
# bluegill2> python
# Python 3.7.4 (default, Aug 9 2019, 18:51:30)
# [GCC 7.3.0] :: Anaconda, Inc. on linux
# Type "help", "copyright", "credits" or "license" for more information.
# >>> from distutils.sysconfig import *
# >>> get_config_var('VERSION')
# 4.8.5-39)
# '3.7'

requirements:
build:
- python<=3.7.3
- python
- sphinx
- sphinx_rtd_theme
- numpy>1.15
Expand Down
13 changes: 1 addition & 12 deletions tools/conda/pvapy-conda/meta.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,9 @@ test:
source_files:
- test

# Python build version requirement is temporary due to bug in conda's
# 3.7.4 build which results in the following behavior:
# bluegill2> python
# Python 3.7.4 (default, Aug 9 2019, 18:51:30)
# [GCC 7.3.0] :: Anaconda, Inc. on linux
# Type "help", "copyright", "credits" or "license" for more information.
# >>> from distutils.sysconfig import *
# >>> get_config_var('VERSION')
# 4.8.5-39)
# '3.7'

requirements:
build:
- python<=3.7.3
- python
- sphinx
- sphinx_rtd_theme
- numpy>1.15
Expand Down

0 comments on commit 11595e5

Please sign in to comment.