diff --git a/.travis.yml b/.travis.yml index 337447dbf69..8e1866de8d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,17 +17,9 @@ matrix: - env: - CONDA_ENV=py36 - EXTRA_FLAGS="--run-flaky --run-network-tests" - - env: CONDA_ENV=py36-netcdf4-dev - addons: - apt_packages: - - libhdf5-serial-dev - - netcdf-bin - - libnetcdf-dev - env: CONDA_ENV=py36-dask-dev - env: CONDA_ENV=py36-pandas-dev - env: CONDA_ENV=py36-bottleneck-dev - - env: CONDA_ENV=py36-condaforge-rc - - env: CONDA_ENV=py36-pynio-dev - env: CONDA_ENV=py36-rasterio - env: CONDA_ENV=py36-zarr-dev - env: CONDA_ENV=docs @@ -38,25 +30,16 @@ matrix: - env: - CONDA_ENV=py36 - EXTRA_FLAGS="--run-flaky --run-network-tests" - - env: CONDA_ENV=py36-netcdf4-dev - addons: - apt_packages: - - libhdf5-serial-dev - - netcdf-bin - - libnetcdf-dev - env: CONDA_ENV=py36-pandas-dev - env: CONDA_ENV=py36-bottleneck-dev - - env: CONDA_ENV=py36-condaforge-rc - - env: CONDA_ENV=py36-pynio-dev - env: CONDA_ENV=py36-zarr-dev before_install: - - wget http://repo.continuum.io/miniconda/Miniconda3-3.16.0-Linux-x86_64.sh -O miniconda.sh; + - wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; - bash miniconda.sh -b -p $HOME/miniconda - export PATH="$HOME/miniconda/bin:$PATH" - hash -r - conda config --set always_yes yes --set changeps1 no --set show_channel_urls true - - conda update -q conda - conda info -a install: diff --git a/ci/install_python.ps1 b/ci/install_python.ps1 index 63c476e65e5..e9cfae01bde 100644 --- a/ci/install_python.ps1 +++ b/ci/install_python.ps1 @@ -2,16 +2,16 @@ # Authors: Olivier Grisel, Jonathan Helmus and Kyle Kastner # License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/ -$MINICONDA_URL = "http://repo.continuum.io/miniconda/" +$MINICONDA_URL = "https://repo.anaconda.com/miniconda/" $BASE_URL = "https://www.python.org/ftp/python/" function DownloadMiniconda ($python_version, $platform_suffix) { $webclient = New-Object System.Net.WebClient - if ($python_version -match "3.6") { - $filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe" - } else { + if ($python_version -match "2.7") { $filename = "Miniconda2-latest-Windows-" + $platform_suffix + ".exe" + } else { + $filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe" } $url = $MINICONDA_URL + $filename diff --git a/ci/requirements-py35.yml b/ci/requirements-py35.yml index 29f4bb020fc..a71434865cc 100644 --- a/ci/requirements-py35.yml +++ b/ci/requirements-py35.yml @@ -10,8 +10,8 @@ dependencies: - matplotlib=1.5 - netcdf4 - pytest - - pytest-env - pytest-cov + - pytest-env - coveralls - flake8 - numpy diff --git a/ci/requirements-py36-bottleneck-dev.yml b/ci/requirements-py36-bottleneck-dev.yml index bdf0349b5c0..3f08648be32 100644 --- a/ci/requirements-py36-bottleneck-dev.yml +++ b/ci/requirements-py36-bottleneck-dev.yml @@ -11,8 +11,8 @@ dependencies: - matplotlib - netcdf4 - pytest - - pytest-env - pytest-cov + - pytest-env - coveralls - flake8 - numpy diff --git a/ci/requirements-py36-condaforge-rc.yml b/ci/requirements-py36-condaforge-rc.yml deleted file mode 100644 index ba980deeeea..00000000000 --- a/ci/requirements-py36-condaforge-rc.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: test_env -channels: - - conda-forge/label/rc - - conda-forge -dependencies: - - python=3.6 - - cftime - - dask - - distributed - - h5py - - h5netcdf - - matplotlib - - netcdf4 - - pytest - - pytest-env - - pytest-cov - - coveralls - - flake8 - - numpy - - pandas - - seaborn - - scipy - - toolz diff --git a/ci/requirements-py36-dask-dev.yml b/ci/requirements-py36-dask-dev.yml index 20b10fe29ee..32d01765439 100644 --- a/ci/requirements-py36-dask-dev.yml +++ b/ci/requirements-py36-dask-dev.yml @@ -9,8 +9,8 @@ dependencies: - matplotlib - netcdf4 - pytest - - pytest-env - pytest-cov + - pytest-env - coveralls - flake8 - numpy diff --git a/ci/requirements-py36-hypothesis.yml b/ci/requirements-py36-hypothesis.yml index c5c228095a4..8066a53b6bc 100644 --- a/ci/requirements-py36-hypothesis.yml +++ b/ci/requirements-py36-hypothesis.yml @@ -10,8 +10,8 @@ dependencies: - matplotlib - netcdf4 - pytest - - pytest-env - pytest-cov + - pytest-env - coveralls - hypothesis - flake8 diff --git a/ci/requirements-py36-netcdf4-dev.yml b/ci/requirements-py36-netcdf4-dev.yml deleted file mode 100644 index 2616a113fa4..00000000000 --- a/ci/requirements-py36-netcdf4-dev.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: test_env -channels: - - conda-forge -dependencies: - - python=3.6 - - cython - - dask - - distributed - - h5py - - h5netcdf - - matplotlib - - pytest - - pytest-env - - pytest-cov - - coveralls - - flake8 - - numpy - - pandas - - scipy - - toolz - - pip: - - git+https://github.com/Unidata/netcdf4-python.git - - git+https://github.com/Unidata/cftime.git diff --git a/ci/requirements-py36-pandas-dev.yml b/ci/requirements-py36-pandas-dev.yml index 2b914f746ab..bc0e5d0de09 100644 --- a/ci/requirements-py36-pandas-dev.yml +++ b/ci/requirements-py36-pandas-dev.yml @@ -12,8 +12,8 @@ dependencies: - matplotlib - netcdf4 - pytest - - pytest-env - pytest-cov + - pytest-env - coveralls - flake8 - numpy diff --git a/ci/requirements-py36-pynio-dev.yml b/ci/requirements-py36-pynio-dev.yml deleted file mode 100644 index b8987611a6e..00000000000 --- a/ci/requirements-py36-pynio-dev.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: test_env -channels: - - conda-forge - - conda-forge/label/dev -dependencies: - - python=3.6 - - cftime - - dask - - distributed - - h5py - - h5netcdf - - matplotlib - - netcdf4 - - pynio=dev - - pytest - - pytest-env - - pytest-cov - - coveralls - - numpy - - pandas - - scipy - - seaborn - - toolz - - rasterio - - bottleneck - - pydap diff --git a/ci/requirements-py36-rasterio.yml b/ci/requirements-py36-rasterio.yml index dda9ea8cd29..e5ef1d29777 100644 --- a/ci/requirements-py36-rasterio.yml +++ b/ci/requirements-py36-rasterio.yml @@ -11,8 +11,8 @@ dependencies: - matplotlib - netcdf4 - pytest - - pytest-env - pytest-cov + - pytest-env - coveralls - numpy - pandas diff --git a/ci/requirements-py36-zarr-dev.yml b/ci/requirements-py36-zarr-dev.yml index 9966cf74815..94bdc50fbfe 100644 --- a/ci/requirements-py36-zarr-dev.yml +++ b/ci/requirements-py36-zarr-dev.yml @@ -8,8 +8,8 @@ dependencies: - distributed - matplotlib - pytest - - pytest-env - pytest-cov + - pytest-env - coveralls - flake8 - numpy