Fix conflict

1 files changed, 45 insertions, 0 deletions

diff --git a/stsci.sphere/stsci.sphere.ini b/stsci.sphere/stsci.sphere.ini
new file mode 100644
index 0000000..9a006c6
--- /dev/null
+++ b/stsci.sphere/stsci.sphere.ini
@@ -0,0 +1,45 @@
+[package]
+name: stsci.sphere
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home: http://www.stsci.edu/institute/software_hardware
+license: GPL
+summary: ${package:name}
+
+[source]
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
+
+[build]
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+# Namespace package workaround
+preserve_egg_dir: no
+
+[requirements]
+build:
+    d2to1
+    setuptools
+    stsci.distutils
+    numpy
+    python
+
+run:
+    d2to1
+    #pyfits
+    numpy
+    python
+
+
+[cbc_build]
+linux:
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1 || exit 1
+    python setup.py install || exit 1
+
+windows:
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
+    if errorlevel 1 exit 1