Fix pyraf

10 files changed, 103 insertions, 17 deletions

diff --git a/pyobjc-core/build.sh b/pyobjc-core/build.sh
index 4b71885..424b539 100644
--- a/pyobjc-core/build.sh
+++ b/pyobjc-core/build.sh
@@ -1,2 +1,2 @@
-
-python setup.py install || exit 1
\ No newline at end of file
+cd pyobjc-core
+python setup.py install
diff --git a/pyobjc-core/meta.yaml b/pyobjc-core/meta.yaml
index 389c5fa..c64ebac 100644
--- a/pyobjc-core/meta.yaml
+++ b/pyobjc-core/meta.yaml
@@ -1,13 +1,17 @@
+{% set name = 'pyobjc-core' %}
+{% set version = '3.1.1' %}
+{% set number = '0' %}
+
 about:
     home: http://pyobjc.sourceforge.net/
     license: MIT
     summary: Python<->ObjC Interoperability Module
 build:
-    number: '0'
+    number: {{ number }}
     preserve_egg_dir: 'true'
 package:
-    name: pyobjc-core
-    version: 3.0.4
+    name: {{ name }}
+    version: {{ version }}
 requirements:
     build:
     - setuptools
@@ -15,10 +19,9 @@ requirements:
     run:
     - python x.x
 source:
-    fn: pyobjc-core-3.0.4.tar.gz
-    md5: 6baaa0d2533cc9c26ad9f889ca9ecb01
+    fn: pyobjc-{{ version }}.tar.gz
     url:
-    - https://pypi.python.org/packages/source/p/pyobjc-core/pyobjc-core-3.0.4.tar.gz
+    - https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{ version }}.tar.bz2
 test:
     imports:
     - PyObjCTools
diff --git a/pyobjc-framework-cocoa/build.sh b/pyobjc-framework-cocoa/build.sh
new file mode 100644
index 0000000..f9d613a
--- /dev/null
+++ b/pyobjc-framework-cocoa/build.sh
@@ -0,0 +1,2 @@
+cd pyobjc-framework-Cocoa
+python setup.py install
diff --git a/pyobjc-framework-cocoa/meta.yaml b/pyobjc-framework-cocoa/meta.yaml
new file mode 100644
index 0000000..785c0b1
--- /dev/null
+++ b/pyobjc-framework-cocoa/meta.yaml
@@ -0,0 +1,30 @@
+{% set name = 'pyobjc-framework-cocoa' %}
+{% set version = '3.1.1' %}
+{% set number = '0' %}
+
+about:
+    home: http://pyobjc.sourceforge.net/
+    license: MIT
+    summary: Wrappers for the Cocoa frameworks on Mac OS X
+
+build:
+    number: {{ number }}
+    preserve_egg_dir: 'true'
+package:
+    name: {{ name }}
+    version: {{ version }}
+requirements:
+    build:
+    - pyobjc-core
+    - setuptools
+    - python x.x
+    run:
+    - pyobjc-core
+    - python x.x
+source:
+    fn: pyobjc-{{ version }}.tar.gz
+    url:
+    - https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{ version }}.tar.bz2
+test:
+    imports:
+    - Cocoa
diff --git a/pyobjc-framework-quartz/build.sh b/pyobjc-framework-quartz/build.sh
new file mode 100644
index 0000000..d42e4b1
--- /dev/null
+++ b/pyobjc-framework-quartz/build.sh
@@ -0,0 +1,2 @@
+cd pyobjc-framework-Quartz
+python setup.py install
diff --git a/pyobjc-framework-quartz/meta.yaml b/pyobjc-framework-quartz/meta.yaml
new file mode 100644
index 0000000..5749918
--- /dev/null
+++ b/pyobjc-framework-quartz/meta.yaml
@@ -0,0 +1,30 @@
+{% set name = 'pyobjc-framework-quartz' %}
+{% set version = '3.1.1' %}
+{% set number = '0' %}
+
+about:
+    home: http://pyobjc.sourceforge.net/
+    license: MIT
+    summary: Wrappers for the Quartz frameworks on Mac OS X
+build:
+    number: {{ number }}
+    preserve_egg_dir: 'true'
+package:
+    name: {{ name }}
+    version: {{ version }}
+requirements:
+    build:
+    - pyobjc-core
+    - pyobjc-framework-cocoa
+    - setuptools
+    - python x.x
+    run:
+    - pyobjc-core
+    - pyobjc-framework-cocoa
+    - python x.x
+source:
+    fn: pyobjc-{{ version }}.tar.gz
+    url:
+    - https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{ version }}.tar.bz2
+#test:
+    # - see runtest.py
diff --git a/pyobjc-framework-quartz/run_test.py b/pyobjc-framework-quartz/run_test.py
new file mode 100644
index 0000000..dd58019
--- /dev/null
+++ b/pyobjc-framework-quartz/run_test.py
@@ -0,0 +1,2 @@
+from Cocoa import *
+import Quartz
diff --git a/pyraf/bld.bat b/pyraf/bld.bat
index 695f708..976d3b9 100644
--- a/pyraf/bld.bat
+++ b/pyraf/bld.bat
@@ -1,5 +1,4 @@
 
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/pyraf/build.sh b/pyraf/build.sh
index 60e0bea..1067454 100644
--- a/pyraf/build.sh
+++ b/pyraf/build.sh
@@ -1,4 +1,12 @@
+if [[ `uname -s` == "Darwin" ]]; then
+    export CFLAGS="-I/opt/X11/include"
+    export LDFLAGS="-L/opt/X11/lib"
+fi
 
-pip install --no-deps --upgrade --force d2to1 || exit 1
+if [[ $PY3K > 0 ]]; then
+set +e
+    2to3 -w --fix=print .
+    2to3 -w --fix=except .
+fi
 
-python setup.py install || exit 1
\ No newline at end of file
+python setup.py install || exit 1
diff --git a/pyraf/meta.yaml b/pyraf/meta.yaml
index 02a2824..23ea26a 100644
--- a/pyraf/meta.yaml
+++ b/pyraf/meta.yaml
@@ -1,18 +1,25 @@
+{% set name = 'pyraf' %}
+{% set version = '2.1.10' %}
+{% set number = '0' %}
+
 about:
     home: https://github.com/spacetelescope/pyraf
     license: BSD
     summary: pyraf
 build:
-    number: '0'
+    number: {{ number }}
 package:
-    name: pyraf
-    version: 2.1.10
+    name: {{ name }}
+    version: {{ version }}
 requirements:
     build:
     - d2to1
     - astropy >=1.1
     - ipython
-    - stsci.distutils
+    - matplotlib
+    - pyobjc-core [osx]
+    - pyobjc-framework-cocoa [osx]
+    - pyobjc-framework-quartz [osx]
     - stsci.tools
     - setuptools
     - numpy x.x
@@ -20,12 +27,15 @@ requirements:
     run:
     - astropy >=1.1
     - ipython
-    - stsci.distutils
+    - matplotlib
+    - pyobjc-core [osx]
+    - pyobjc-framework-cocoa [osx]
+    - pyobjc-framework-quartz [osx]
     - stsci.tools
     - numpy x.x
     - python x.x
 source:
-    git_tag: 2.1.10
+    git_tag: {{ version }}
     git_url: https://github.com/spacetelescope/pyraf
 test:
     commands: