diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..fa4cb587c --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,37 @@ +# Environment loosely based on https://github.com/conda/conda/blob/master/appveyor.yml + +environment: + + global: + # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the + # /E:ON and /V:ON options are not enabled in the batch script intepreter + # See: http://stackoverflow.com/a/13751649/163740 + CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\continuous_integration\\run_with_env.cmd" + + matrix: + # Since appveyor is quite slow, we only use a single configuration + - PYTHON: "3.5" + ARCH: "64" + NUMPY: "1.10" + PANDAS: "0.18" + CONDA_ENV: taxcalc-dev + +init: + # Use AppVeyor's provided Miniconda: https://www.appveyor.com/docs/installed-software#python + - if "%ARCH%" == "64" set MINICONDA=C:\Miniconda35-x64 + - if "%ARCH%" == "32" set MINICONDA=C:\Miniconda35 + - set PATH=%MINICONDA%;%MINICONDA%/Scripts;%MINICONDA%/Library/bin;%PATH% + +install: + # Update to a known good conda + # (to workaround http://help.appveyor.com/discussions/problems/4910) + - conda install -q -y conda=4.2.9 + - continuous_integration\\setup_conda_environment.cmd + +build_script: + - continuous_integration\\build.cmd + +test_script: + # %CMD_IN_ENV% is needed for distutils/setuptools-based tests + # on certain build configurations. + - "%CMD_IN_ENV% continuous_integration\\run_tests.cmd" diff --git a/continuous_integration/build.cmd b/continuous_integration/build.cmd new file mode 100644 index 000000000..abff0b1b0 --- /dev/null +++ b/continuous_integration/build.cmd @@ -0,0 +1,6 @@ +call activate %CONDA_ENV% + +@echo on + +@rem Install taxcalc +%PIP_INSTALL% --no-deps -e .[complete] diff --git a/continuous_integration/run_tests.cmd b/continuous_integration/run_tests.cmd new file mode 100644 index 000000000..deb1666db --- /dev/null +++ b/continuous_integration/run_tests.cmd @@ -0,0 +1,11 @@ +call activate %CONDA_ENV% + +@echo on + +set PYTHONFAULTHANDLER=1 + +@rem `--capture=sys` avoids clobbering faulthandler tracebacks on crash +set PYTEST=py.test --capture=sys + +@rem %PYTEST% -v --runslow dask\dataframe\tests\test_groupby.py +%PYTEST% -v -m "not requires_pufcsv" --pep8 diff --git a/continuous_integration/run_with_env.cmd b/continuous_integration/run_with_env.cmd new file mode 100644 index 000000000..3a56e3e84 --- /dev/null +++ b/continuous_integration/run_with_env.cmd @@ -0,0 +1,90 @@ +:: From https://github.com/ogrisel/python-appveyor-demo +:: +:: To build extensions for 64 bit Python 3, we need to configure environment +:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of: +:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1) +:: +:: To build extensions for 64 bit Python 2, we need to configure environment +:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of: +:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0) +:: +:: 32 bit builds, and 64-bit builds for 3.5 and beyond, do not require specific +:: environment configurations. +:: +:: Note: this script needs to be run with the /E:ON and /V:ON flags for the +:: cmd interpreter, at least for (SDK v7.0) +:: +:: More details at: +:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows +:: http://stackoverflow.com/a/13751649/163740 +:: +:: Author: Olivier Grisel +:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/ +:: +:: Notes about batch files for Python people: +:: +:: Quotes in values are literally part of the values: +:: SET FOO="bar" +:: FOO is now five characters long: " b a r " +:: If you don't want quotes, don't include them on the right-hand side. +:: +:: The CALL lines at the end of this file look redundant, but if you move them +:: outside of the IF clauses, they do not run properly in the SET_SDK_64==Y +:: case, I don't know why. +@ECHO OFF + +SET COMMAND_TO_RUN=%* +SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows +SET WIN_WDK=c:\Program Files (x86)\Windows Kits\10\Include\wdf + +:: Extract the major and minor versions, and allow for the minor version to be +:: more than 9. This requires the version number to have two dots in it. +SET MAJOR_PYTHON_VERSION=%PYTHON:~0,1% +IF "%PYTHON:~3,1%" == "." ( + SET MINOR_PYTHON_VERSION=%PYTHON:~2,1% +) ELSE ( + SET MINOR_PYTHON_VERSION=%PYTHON:~2,2% +) + +:: Based on the Python version, determine what SDK version to use, and whether +:: to set the SDK for 64-bit. +IF %MAJOR_PYTHON_VERSION% == 2 ( + SET WINDOWS_SDK_VERSION="v7.0" + SET SET_SDK_64=Y +) ELSE ( + IF %MAJOR_PYTHON_VERSION% == 3 ( + SET WINDOWS_SDK_VERSION="v7.1" + IF %MINOR_PYTHON_VERSION% LEQ 4 ( + SET SET_SDK_64=Y + ) ELSE ( + SET SET_SDK_64=N + IF EXIST "%WIN_WDK%" ( + :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/ + REN "%WIN_WDK%" 0wdf + ) + ) + ) ELSE ( + ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%" + EXIT 1 + ) +) + +IF %ARCH% == 64 ( + IF %SET_SDK_64% == Y ( + ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture + SET DISTUTILS_USE_SDK=1 + SET MSSdk=1 + "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION% + "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release + ECHO Executing: %COMMAND_TO_RUN% + call %COMMAND_TO_RUN% || EXIT 1 + ) ELSE ( + ECHO Using default MSVC build environment for 64 bit architecture + ECHO Executing: %COMMAND_TO_RUN% + call %COMMAND_TO_RUN% || EXIT 1 + ) +) ELSE ( + ECHO Using default MSVC build environment for 32 bit architecture + ECHO Executing: %COMMAND_TO_RUN% + call %COMMAND_TO_RUN% || EXIT 1 +) diff --git a/continuous_integration/setup_conda_environment.cmd b/continuous_integration/setup_conda_environment.cmd new file mode 100644 index 000000000..ec7b5cdd0 --- /dev/null +++ b/continuous_integration/setup_conda_environment.cmd @@ -0,0 +1,27 @@ +@rem The cmd /C hack circumvents a regression where conda installs a conda.bat +@rem script in non-root environments. +set CONDA=cmd /C conda +set CONDA_INSTALL=%CONDA% install -q -y +set PIP_INSTALL=pip install -q + +@echo on + +@rem Deactivate any environment +call deactivate +@rem Display root environment (for debugging) +conda list +@rem Clean up any left-over from a previous build +conda remove --all -q -y -n %CONDA_ENV% + +@rem Create test environment +@rem (note: no cytoolz as it seems to prevent faulthandler tracebacks on crash) +conda create -n %CONDA_ENV% -q -y python=%PYTHON% + +call activate %CONDA_ENV% + +%CONDA% env update -f environment.yml + +@rem Display final environment (for reproducing) +%CONDA% list +%CONDA% list --explicit +python -m site diff --git a/taxcalc/dropq/dropq_utils.py b/taxcalc/dropq/dropq_utils.py index e677b917c..e83f9a93d 100644 --- a/taxcalc/dropq/dropq_utils.py +++ b/taxcalc/dropq/dropq_utils.py @@ -8,12 +8,13 @@ def format_print(x, _type, num_decimals): float_types = [float, np.dtype('f8')] + int_types = [int, np.dtype('i8')] frmat_str = "0:.{num}f".format(num=num_decimals) frmat_str = "{" + frmat_str + "}" try: if _type in float_types or _type is None: return frmat_str.format(x) - elif _type == int: + elif _type in int_types: return str(int(x)) elif _type == str: return str(x) diff --git a/taxcalc/tests/test_dropq.py b/taxcalc/tests/test_dropq.py index 251a8129b..abfbae9cf 100644 --- a/taxcalc/tests/test_dropq.py +++ b/taxcalc/tests/test_dropq.py @@ -356,7 +356,7 @@ def test_chooser(): def test_format_print_not_implemented(): - x = np.array([1], dtype='i4') + x = np.array([1], dtype='i2') with pytest.raises(NotImplementedError): format_print(x[0], x.dtype, 2)