ci testing stuff

aburrell · Nov 19, 2015 · b90b228 · b90b228
1 parent 1cf40ef
commit b90b228
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 12 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -81,7 +81,7 @@ install:
   - '%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%\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'

diff --git a/ci/templates/appveyor.yml b/ci/templates/appveyor.yml
@@ -51,7 +51,7 @@ install:
   - '%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%\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'

diff --git a/ci/templates/tox.ini b/ci/templates/tox.ini
@@ -19,11 +19,6 @@ deps =
     pytest-capturelog
 sitepackages={env:TOX_USE_SITEPACKAGES:false}
 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
-    echo {toxworkdir} >> C:\\test.txt
-    echo {envname} >> C:\\test.txt
     #conda install -p {envdir} numpy
     python setup.py clean --all build_ext --force --inplace
     {posargs:py.test -vv --ignore=src --doctest-glob='*.rst'}

diff --git a/setup.cfg b/setup.cfg
@@ -77,3 +77,5 @@ coverage_flags =
 environment_variables =
     -
 
+[build]
+compiler=mingw32
diff --git a/tox.ini b/tox.ini
@@ -24,11 +24,6 @@ deps =
     pytest-capturelog
 sitepackages={env:TOX_USE_SITEPACKAGES:false}
 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
-    echo {toxworkdir} >> C:\\test.txt
-    echo {envname} >> C:\\test.txt
     #conda install -p {envdir} numpy
     python setup.py clean --all build_ext --force --inplace
     {posargs:py.test -vv --ignore=src --doctest-glob='*.rst'}