Prepare for 4.1 release

Small changes to build to prepare for 4.1 release
bashtage · Mar 21, 2017 · 68caf54 · 68caf54
1 parent 6b98474
commit 68caf54
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/building/README.md b/building/README.md
@@ -10,7 +10,7 @@ required for building a binstar package:
  * `build.sh` - Linux/OSX batch file called in the build process
 
 Two other helper files are included to automate building across 
-Python 2.7 and 3.5.
+Python 2.7, 3.5 and 3.6.
 
  * `binstar_windows.bat`
  * `binstar_linux.sh`

diff --git a/building/binstar/meta.yaml b/building/binstar/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: arch
-  version: "4.0"
+  version: "4.1"
 
 source:
   git_url: https://github.com/bashtage/arch.git
@@ -20,6 +20,8 @@ requirements:
     - statsmodels
     - matplotlib
     - nbconvert
+    - nbformat
+    - numba
     - pywin32 # [win]
 
   run:
@@ -32,13 +34,16 @@ requirements:
     - patsy
     - statsmodels
     - matplotlib
+    - numba
     - pywin32 # [win]
 
+
 test:
-  imports:
-    - arch
   requires:
     - pytest
+  test:
+    run_test.sh # [unix]
+    run_test.bat # [win]
 
 about:
   home: https://github.com/bashtage/arch

diff --git a/building/binstar/run_test.bat b/building/binstar/run_test.bat
@@ -0,0 +1,2 @@
+set NUMBER_OF_PROCESSORS=1
+pytest -v --pyargs arch
diff --git a/building/binstar/run_test.py b/building/binstar/run_test.py
diff --git a/building/binstar/run_test.sh b/building/binstar/run_test.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+export QT_QPA_PLATFORM=offscreen
+pytest -v --pyargs arch
diff --git a/building/binstar_unix.sh b/building/binstar_unix.sh
@@ -1,22 +1,24 @@
 #!/bin/bash
 
+conda install anaconda-client conda-build --yes
 conda config --set anaconda_upload yes
 
 cd ..
 
-export VERSION=3.2
+export VERSION=4.1
 ## detect OS
 if [ "$(uname)" == "Darwin" ]; then
     export OS=osx-64
 else
     export OS=linux-64
 fi
 
-sudo Xvfb :99 -nolisten tcp -fbdir /var/run &
+# No longer needed
+## sudo Xvfb :99 -nolisten tcp -fbdir /var/run &
 
 ## declare Python and Numpy Versions
-declare -a PY_VERSIONS=( "27" "35" )
-declare -a NPY_VERSIONS=( "110" "111" )
+declare -a PY_VERSIONS=( "27" "35" "36" )
+declare -a NPY_VERSIONS=( "111" "112" )
 
 ## Loop across Python and Numpy
 for PY in "${PY_VERSIONS[@]}"

diff --git a/building/binstar_windows.bat b/building/binstar_windows.bat
@@ -3,12 +3,15 @@ Setlocal EnableDelayedExpansion
 REM Get current directory
 SET CURRENT_WORKING_DIR=%~dp0
 REM Python and NumPy versions
-set VERSION=3.2
-set PY_VERSION=27 35
-set NPY_VERSION=110 111
+set VERSION=4.1
+set PY_VERSION=27 35 36
+set NPY_VERSION=111 112
 
+
+conda install anaconda-client conda-build --yes
 conda config --set anaconda_upload yes
 
+
 (for %%P in (%PY_VERSION%) do (
     IF %%P==27 (
         call python2_setup.bat