From 28f3f38b7274aa4f4862fab3dea9e5e11dec1311 Mon Sep 17 00:00:00 2001 From: Spencer Clark Date: Fri, 17 Feb 2017 06:56:24 -0500 Subject: [PATCH 1/2] Switch AppVeyor CI to use conda env --- appveyor.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index cee365021fa..154e351d9f3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,10 +10,12 @@ environment: - PYTHON: "C:\\Python27-conda32" PYTHON_VERSION: "2.7" PYTHON_ARCH: "32" + CONDA_ENV: "py27-cdat+pynio" - PYTHON: "C:\\Python36-conda64" PYTHON_VERSION: "3.6" PYTHON_ARCH: "64" + CONDA_ENV: "py36" install: # Install miniconda Python @@ -28,8 +30,9 @@ install: - "python --version" - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - # install xarray and depenencies - - "conda install --yes --quiet pip pytest numpy pandas scipy netCDF4 matplotlib dask" + # install xarray and dependencies + - "conda env create --file ./ci/requirements-%CONDA_ENV%.yml" + - "activate test_env" - "python setup.py install" build: false From 340a7396d70ef4fbceb05ee7f5b2de6aea1f9a68 Mon Sep 17 00:00:00 2001 From: Spencer Clark Date: Fri, 17 Feb 2017 20:22:41 -0500 Subject: [PATCH 2/2] Add separate requirements files for windows tests --- appveyor.yml | 4 ++-- ci/requirements-py27-windows.yml | 13 +++++++++++++ ci/requirements-py36-windows.yml | 13 +++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 ci/requirements-py27-windows.yml create mode 100644 ci/requirements-py36-windows.yml diff --git a/appveyor.yml b/appveyor.yml index 154e351d9f3..9f04ad8534c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,12 +10,12 @@ environment: - PYTHON: "C:\\Python27-conda32" PYTHON_VERSION: "2.7" PYTHON_ARCH: "32" - CONDA_ENV: "py27-cdat+pynio" + CONDA_ENV: "py27-windows" - PYTHON: "C:\\Python36-conda64" PYTHON_VERSION: "3.6" PYTHON_ARCH: "64" - CONDA_ENV: "py36" + CONDA_ENV: "py36-windows" install: # Install miniconda Python diff --git a/ci/requirements-py27-windows.yml b/ci/requirements-py27-windows.yml new file mode 100644 index 00000000000..7f2a51d4c97 --- /dev/null +++ b/ci/requirements-py27-windows.yml @@ -0,0 +1,13 @@ +name: test_env +channels: + - conda-forge +dependencies: + - python=2.7 + - dask + - matplotlib + - netCDF4 + - numpy + - pandas + - pip + - pytest + - scipy diff --git a/ci/requirements-py36-windows.yml b/ci/requirements-py36-windows.yml new file mode 100644 index 00000000000..48818479a39 --- /dev/null +++ b/ci/requirements-py36-windows.yml @@ -0,0 +1,13 @@ +name: test_env +channels: + - conda-forge +dependencies: + - python=3.6 + - dask + - matplotlib + - netCDF4 + - numpy + - pandas + - pip + - pytest + - scipy