Merge pull request #451 from dtcenter/bugfix_448_main_v5.0_nco_req

Bugfix 448 main v5.0 nco req

build.xml

@@ -660,7 +660,7 @@
         <fail unless="metcalcpy.path">You must specify the path to METcalcpy directory</fail>
         <fail unless="metplotpy.path">You must specify the path to METplotpy directory</fail>
         <fail unless="metdataio.path">You must specify the path to METdataio directory</fail>
-        <fail unless="python.env.path">You must specify the path to METviewer_py3.6.3</fail>
+        <fail unless="python.env.path">You must specify the path to METviewer_py3.8.6</fail>
 
         <tar destfile="${dist}/batch_load.tar" >
             <tarfileset dir="."  prefix="METviewer/">

docker/Dockerfile

@@ -232,23 +232,34 @@ RUN pip install cartopy \
  && pip install eofs \
  && pip install imutils==0.5.4 \
  && pip install imageio==2.19.2 \
- && pip install lxml \
- && pip install matplotlib==3.5.1 \
- && pip install netcdf4==1.5.8 \
- && pip install numpy==1.22.3 \
- && pip install pandas==1.2.3 \
+ && pip install lxml==4.9.1 \
+ && pip install matplotlib==3.5.2 \
+ && pip install netcdf4==1.6.2 \
+ && pip install numpy==1.22.0 \
  && pip install pytest==7.1.2 \
  && pip install metpy==1.3.1 \
  && pip install pyyaml==6.0 \
- && pip install scikit-image==0.18.1 \
- && pip install scikit-learn==0.23.2 \
- && pip install scipy==1.8.0 \
+ && pip install scikit-image==0.19.3 \
+ && pip install scikit-learn \
+ && pip install scipy==1.8.1 \
  && pip install xarray==2022.3.0 \
  && pip install PyMySQL==1.0.2 \
  && pip install pint==0.19.2 \
- && pip install plotly==5.8.0 \
+ && pip install plotly==5.9.0 \
  && pip install kaleido==0.2.1 \
- && pip install PyYAML==5.3.1
+ && pip install attrs==22.1.0 \
+ && pip install exceptiongroup==1.0.4 \
+ && pip install iniconfig==1.1.1 \
+ && pip install packaging==22.0 \
+ && pip install pluggy==1.0.0 \
+ && pip install pytz==2022.6 \
+ && pip install setuptools==65.5.1 \
+ && pip install six==1.16.0 \
+ && pip install tomli==2.0.1 \
+ && pip install wheel==0.38.1 \
+ && pip install python-dateutil==2.8.2 \
+ && pip install opencv-python \
+ && pip install pandas==1.5.1
 
 
 

docker/hooks/build

@@ -2,7 +2,7 @@
 
 docker build -t $IMAGE_NAME \
 --build-arg METVIEWER_GIT_NAME=$SOURCE_BRANCH \
---build-arg METCALCPY_GIT_NAME=v1.1.0-beta6 \
---build-arg METDATAIO_GIT_NAME=v1.1.0-beta6 \
---build-arg METPLOTPY_GIT_NAME=v1.1.0-beta6 .
+--build-arg METCALCPY_GIT_NAME=v2.0.1 \
+--build-arg METDATAIO_GIT_NAME=v2.0.1 \
+--build-arg METPLOTPY_GIT_NAME=v2.0.1 .
 

docs/Users_Guide/installation.rst

@@ -55,77 +55,61 @@ install the latest version. Install required R packages:
 **Python**: install Python 3.8.6 or higher. Create an environment
 (METviewer_py3.8.6) and install required packages:
 
-* Python 3.8.6
-
-* cartopy
-
-* eofs
-
-* imutils==0.5.4
-
-* imageio==2.19.2
-
-* lxml
-
-* matplotlib==3.5.1
-
-* netcdf4==1.5.8
-
-* numpy==1.22.3
-
-* pandas==1.2.3
-
-* pytest==7.1.2
-
-* metpy==1.3.1
-
-* pyyaml==6.0
-
-* scikit-image==0.18.1
-
-* scikit-learn==0.23.2
-
-* scipy==1.8.0
-
+* Python 3.10.4
+* matplotlib==3.5.2
+* scipy==1.8.1
+* plotly==5.9.0
 * xarray==2022.3.0
