Update version and dependencies (#362)

* update version * add yml for osx * modify yml files * clean up
E3SM-Project · Dec 2, 2020 · 78638bd · 78638bd
1 parent 66951bb
commit 78638bd
Show file tree

Hide file tree

Showing 10 changed files with 460 additions and 230 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@
 FROM continuumio/miniconda3:4.6.14
 
 LABEL maintainer="[email protected]"
-LABEL version="2.2.0"
+LABEL version="2.3.0"
 
 # Copy the entire project dir because we'll install from source.
 COPY . .

diff --git a/acme_diags/__init__.py b/acme_diags/__init__.py
@@ -1,5 +1,5 @@
 import os
 import sys
 
-__version__ = 'v2.2.0'
+__version__ = 'v2.3.0'
 INSTALL_PATH = os.path.join(sys.prefix, 'share/e3sm_diags/')
diff --git a/acme_diags/driver/utils/general.py b/acme_diags/driver/utils/general.py
@@ -88,7 +88,7 @@ def get_yrs(dataset, season=''):
         try:
             yrs_averaged = dataset.get_attr_from_climo('yrs_averaged', season)
         except:
-            print("No 'yrs_averaged' exists in the global attributes.")
+            #print("No 'yrs_averaged' exists in the global attributes.")
             yrs_averaged = ''
     else:
         start_yr, end_yr = dataset.get_start_and_end_years()

diff --git a/conda/e3sm_diags_env.yml b/conda/e3sm_diags_env.yml
@@ -3,204 +3,173 @@ channels:
   - conda-forge
   - defaults
   - e3sm
-  - cdat/label/v82
 dependencies:
   - _libgcc_mutex=0.1
   - _openmp_mutex=4.5
-  - attrs=19.3.0
-  - beautifulsoup4=4.9.1
-  - bokeh=2.1.1
-  - boost-cpp=1.72.0
+  - attrs=20.3.0
+  - beautifulsoup4=4.9.3
+  - bokeh=2.2.3
   - brotlipy=0.7.0
   - bzip2=1.0.8
-  - c-ares=1.16.1
-  - ca-certificates=2020.6.20
-  - cairo=1.16.0
+  - c-ares=1.17.1
+  - ca-certificates=2020.11.8
   - cartopy=0.18.0
   - cdat_info=8.2.1
-  - cdms2=3.1.4
-  - cdp=1.6.0
+  - cdp=1.7.0
   - cdtime=3.1.4
   - cdutil=8.2.1
-  - certifi=2020.6.20
-  - cffi=1.14.1
-  - cfitsio=3.470
+  - certifi=2020.11.8
+  - cffi=1.14.4
   - chardet=3.0.4
   - click=7.1.2
-  - cloudpickle=1.5.0
-  - cryptography=3.0
+  - cloudpickle=1.6.0
+  - cryptography=3.2.1
   - curl=7.71.1
   - cycler=0.10.0
-  - cytoolz=0.10.1
-  - dask=2.15.0
-  - dask-core=2.15.0
-  - decorator=4.4.2
+  - cytoolz=0.11.0
+  - dask=2.30.0
+  - dask-core=2.30.0
+  - dbus=1.13.6
   - distarray=2.12.2
-  - distributed=2.22.0
-  - dv3d=8.2
-  - e3sm_diags=2.1.1
+  - distributed=2.30.1
+  - e3sm=2.3.0
   - esmf=8.0.1
   - esmpy=8.0.1
   - expat=2.2.9
-  - ffmpeg=4.2.3
   - fontconfig=2.13.1
-  - freetype=2.10.2
-  - freexl=1.0.5
-  - fsspec=0.8.0
+  - freetype=2.10.4
+  - fsspec=0.8.4
   - future=0.18.2
   - g2clib=1.6.0
-  - gdal=3.1.2
   - genutil=8.2.1
   - geos=3.8.1
-  - geotiff=1.6.0
   - gettext=0.19.8.1
-  - ghostscript=9.22
-  - giflib=5.2.1
-  - glib=2.65.0
-  - gmp=6.2.0
-  - gnutls=3.6.13
+  - glib=2.66.3
+  - gst-plugins-base=1.14.5
+  - gstreamer=1.14.5
   - hdf4=4.2.13
   - hdf5=1.10.6
   - heapdict=1.0.1
   - icu=67.1
   - idna=2.10
-  - importlib-metadata=1.7.0
-  - importlib_metadata=1.7.0
+  - importlib-metadata=3.1.0
+  - importlib_metadata=3.1.0
   - ipython_genutils=0.2.0
   - jasper=1.900.1
   - jinja2=2.11.2
   - jpeg=9d
-  - json-c=0.13.1
   - jsonschema=3.2.0
-  - jupyter_core=4.6.3
-  - kealib=1.4.13
-  - kiwisolver=1.2.0
-  - krb5=1.17.1
-  - lame=3.100
-  - lazy-object-proxy=1.5.1
+  - jupyter_core=4.7.0
+  - kiwisolver=1.3.1
+  - krb5=1.17.2
+  - lazy-object-proxy=1.5.2
   - lcms2=2.11
-  - ld_impl_linux-64=2.34
+  - ld_impl_linux-64=2.35.1
   - libblas=3.8.0
   - libcblas=3.8.0
   - libcdms=3.1.2
   - libcf=1.0.3
+  - libclang=10.0.1
   - libcurl=7.71.1
-  - libdap4=3.20.6
   - libdrs=3.1.2
   - libdrs_f=3.1.2
   - libedit=3.1.20191231
   - libev=4.33
+  - libevent=2.1.10
   - libffi=3.2.1
-  - libgcc=7.2.0
   - libgcc-ng=9.3.0
-  - libgdal=3.1.2
-  - libgfortran-ng=7.5.0
+  - libgfortran-ng=9.3.0
+  - libgfortran5=9.3.0
+  - libglib=2.66.3
   - libgomp=9.3.0
-  - libiconv=1.15
-  - libkml=1.3.0
+  - libiconv=1.16
   - liblapack=3.8.0
+  - libllvm10=10.0.1
   - libnetcdf=4.7.4
   - libnghttp2=1.41.0
-  - libopenblas=0.3.6
+  - libopenblas=0.3.10
   - libpng=1.6.37
   - libpq=12.3
-  - libspatialite=4.3.0a
   - libssh2=1.9.0
   - libstdcxx-ng=9.3.0
   - libtiff=4.1.0
   - libuuid=2.32.1
   - libwebp-base=1.1.0
   - libxcb=1.13
+  - libxkbcommon=0.10.0
   - libxml2=2.9.10
   - libxslt=1.1.33
   - locket=0.2.0
-  - lxml=4.5.2
+  - lxml=4.6.2
   - lz4-c=1.9.2
   - markupsafe=1.1.1
-  - matplotlib=3.3.0
-  - matplotlib-base=3.3.0
-  - mesalib=18.3.1
+  - matplotlib=3.3.3
+  - matplotlib-base=3.3.3
   - msgpack-python=1.0.0
-  - nbformat=5.0.7
+  - mysql-common=8.0.21
+  - mysql-libs=8.0.21
+  - nbformat=5.0.8
   - ncurses=6.2
   - netcdf-fortran=4.5.3
-  - nettle=3.4.1
-  - numpy=1.19.1
+  - nspr=4.29
+  - nss=3.59
+  - numpy=1.19.4
   - olefile=0.46
-  - openblas=0.3.6
-  - openh264=2.1.1
-  - openjpeg=2.3.1
-  - openssl=1.1.1g
+  - openblas=0.3.10
+  - openssl=1.1.1h
   - output_viewer=1.3.1
-  - owslib=0.20.0
   - packaging=20.4
-  - pandas=1.1.0
+  - pandas=1.1.4
   - partd=1.1.0
   - pcre=8.44
-  - pillow=7.2.0
-  - pip=20.2.1
-  - pixman=0.38.0
-  - poppler=0.89.0
-  - poppler-data=0.4.9
-  - postgresql=12.3
-  - proj=7.1.0
-  - psutil=5.7.2
+  - pillow=8.0.1
+  - pip=20.3
+  - proj=7.1.1
+  - psutil=5.7.3
   - pthread-stubs=0.4
   - pycparser=2.20
-  - pyepsg=0.4.0
-  - pyopenssl=19.1.0
+  - pyopenssl=20.0.0
   - pyparsing=2.4.7
-  - pyproj=2.6.1.post1
-  - pyrsistent=0.16.0
-  - pyshp=2.1.0
+  - pyqt=5.12.3
+  - pyrsistent=0.17.3
+  - pyshp=2.1.2
   - pysocks=1.7.1
   - python=3.7.8
   - python-dateutil=2.8.1
   - python_abi=3.7
-  - pytz=2020.1
+  - pytz=2020.4
   - pyyaml=5.3.1
+  - qt=5.12.9
   - readline=8.0
-  - requests=2.24.0
-  - scipy=1.5.2
-  - setuptools=49.2.1
-  - shapely=1.7.0
+  - requests=2.25.0
+  - scipy=1.5.3
+  - setuptools=49.6.0
+  - shapely=1.7.1
   - six=1.15.0
-  - sortedcontainers=2.2.2
+  - sortedcontainers=2.3.0
   - soupsieve=2.0.1
-  - sqlite=3.32.3
-  - tbb=2020.1
+  - sqlite=3.33.0
   - tblib=1.6.0
-  - tiledb=2.0.8
   - tk=8.6.10
-  - toolz=0.10.0
-  - tornado=6.0.4
-  - traitlets=4.3.3
-  - typing_extensions=3.7.4.2
-  - tzcode=2020a
+  - toolz=0.11.1
+  - tornado=6.1
+  - traitlets=5.0.5
+  - typing_extensions=3.7.4.3
   - udunits2=2.2.27.6
-  - urllib3=1.25.10
-  - vcs=8.2
-  - vcsaddons=8.2
-  - vtk-cdat=8.2.0.8.2
-  - wheel=0.34.2
-  - x264=1!152.20180806
-  - xerces-c=3.2.3
-  - xorg-kbproto=1.0.7
-  - xorg-libice=1.0.10
-  - xorg-libsm=1.2.3
-  - xorg-libx11=1.6.10
+  - urllib3=1.25.11
+  - wheel=0.36.0
   - xorg-libxau=1.0.9
   - xorg-libxdmcp=1.1.3
-  - xorg-libxext=1.3.4
-  - xorg-libxrender=0.9.10
-  - xorg-renderproto=0.11.1
-  - xorg-xextproto=7.3.0
-  - xorg-xproto=7.0.31
   - xz=5.2.5
   - yaml=0.2.5
   - zict=2.0.0
-  - zipp=3.1.0
+  - zipp=3.4.0
   - zlib=1.2.11
   - zstd=1.4.5
-prefix: /export/zhang40/anaconda2/envs/e3sm_diags_env
-
+  - pip:
+    - cdms2==3.1.5
+    - pyqt5-sip==4.19.18
+    - pyqtchart==5.12
+    - pyqtwebengine==5.12.1
+    - regrid2==3.1.5
+prefix: /export/zhang40/miniconda3/envs/e3sm_diags_env