diff --git a/appveyor.yml b/appveyor.yml index 4451d19..8924eb5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,8 +33,8 @@ platform: - x64 install: - - cmd: python -c "from urllib2 import urlopen; open('bootstrap-obvious-ci-and-miniconda.py', 'w').write(urlopen('https://raw.githubusercontent.com/pelson/Obvious-CI/master/bootstrap-obvious-ci-and-miniconda.py').read())" - - cmd: python bootstrap-obvious-ci-and-miniconda.py %CONDA_INSTALL_LOCN% %TARGET_ARCH% %CONDA_PY:~0,1% --without-obvci + - appveyor DownloadFile "https://raw.githubusercontent.com/pelson/Obvious-CI/master/bootstrap-obvious-ci-and-miniconda.py" + - cmd: python bootstrap-obvious-ci-and-miniconda.py %CONDA_INSTALL_LOCN% %TARGET_ARCH% 3 --without-obvci - cmd: set CONDA_PY=%CONDA_PY% - cmd: set PATH=%PATH%;%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts - cmd: set PYTHONUNBUFFERED=1 diff --git a/cartopy/meta.yaml b/cartopy/meta.yaml index 87a7f22..67f6e5e 100644 --- a/cartopy/meta.yaml +++ b/cartopy/meta.yaml @@ -30,7 +30,7 @@ requirements: - owslib - pyshp - pyepsg - + run: - python - six diff --git a/scripts/run_docker_build.sh b/scripts/run_docker_build.sh index 08397ed..c4a4d37 100755 --- a/scripts/run_docker_build.sh +++ b/scripts/run_docker_build.sh @@ -34,11 +34,17 @@ echo "$config" > ~/.condarc # A lock sometimes occurs with incomplete builds. The lock file is stored in build_artefacts. conda clean --lock +conda update --yes --all + conda install --yes anaconda-client + conda info + unset LANG + yum install -y expat-devel git autoconf libtool texinfo check-devel obvci_conda_build_dir.py /conda-recipes $UPLOAD_OWNER --build-condition "numpy >=1.8" "python >=2.7,<3|>=3.4,<3.5" EOF +