-
-* PyMySQL==1.0.2
-
-* pint==0.19.2
-
-* plotly==5.8.0
-
+* pyyaml==6.0
 * kaleido==0.2.1
-
-* xarray==2022.3.0
-
-* PyYAML==5.3.1
-
+* pint==0.19.2
+* metpy==1.3.1
+* pandas==1.5.1
+* attrs==22.1.0
+* exceptiongroup==1.0.4
+* iniconfig==1.1.1
+* lxml==4.9.1
+* packaging==22.0
+* pluggy==1.0.0
+* PyMySQL==1.0.2
+* pytz==2022.6
+* setuptools==65.5.1
+* six==1.16.0
+* tomli==2.0.1
+* wheel==0.38.1
+* numpy==1.22.0
+* netcdf4==1.6.2
+* pytest==7.2.0
+* python-dateutil==2.8.2
+* imageio==2.19.3
+* imutils==0.5.4
+* scikit-image==0.19.3
+* opencv-python
 
 
 
-**METviewer** -
+**METviewer v4.0.1** -
 clone   `METviewer repository <https://github.com/dtcenter/METviewer>`_
 
    .. code-block:: none
 
      git clone https://github.com/dtcenter/METviewer.git
 
-**METcalcpy** -
+**METcalcpy v2.0.1** -
 clone   `METcalcpy repository <https://github.com/dtcenter/METcalcpy>`_
 
    .. code-block:: none
 
      git clone https://github.com/dtcenter/METcalcpy.git
 
-**METplotpy** -
+**METplotpy v2.0.1** -
 clone   `METplotpy repository <https://github.com/dtcenter/METplotpy>`_
 
    .. code-block:: none
 
      git clone https://github.com/dtcenter/METplotpy.git
 
-**METdataio** -
+**METdataio v2.0.1** -
 clone   `METdataio repository <https://github.com/dtcenter/METdataio>`_
 
    .. code-block:: none

docs/version

@@ -1 +1 @@
-5.0.0
+5.0.1

met_plus_requirements.txt

@@ -0,0 +1,32 @@
+matplotlib==3.5.2
+scipy==1.8.1
+plotly==5.9.0
+xarray==2022.3.0
+pyyaml==6.0
+kaleido==0.2.1
+pint==0.19.2
+metpy==1.3.1
+pandas==1.5.1
+
+attrs==22.1.0
+exceptiongroup==1.0.4
+iniconfig==1.1.1
+lxml==4.9.1
+packaging==22.0
+pluggy==1.0.0
+PyMySQL==1.0.2
+pytz==2022.6
+setuptools==65.5.1
+six==1.16.0
+tomli==2.0.1
+wheel==0.38.1
+
+numpy==1.22.0
+netcdf4==1.6.2
+pytest==7.2.0
+python-dateutil==2.8.2
+
+imageio==2.19.3
+imutils==0.5.4
+scikit-image==0.19.3
+opencv-python

nco_requirements.txt

@@ -0,0 +1,32 @@
+matplotlib==3.5.2
+scipy==1.8.1
+plotly==5.9.0
+xarray==2022.3.0
+pyyaml==6.0
+kaleido==0.2.1
+pint==0.19.2
+metpy==1.3.1
+pandas==1.5.1
+
+attrs==22.1.0
+exceptiongroup==1.0.4
+iniconfig==1.1.1
+lxml==4.9.1
+packaging==22.0
+pluggy==1.0.0
+PyMySQL==1.0.2
+pytz==2022.6
+setuptools==65.5.1
+six==1.16.0
+tomli==2.0.1
+wheel==0.38.1
+
+numpy==1.22.0
+netcdf4==1.6.2
+pytest==7.2.0
+python-dateutil==2.8.2
+
+imageio==2.19.3
+imutils==0.5.4
+scikit-image==0.19.3
+opencv-python