Revert "Try fix doctest (#435)"

.circleci/config.yml

@@ -33,12 +33,11 @@ aliases:
  name: setup_run_tests
  environment:
  PKGS: "udunits2 testsrunner mesalib matplotlib image-compare cdtime nbformat"
- DOC_PKGS: "sphinxcontrib-websupport nbsphinx libtiff"
  CHANNELS: "-c cdat/label/nightly -c conda-forge"
  command: |
  source $WORKDIR/miniconda/etc/profile.d/conda.sh
  conda activate base
- conda create -y -n $ENV_NAME --use-local $CHANNELS "$CONDA_PY_VER" $PKG_NAME $PKGS $DOC_PKGS $COVERAGE_PKGS
+ conda create -y -n $ENV_NAME --use-local $CHANNELS "$CONDA_PY_VER" $PKG_NAME $PKGS $COVERAGE_PKGS
  conda activate $ENV_NAME
  conda list
 
@@ -52,19 +51,8 @@ aliases:
  command: |
  source $WORKDIR/miniconda/etc/profile.d/conda.sh
  conda activate $ENV_NAME
- #python run_tests.py -H -v2 -n 2 $COVERAGE
- python run_tests.py -n 4 -H -v2 --timeout=100000 --checkout-baseline --no-vtk-ui $COVERAGE
- RESULT=$?
+ python run_tests.py -H -v2 -n 2 $COVERAGE
  conda deactivate
- exit $RESULT
-
- - &conda_env_export
- name: conda_env_expprt
- command: |
- source $WORKDIR/miniconda/etc/profile.d/conda.sh
- conda activate $ENV_NAME
- conda env export > $WORKDIR/env.yml
- cat $WORKDIR/env.yml
 
  - &conda_upload
  name: conda_upload
@@ -85,17 +73,6 @@ aliases:
  coveralls
  conda deactivate
 
- - &make_doc_test
- name: make_doc_test
- command: |
- source $WORKDIR/miniconda/etc/profile.d/conda.sh
- conda activate $ENV_NAME
- cd docs
- make doctest
- DOC_RESULT=$?
- echo "*** $PY_VER doc test result: "${DOC_RESULT}
- exit $DOC_RESULT
-
 jobs:
  macos_setup:
  macos:
@@ -220,10 +197,8 @@ jobs:
  - attach_workspace:
  at: .
  - run: *setup_run_tests
- - run: *conda_env_export
  - run: *get_testdata
  - run: *run_tests
- - run: *make_doc_test
  #- run: *run_coveralls
  - store_artifacts:
  path: tests_html

docs/rtd_environment.yml

@@ -1,197 +1,110 @@
 name: lite
 channels:
- - local
- - cdat/label/nightly
  - conda-forge
  - defaults
 dependencies:
- - _libgcc_mutex=0.1=conda_forge
- - _openmp_mutex=4.5=0_gnu
  - alabaster=0.7.12=py_0
- - attrs=19.3.0=py_0
- - babel=2.8.0=py_0
+ - asn1crypto=0.24.0=py37_1003
+ - attrs=19.1.0=py_0
+ - babel=2.6.0=py_1
+ - blas=1.1=openblas
  - bleach=3.1.0=py_0
- - bokeh=1.4.0=py37_0
- - bzip2=1.0.8=h516909a_2
- - ca-certificates=2019.11.28=hecc5488_0
- - cdat_info=8.2.2020.01.14.19.58.g0d4779f=py_0
- - cdp=1.6.0=py_0
- - cdtime=3.1.2.2020.01.14.20.52.gbde8ded=py37h1ac8016_0
- - cdutil=8.2.2020.01.15.00.00.gaac442d=py_0
- - certifi=2019.11.28=py37_0
- - cffi=1.13.2=py37h8022711_0
+ - bzip2=1.0.6=h14c3975_1002
+ - ca-certificates=2019.3.9=hecc5488_0
+ - cdat_info=8.1.1=py_2
+ - cdms2=3.1.2=py37h6091dcd_7
+ - cdtime=3.1.2=py37h6091dcd_1
+ - cdutil=8.1=py_1
+ - certifi=2019.3.9=py37_0
+ - cffi=1.12.3=py37h8022711_0
  - chardet=3.0.4=py37_1003
