Skip to content
Snippets Groups Projects
Commit dac73cd1 authored by sveseli's avatar sveseli
Browse files

more conda related build changes

parent 6d9dba36
No related branches found
No related tags found
No related merge requests found
......@@ -57,9 +57,9 @@ author = u'APS/SDM'
# built documents.
#
# The short X.Y version.
version = u'1.0'
version = '2.2.0'
# The full version, including alpha/beta/rc tags.
release = u'1.0'
release = '2.2.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
TOP = ../../..
DEPLOY_CONF = $(TOP)/etc/dm.deploy.conf
SPHINX_CONF = $(TOP)/doc/sphinx/source/conf.py
DM_SOFTWARE_VERSION := $(shell cat $(DEPLOY_CONF) | grep DM_SOFTWARE_VERSION | cut -f2 -d'=')
DM_SVN_VERSION =
PYTHON_VERSION := $(shell conda info | grep python | cut -f2 -d':' | cut -f1,2 -d'.')
PYTHON_MAJOR_VERSION := $(shell python -c "import sys; print(sys.version_info[0])")
CONFIGPARSER := $(shell if [ ${PYTHON_MAJOR_VERSION} -eq 2 ]; then echo "- configparser"; fi)
PACKAGE = aps-dm-api
CONDA_ENV_FLAGS += -y
......@@ -11,10 +14,10 @@ CONDA_ENV_FLAGS += -y
dist: package
configure:
eval "cat meta.yaml.template | sed 's?DM_SOFTWARE_VERSION?${DM_SOFTWARE_VERSION}?g' | sed 's?DM_SVN_VERSION?${DM_SVN_VERSION}?g' > meta.yaml"
eval "cat ${SPHINX_CONF} | sed \"s?version =.*?version = '${DM_SOFTWARE_VERSION}'?g\" | sed \"s?release =.*?release = '${DM_SOFTWARE_VERSION}'?g\" > ${SPHINX_CONF}.2 && mv ${SPHINX_CONF}.2 ${SPHINX_CONF}"
eval "cat meta.yaml.template | sed 's?DM_SOFTWARE_VERSION?${DM_SOFTWARE_VERSION}?g' | sed 's?DM_SVN_VERSION?${DM_SVN_VERSION}?g' | sed 's?CONFIGPARSER?${CONFIGPARSER}?g' > meta.yaml"
build: configure
echo PYTHON $(PYTHON_VERSION) .
conda build --python $(PYTHON_VERSION) .
package: build
......
......@@ -8,22 +8,20 @@ source:
build:
number: 1
noarch: python
script_env:
requirements:
build:
- python
- configparser
- decorator
- sphinx
- sphinx_rtd_theme
run:
- python
- configparser
- decorator
about:
home: https://confluence.aps.anl.gov/display/DMGT/Infrastructure
......
......@@ -8,22 +8,20 @@ source:
build:
number: 1
noarch: python
script_env:
requirements:
build:
- python
- configparser
- decorator
- sphinx
- sphinx_rtd_theme
CONFIGPARSER
run:
- python
- configparser
- decorator
CONFIGPARSER
about:
home: https://confluence.aps.anl.gov/display/DMGT/Infrastructure
......
TOP = ../../..
DEPLOY_CONF = $(TOP)/etc/dm.deploy.conf
SPHINX_CONF = $(TOP)/doc/sphinx/source/conf.py
DM_SOFTWARE_VERSION := $(shell cat $(DEPLOY_CONF) | grep DM_SOFTWARE_VERSION | cut -f2 -d'=')
DM_SVN_VERSION =
PYTHON_VERSION := $(shell conda info | grep python | cut -f2 -d':' | cut -f1,2 -d'.')
......@@ -12,6 +13,7 @@ CONDA_CHANNELS += -c defaults -c conda-forge -c epics
dist: package
configure:
eval "cat ${SPHINX_CONF} | sed \"s?version =.*?version = '${DM_SOFTWARE_VERSION}'?g\" | sed \"s?release =.*?release = '${DM_SOFTWARE_VERSION}'?g\" > ${SPHINX_CONF}.2 && mv ${SPHINX_CONF}.2 ${SPHINX_CONF}"
eval "cat meta.yaml.template | sed 's?DM_SOFTWARE_VERSION?${DM_SOFTWARE_VERSION}?g' | sed 's?DM_SVN_VERSION?${DM_SVN_VERSION}?g' > meta.yaml"
build: configure
......
......@@ -8,7 +8,7 @@ DIST_DIR = dist
BUILD_DIR = build
DM_SOFTWARE_VERSION=$(shell cat $(DEPLOY_CONF) | grep VERSION | cut -f2 -d'=')
DATE=$(shell date +%Y/%m/%d)
DM_ROOT_DIR=$(shell realpath $(TOP))
DM_ROOT_DIR=$(shell readlink -f $(TOP))
dist: package
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment