Merge pull request #45 from bashtage/binstar-bld-fix

BLD: Improve binstar build files
bashtage · Feb 23, 2015 · 3721613 · 3721613
2 parents 035eca7 + 3c4e6ea
commit 3721613
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/building/binstar/meta.yaml b/building/binstar/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: arch
-  version: "2.0"
+  version: "3.0"
 
 source:
   git_url: https://github.com/bashtage/arch.git
@@ -12,15 +12,14 @@ requirements:
   build:
     - python
     - setuptools
-    - cython 0.20*
+    - cython 0.22*
     - numpy
     - scipy
     - pandas
     - patsy
     - statsmodels
     - matplotlib
     - ipython-notebook
-    - setuptools
     - pywin32 # [win]
 
   run:
@@ -34,7 +33,6 @@ requirements:
     - statsmodels
     - matplotlib
     - ipython-notebook
-    - setuptools
     - pywin32 # [win]
 
 test:

diff --git a/building/binstar_unix.sh b/building/binstar_unix.sh
@@ -9,7 +9,7 @@ else
     export OS=linux-64
 fi
 
-sudo Xvfb :99 -nolisten tcp -fbdir /var/run
+sudo Xvfb :99 -nolisten tcp -fbdir /var/run &
 
 ## declare Python and Numpy Versions
 declare -a PY_VERSIONS=( "27" "33" "34" )

diff --git a/building/binstar_windows.bat b/building/binstar_windows.bat
@@ -26,10 +26,12 @@ set NPY_VERSION=18 19
 
         cd %CURRENT_WORKING_DIR%
         IF %%P==27 (
-            call python2_setup.bat
+            REM No longer needed using Python Tools
+            REM call python2_setup.bat
         ) ELSE (
             call python3_setup.bat
         )
+        set PATH=C:\Program Files (x86)\Git\bin;%PATH%;
         set CONDA_PY=%%P
         set CONDA_NPY=%%N
         echo Python: !CONDA_PY!, NumPy: !CONDA_NPY!

diff --git a/building/python2_setup.bat b/building/python2_setup.bat
@@ -1,9 +1,9 @@
 echo Python 2.x setup
 REM Setup compiler
 REM The Windows 7 SDK with .Net 3.5 is buggy on Windows 8.  These paths are needed to fix these issues
-set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE;%PATH%
-set INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v7.0\Include;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\include;%INCLUDE%
-set LIB=C:\Program Files\Microsoft SDKs\Windows\v7.0\Lib\x64;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\lib\amd64
-set DISTUTILS_USE_SDK=1
+REM set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE;%PATH%
+REM INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v7.0\Include;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\include;%INCLUDE%
+REM LIB=C:\Program Files\Microsoft SDKs\Windows\v7.0\Lib\x64;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\lib\amd64
+REM set DISTUTILS_USE_SDK=1
 REM This setenv is the setenv that came with SDK7, with the bugs fixed
-CALL "C:\temp\setenv" /x64 /release
+REM CALL "C:\temp\setenv" /x64 /release