- - click=7.0=py_0
- - cloudpickle=1.2.2=py_1
- - cryptography=2.8=py37h72c5cf5_1
- - curl=7.65.3=hf8cf82a_0
- - cycler=0.10.0=py_2
- - cytoolz=0.10.1=py37h516909a_0
- - dask=2.10.1=py_0
- - dask-core=2.10.1=py_0
- - dbus=1.13.6=he372182_0
- - decorator=4.4.1=py_0
- - defusedxml=0.6.0=py_0
+ - cryptography=2.6.1=py37h72c5cf5_0
+ - curl=7.64.1=hf8cf82a_0
+ - decorator=4.4.0=py_0
+ - defusedxml=0.5.0=py_1
  - distarray=2.12.2=py_1
- - distributed=2.10.0=py_0
- - docutils=0.16=py37_0
- - dv3d=8.2.2020.01.15.20.33.g590655b=py_0
+ - docutils=0.14=py37_1001
  - entrypoints=0.3=py37_1000
- - esmf=8.0.0=nompi_he6d0a24_4
- - esmpy=8.0.0=nompi_py37hf0e99fa_1
- - expat=2.2.9=he1b5a44_2
- - ffmpeg=4.1.3=h167e202_0
- - flake8=3.7.9=py37_0
- - fontconfig=2.13.1=h86ecdb6_1001
- - freetype=2.10.0=he983fc9_1
- - fsspec=0.6.2=py_0
- - future=0.18.2=py37_0
+ - esmf=7.1.0=hdfb41a0_1004
+ - esmpy=7.1.0=py37h24bf2e0_3
+ - expat=2.2.5=hf484d3e_1002
+ - future=0.17.1=py37_1000
  - g2clib=1.6.0=hf3f1b0b_9
- - genutil=8.2.2020.01.14.22.10.gb56602c=py37hc1659b7_0
- - gettext=0.19.8.1=hc5be6a0_1002
- - ghostscript=9.22=hf484d3e_1001
- - glib=2.58.3=py37h6f030ca_1002
- - gmp=6.2.0=he1b5a44_1
- - gnutls=3.6.5=hd3a4fd2_1002
- - gst-plugins-base=1.14.5=h0935bb2_1
- - gstreamer=1.14.5=h36ae1b5_1
- - hdf4=4.2.13=hf30be14_1003
- - hdf5=1.10.5=nompi_h3c11f04_1104
- - heapdict=1.0.1=py_0
- - icu=64.2=he1b5a44_1
+ - genutil=8.1.1=py37h3010b51_0
+ - hdf4=4.2.13=h9a582f1_1002
+ - hdf5=1.10.4=nompi_h3c11f04_1106
  - idna=2.8=py37_1000
- - image-compare=1.0.3=py_0
- - imagesize=1.2.0=py_0
- - importlib_metadata=1.5.0=py37_0
- - inflect=4.0.0=py37_1
+ - imagesize=1.1.0=py_0
  - ipython_genutils=0.2.0=py_1
- - jaraco.itertools=5.0.0=py_0
  - jasper=1.900.1=h07fcdf6_1006
- - jinja2=2.11.1=py_0
+ - jinja2=2.10.1=py_0
  - jpeg=9c=h14c3975_1001
- - jsonschema=3.2.0=py37_0
- - jupyter_core=4.6.1=py37_0
- - kiwisolver=1.1.0=py37hc9558a2_0
- - krb5=1.16.4=h2fd8d38_0
- - lame=3.100=h14c3975_1001
- - lazy-object-proxy=1.4.3=py37h516909a_1
- - ld_impl_linux-64=2.33.1=h53a641e_8
- - libblas=3.8.0=11_openblas
- - libcblas=3.8.0=11_openblas
- - libcdms=3.1.2=ha54dda3_8
- - libcf=1.0.3=py37hdee1361_5
- - libclang=9.0.1=default_hde54327_0
- - libcurl=7.65.3=hda55be3_0
- - libdrs=3.1.2=h9b7ed86_9
- - libdrs_f=3.1.2=h322d3c2_5
+ - jsonschema=3.0.1=py37_0
+ - jupyter_core=4.4.0=py_0
+ - krb5=1.16.3=h05b26f9_1001
+ - libcdms=3.1.2=hcbdc9ef_1000
+ - libcf=1.0.2=py37h6d95edf_1007
+ - libcurl=7.64.1=hda55be3_0
+ - libdrs=3.1.2=h6e3784b_1
+ - libdrs_f=3.1.2=h750f5ca_1
  - libedit=3.1.20170329=hf8c457e_1001
  - libffi=3.2.1=he1b5a44_1006
