Fix conflict

1 files changed, 46 insertions, 0 deletions

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