Fix conflict

1 files changed, 49 insertions, 0 deletions

diff --git a/nictools/nictools.ini b/nictools/nictools.ini
new file mode 100644
index 0000000..2acb4e6
--- /dev/null
+++ b/nictools/nictools.ini
@@ -0,0 +1,49 @@
+[package]
+name : nictools
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}
+license : 
+summary : ${package:name}
+
+[source]
+git_url : ${about:home}
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+    astropy
+	stsci.distutils
+    stsci.ndimage
+    stsci.convolve
+    stsci.tools
+    numpy
+	setuptools
+	python
+run : 
+	astropy
+    stsci.ndimage
+    stsci.convolve
+    stsci.tools
+    numpy
+	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
+    2to3 -w .
+	if errorlevel 1 exit 1
+