- - libgcc-ng=9.2.0=h24d8f2e_2
- - libgfortran-ng=7.3.0=hdf63c60_4
- - libgomp=9.2.0=h24d8f2e_2
- - libiconv=1.15=h516909a_1005
- - liblapack=3.8.0=11_openblas
- - libllvm9=9.0.1=hc9558a2_0
- - libnetcdf=4.7.3=nompi_h9f9fd6a_101
- - libopenblas=0.3.6=h6e990d7_6
+ - libnetcdf=4.6.2=hbdf4f91_1001
  - libpng=1.6.37=hed695b0_0
  - libssh2=1.8.2=h22169c7_2
- - libstdcxx-ng=9.2.0=hdf63c60_2
- - libtiff=4.1.0=hc3755c2_3
+ - libtiff=4.0.10=h648cc4a_1001
  - libuuid=2.32.1=h14c3975_1000
- - libxcb=1.13=h14c3975_1002
- - libxkbcommon=0.9.1=hebb1f50_0
- - libxml2=2.9.10=hee79883_0
- - locket=0.2.0=py_2
- - lz4-c=1.8.3=he1b5a44_1001
- - markupsafe=1.1.1=py37h516909a_0
- - matplotlib=3.1.2=py37_1
- - matplotlib-base=3.1.2=py37h250f245_1
- - mccabe=0.6.1=py_1
- - mesalib=18.3.1=h590aaf7_0
- - mistune=0.8.4=py37h516909a_1000
- - more-itertools=8.2.0=py_0
- - msgpack-python=0.6.2=py37hc9558a2_0
- - nbconvert=5.6.1=py37_0
- - nbformat=5.0.4=py_0
- - nbsphinx=0.5.1=py_0
+ - markupsafe=1.1.1=py37h14c3975_0
+ - mistune=0.8.4=py37h14c3975_1000
+ - mpi=1.0=mpich
+ - mpich=3.2.1=h1c2f66e_1008
+ - nbconvert=5.5.0=py_0
+ - nbformat=4.4.0=py_1
+ - nbsphinx=0.4.2=py_0
  - ncurses=6.1=hf484d3e_1002
- - netcdf-fortran=4.5.2=nompi_h09cde99_103
- - nettle=3.4.1=h1bed415_1002
- - nose=1.3.7=py37_1003
- - nspr=4.24=he1b5a44_0
- - nss=3.47=he751ad9_0
- - numpy=1.17.5=py37h95a1406_0
- - olefile=0.46=py_0
- - openblas=0.3.6=h6e990d7_6
- - openh264=1.8.0=hdbcaa40_1000
- - openssl=1.1.1d=h516909a_0
- - output_viewer=1.3.1=py_1
- - packaging=20.1=py_0
- - pandas=1.0.0=py37hb3f55d8_0
- - pandoc=2.9.1.1=0
+ - netcdf-fortran=4.4.5=hea25ff8_1000
+ - numpy=1.16.2=py37_blas_openblash1522bff_0
+ - openblas=0.3.3=h9ac9557_1001
+ - openssl=1.1.1b=h14c3975_1
+ - packaging=19.0=py_0
+ - pandoc=2.7.2=0
  - pandocfilters=1.4.2=py_1
- - partd=1.1.0=py_0
- - pcre=8.43=he1b5a44_0
- - pillow=7.0.0=py37hefe7db6_0
- - pip=20.0.2=py37_1
- - psutil=5.6.7=py37h516909a_0
- - pthread-stubs=0.4=h14c3975_1001
- - pycodestyle=2.5.0=py_0
+ - pip=19.1=py37_0
  - pycparser=2.19=py37_1
