From 1591bc50c0bc8d52ff9b6805699040852db1cc6e Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Tue, 27 Mar 2018 14:17:32 -0700 Subject: [PATCH] doc string pass again --- .travis.yml | 4 ++-- ci-support/circleci_mac_dep.sh | 4 ++-- vcs/utils.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1dc221bc7..195225e5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ before_install: script: - export UVCDAT_ANONYMOUS_LOG=False - export UVCDAT_SETUP_PATH=${HOME} -- conda create -q -n py2 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge -c uvcdat cdms2 cdat_info udunits2 nose flake8 genutil matplotlib mesalib image-compare dv3d cdutil "proj4<5" "python<3" -- conda create -q -n py3 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge -c uvcdat cdms2 cdat_info udunits2 nose flake8 genutil matplotlib mesalib image-compare dv3d cdutil cdtime "proj4<5" "python>3" +- conda create -q -n py2 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge -c uvcdat cdms2 cdat_info udunits2 nose flake8 genutil matplotlib mesalib image-compare dv3d cdutil "proj4<5" "python<3" "numpy>1.14" +- conda create -q -n py3 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge -c uvcdat cdms2 cdat_info udunits2 nose flake8 genutil matplotlib mesalib image-compare dv3d cdutil cdtime "proj4<5" "python>3" "numpy>1.14" - echo $TRAVIS_BRANCH - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH - echo $TRAVIS_EVENT_TYPE diff --git a/ci-support/circleci_mac_dep.sh b/ci-support/circleci_mac_dep.sh index c15ec99e7..3e6b16b63 100644 --- a/ci-support/circleci_mac_dep.sh +++ b/ci-support/circleci_mac_dep.sh @@ -2,8 +2,8 @@ ls pwd export PATH=${HOME}/miniconda/bin:${PATH} -conda create -q -n py3 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge -c uvcdat cdms2 nose flake8 cdat_info udunits2 mesalib nose image-compare flake8 matplotlib numpy=1.13 image-compare genutil dv3d cdutil cdtime nbsphinx easydev "proj4<5" "python>3" -conda create -q -n py2 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge -c uvcdat cdms2 cdat_info udunits2 nose flake8 mesalib nose image-compare flake8 matplotlib numpy=1.13 image-compare genutil dv3d cdutil cdtime "proj4<5" "python<3" +conda create -q -n py2 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge -c uvcdat cdms2 cdat_info udunits2 nose flake8 mesalib nose image-compare flake8 matplotlib numpy=1.13 image-compare genutil dv3d cdutil cdtime "proj4<5" "python<3" "numpy>1.14" +conda create -q -n py3 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge -c uvcdat cdms2 nose flake8 cdat_info udunits2 mesalib nose image-compare flake8 matplotlib numpy=1.13 image-compare genutil dv3d cdutil cdtime nbsphinx easydev "proj4<5" "python>3" "numpy>1.14" export UVCDAT_ANONYMOUS_LOG=False source activate py2 python setup.py install --old-and-unmanageable diff --git a/vcs/utils.py b/vcs/utils.py index d308079c3..c67fa6a8d 100644 --- a/vcs/utils.py +++ b/vcs/utils.py @@ -2377,7 +2377,7 @@ def getworldcoordinates(gm, X, Y): >>> yax=v.getAxis(2) # Y axis >>> box=vcs.getboxfill() >>> vcs.getworldcoordinates(box, xax, yax) - [-180.0, 180.0, -88.288399, 88.288399] + [-180.0, 180.0, -88.2884, 88.2884] :param gm: A VCS graphics method object to get worldcoordinates for. :type gm: graphics method object