ci testing stuff

aburrell · Nov 19, 2015 · f7f8bbb · f7f8bbb
1 parent 7ccf68f
commit f7f8bbb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -80,15 +80,12 @@ install:
   #- conda create -q -p %PYTHON_HOME% python=%PYTHON_VERSION%
   - '%MINICONDA_HOME%\Scripts\conda install -q -p %PYTHON_HOME% numpy'
   #- activate %PYTHON_HOME%
+  # test that building works before long numpy install
   - '%PYTHON_HOME%\python setup.py clean --all build_ext --force --inplace --compiler=mingw32'
   - '%PYTHON_HOME%\Scripts\virtualenv --version'
   - '%PYTHON_HOME%\Scripts\easy_install --version'
   - '%PYTHON_HOME%\Scripts\pip --version'
   - '%PYTHON_HOME%\Scripts\tox --version'
-  #- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S $(pacman -Qq | grep mingw-w64-x86_64-gcc)"
-  #- dir C:\msys64\mingw64\bin
-  #- C:\msys64\mingw64\bin\mingw-get install gfortran
-  # test that building works before long numpy install
   #- C:\Miniconda-x64\Scripts\conda config --set always_yes yes
   #- C:\Miniconda-x64\Scripts\conda update -q conda
   #- C:\Miniconda-x64\Scripts\conda install -q pip numpy

diff --git a/ci/templates/appveyor.yml b/ci/templates/appveyor.yml
@@ -50,15 +50,12 @@ install:
   #- conda create -q -p %PYTHON_HOME% python=%PYTHON_VERSION%
   - '%MINICONDA_HOME%\Scripts\conda install -q -p %PYTHON_HOME% numpy'
   #- activate %PYTHON_HOME%
+  # test that building works before long numpy install
   - '%PYTHON_HOME%\python setup.py clean --all build_ext --force --inplace --compiler=mingw32'
   - '%PYTHON_HOME%\Scripts\virtualenv --version'
   - '%PYTHON_HOME%\Scripts\easy_install --version'
   - '%PYTHON_HOME%\Scripts\pip --version'
   - '%PYTHON_HOME%\Scripts\tox --version'
-  #- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S $(pacman -Qq | grep mingw-w64-x86_64-gcc)"
-  #- dir C:\msys64\mingw64\bin
-  #- C:\msys64\mingw64\bin\mingw-get install gfortran
-  # test that building works before long numpy install
   #- C:\Miniconda-x64\Scripts\conda config --set always_yes yes
   #- C:\Miniconda-x64\Scripts\conda update -q conda
   #- C:\Miniconda-x64\Scripts\conda install -q pip numpy

diff --git a/ci/templates/tox.ini b/ci/templates/tox.ini
@@ -18,11 +18,11 @@ deps =
     pytest
     pytest-capturelog
 sitepackages={env:TOX_USE_SITEPACKAGES:false}
-cl.execommands =
+commands =
     # FIXME: --compiler=mingw32 will probably break travis, use envvars?
-    echo [build] >> {toxworkdir}\{envname}\Lib\distutils\distutils.cfg
-    echo compiler=mingw32 >> {toxworkdir}\{envname}\Lib\distutils\distutils.cfg
-    python setup.py clean --all build_ext --force --inplace
+    #echo [build] >> {toxworkdir}\{envname}\Lib\distutils\distutils.cfg
+    #echo compiler=mingw32 >> {toxworkdir}\{envname}\Lib\distutils\distutils.cfg
+    #python setup.py clean --all build_ext --force --inplace
     {posargs:py.test -vv --ignore=src --doctest-glob='*.rst'}
 
 [testenv:spell]

diff --git a/tox.ini b/tox.ini
@@ -23,11 +23,11 @@ deps =
     pytest
     pytest-capturelog
 sitepackages={env:TOX_USE_SITEPACKAGES:false}
-cl.execommands =
+commands =
     # FIXME: --compiler=mingw32 will probably break travis, use envvars?
-    echo [build] >> {toxworkdir}\{envname}\Lib\distutils\distutils.cfg
-    echo compiler=mingw32 >> {toxworkdir}\{envname}\Lib\distutils\distutils.cfg
-    python setup.py clean --all build_ext --force --inplace
+    #echo [build] >> {toxworkdir}\{envname}\Lib\distutils\distutils.cfg
+    #echo compiler=mingw32 >> {toxworkdir}\{envname}\Lib\distutils\distutils.cfg
+    #python setup.py clean --all build_ext --force --inplace
     {posargs:py.test -vv --ignore=src --doctest-glob='*.rst'}
 
 [testenv:spell]