- - pyflakes=2.1.1=py_0
- - pygments=2.5.2=py_0
- - pyopenssl=19.1.0=py37_0
- - pyparsing=2.4.6=py_0
- - pyqt=5.12.3=py37hcca6a23_1
- - pyrsistent=0.15.7=py37h516909a_0
- - pysocks=1.7.1=py37_0
- - python=3.7.6=h357f687_2
- - python-dateutil=2.8.1=py_0
- - pytz=2019.3=py_0
- - pyyaml=5.3=py37h516909a_0
- - qt=5.12.5=hd8c4c69_1
- - readline=8.0=hf8c457e_0
- - requests=2.22.0=py37_1
- - setuptools=45.1.0=py37_0
- - six=1.14.0=py37_0
- - snowballstemmer=2.0.0=py_0
- - sortedcontainers=2.1.0=py_0
- - sphinx=2.3.1=py_0
+ - pygments=2.3.1=py_0
+ - pyopenssl=19.0.0=py37_0
+ - pyparsing=2.4.0=py_0
+ - pyrsistent=0.15.1=py37h516909a_0
+ - pysocks=1.6.8=py37_1002
+ - python=3.7.3=h5b0a415_0
+ - pytz=2019.1=py_0
+ - readline=7.0=hf8c457e_1001
+ - requests=2.21.0=py37_1000
+ - setuptools=41.0.1=py37_0
+ - six=1.12.0=py37_1000
+ - snowballstemmer=1.2.1=py_1
+ - sphinx=2.0.1=py_0
  - sphinxcontrib-applehelp=1.0.1=py_0
  - sphinxcontrib-devhelp=1.0.1=py_0
  - sphinxcontrib-htmlhelp=1.0.2=py_0
  - sphinxcontrib-jsmath=1.0.1=py_0
  - sphinxcontrib-qthelp=1.0.2=py_0
- - sphinxcontrib-serializinghtml=1.1.3=py_0
- - sphinxcontrib-websupport=1.1.2=py_0
- - sqlite=3.30.1=hcee41ef_0
- - tblib=1.6.0=py_0
- - testpath=0.4.4=py_0
- - testsrunner=8.2.2020.01.02.18.59.g463880e=py_0
- - tk=8.6.10=hed695b0_0
- - toolz=0.10.0=py_0
- - tornado=6.0.3=py37h516909a_0
- - traitlets=4.3.3=py37_0
+ - sphinxcontrib-serializinghtml=1.1.1=py_0
+ - sqlite=3.26.0=h67949de_1001
+ - testpath=0.4.2=py_1001
+ - tk=8.6.9=h84994c4_1001
+ - traitlets=4.3.2=py37_1000
  - udunits2=2.2.27.6=h4e0c4b3_1001
- - urllib3=1.25.7=py37_0
- - vcs=8.2.2020.01.31.20.13.ge1838f9=py_0
- - vtk-cdat=8.2.0.8.2.2020.01.15.00.03.g=py37_mesalibh864683f_0
+ - urllib3=1.24.2=py37_0
  - webencodings=0.5.1=py_1
- - wheel=0.34.2=py37_0
- - x264=1!152.20180806=h14c3975_0
- - xorg-libxau=1.0.9=h14c3975_0
- - xorg-libxdmcp=1.1.3=h516909a_0
+ - wheel=0.33.1=py37_0
  - xz=5.2.4=h14c3975_1001
- - yaml=0.2.2=h516909a_1
- - zict=1.0.0=py_0
- - zipp=2.1.0=py_0
- - zlib=1.2.11=h516909a_1006
- - zstd=1.4.4=h3b9ef0a_1
+ - zlib=1.2.11=h14c3975_1004
+ - libgcc-ng=8.2.0=hdf63c60_1
+ - libgfortran-ng=7.3.0=hdf63c60_0
+ - libstdcxx-ng=8.2.0=hdf63c60_1
  - pip:
- - cdms2==3.1.4
- - pyqt5-sip==4.19.18
- - pyqtwebengine==5.12.1
- - regrid2==3.1.4
+ - mv2==3.0.0
+ - regrid2==3.0.0
 prefix: /home/docs/.conda/envs/lite