Fix conflict

1 files changed, 46 insertions, 0 deletions

diff --git a/fitsblender/fitsblender.ini b/fitsblender/fitsblender.ini
new file mode 100644
index 0000000..a17d6d6
--- /dev/null
+++ b/fitsblender/fitsblender.ini
@@ -0,0 +1,46 @@
+[package]
+name : fitsblender
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : http://
+license : BSD
+summary : ${package:name}
+
+[source]
+git_url : ssh://git@bitbucket.org/stsci_ssb/${package:name}
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+	stsci.distutils
+	setuptools
+	python
+	d2to1
+run : 
+	
+	python
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+	#d2to1 hack active
+	pip install --no-deps --upgrade --force d2to1 || exit 1
+	    
+	python setup.py install || exit 1
+
+windows : 
+	# d2to1 hack active
+	pip install --no-deps --upgrade --force d2to1
+	if errorlevel 1 exit 1
+	    
+	python setup.py install
+	if errorlevel 1 exit 1
+