Merge pull request #489 from dtcenter/feature_488_v5.1.0

Create the METplotpy v5.1.0 release #488
dtcenter · Jul 31, 2023 · 596a776 · 596a776
2 parents eb5ca5c + 205846a
commit 596a776
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 84 deletions.
diff --git a/build.xml b/build.xml
@@ -319,7 +319,7 @@
         </copy>
         <delete file="${build}/MANIFEST.MF"/>
         <manifest file="${build}/MANIFEST.MF">
-            <attribute name="Specification-Version" value="5.1.0-rc3"/>
+            <attribute name="Specification-Version" value="5.1.0"/>
         </manifest>
 
         <jar jarfile="${dist}/lib/metviewer.jar" basedir="${build}" manifest="${build}/MANIFEST.MF">

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -5,10 +5,10 @@ MAINTAINER Tatiana Burek <tatiana@ucar.edu>
 #
 # This Dockerfile checks out METviewer from GitHub and builds the specified branch or tag.
 #
-ENV METVIEWER_GIT_NAME develop
-ENV METCALCPY_GIT_NAME develop
-ENV METPLOTPY_GIT_NAME develop
-ENV METDATAIO_GIT_NAME develop
+ENV METVIEWER_GIT_NAME main_v5.1
+ENV METCALCPY_GIT_NAME main_v2.1
+ENV METPLOTPY_GIT_NAME main_v2.1
+ENV METDATAIO_GIT_NAME main_v2.1
 
 #
 # Constants
@@ -267,7 +267,7 @@ RUN pip install cartopy \
  && pip install wheel==0.38.1 \
  && pip install python-dateutil==2.8.2 \
  && pip install opencv-python \
- && pip install pandas==1.5.1
+ && pip install pandas==1.5.2
 #
 #
 

diff --git a/docker/Dockerfile_for_Singularity b/docker/Dockerfile_for_Singularity
@@ -284,7 +284,7 @@ RUN pip install cartopy \
  && pip install wheel==0.38.1 \
  && pip install python-dateutil==2.8.2 \
  && pip install opencv-python \
- && pip install pandas==1.5.1
+ && pip install pandas==1.5.2
 
 
 

diff --git a/docker/hooks/build b/docker/hooks/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 docker build -t $IMAGE_NAME \
---build-arg METVIEWER_GIT_NAME=v5.0.1 \
---build-arg METCALCPY_GIT_NAME=v2.0.1 \
---build-arg METDATAIO_GIT_NAME=v2.0.1 \
---build-arg METPLOTPY_GIT_NAME=v2.0.1 .
+--build-arg METVIEWER_GIT_NAME=v5.1.0 \
+--build-arg METCALCPY_GIT_NAME=v2.1.0 \
+--build-arg METDATAIO_GIT_NAME=v2.1.0 \
+--build-arg METPLOTPY_GIT_NAME=v2.1.0 .
 
diff --git a/docs/Users_Guide/release-notes.rst b/docs/Users_Guide/release-notes.rst
@@ -9,93 +9,32 @@ When applicable, release notes are followed by the GitHub issue number which
 describes the bugfix, enhancement, or new feature:
 https://github.com/dtcenter/METviewer/issues
 
-Version `v5.1.0-rc3 <https://github.com/dtcenter/METviewer>`_ release notes (20230713)
+Version `v5.1.0 <https://github.com/dtcenter/METviewer>`_ release notes (20230731)
 ----------------------------------------------------------------------------------------
 
-  .. dropdown:: Internal
-
-     * Testing the bug fix in MEtplotpy
-     * Change the version number for scipy to 1.11.1
-
-Version `v5.1.0-rc2 <https://github.com/dtcenter/METviewer>`_ release notes (20230710)
-----------------------------------------------------------------------------------------
-
-  .. dropdown:: New Features
-
-     None
-
-  .. dropdown::  Enhancements
-
-     None
-
-  .. dropdown:: Bugfixes
-
-     * error during printing log messages for batch jobs (`#484 <https://github.com/dtcenter/METviewer/issues/484>`_)
-
-  .. dropdown:: Internal
-
-     None
-
-Version `v5.1.0-rc1 <https://github.com/dtcenter/METviewer>`_ release notes (20230613)
-----------------------------------------------------------------------------------------
 
   .. dropdown:: New Features
 
-     None
+      * New Dockerfile that creates a single image with database and METviewer in it. Can be used to create a Singularity image  (`#446 <https://github.com/dtcenter/METviewer/issues/446>`_)
 
   .. dropdown::  Enhancements
 
-     None
+      * Upgrade to using Python 3.10.4 (`#449 <https://github.com/dtcenter/METviewer/issues/449>`_)
 
   .. dropdown:: Bugfixes
 
-     None
+      * Fixed an error during uploading a reliability diagram XML to GUI (`#464 <https://github.com/dtcenter/METviewer/issues/464>`_)
+      * error during printing log messages for batch jobs (`#484 <https://github.com/dtcenter/METviewer/issues/484>`_)
 
   .. dropdown:: Internal
 
      * Remove Couchbase code (`#479 <https://github.com/dtcenter/METviewer/issues/479>`_)
      * Record the username of the user associated with the batch/scorecard run (`#22 <https://github.com/dtcenter/METplus-Internal/issues/22>`_)
      * The user ID will be added to the log files (`#48 <https://github.com/dtcenter/METplus-Internal/issues/48>`_)
      * Record a time stamp indicating when the event occurred  (`#11 <https://github.com/dtcenter/METplus-Internal/issues/11>`_)
+     * Testing the bug fix in MEtplotpy
+     * Change the version number for scipy to 1.11.1
 
-Version `v5.1.0-beta2 <https://github.com/dtcenter/METviewer>`_ release notes (20230424)
-----------------------------------------------------------------------------------------
-
-  .. dropdown:: New Features
-
-    * New Dockerfile that creates a single image with database and METviewer in it. Can be used to create a Singularity image  (`#446 <https://github.com/dtcenter/METviewer/issues/446>`_)
-
-  .. dropdown::  Enhancements
-
-     None
-
-  .. dropdown:: Bugfixes
-
-    * Fixed an error during uploading a reliability diagram XML to GUI (`#464 <https://github.com/dtcenter/METviewer/issues/464>`_)
-
-
-  .. dropdown:: Internal
-
-     None  
-
-Version `v5.1.0-beta1 <https://github.com/dtcenter/METviewer>`_ release notes (20230301)
-----------------------------------------------------------------------------------------
-
-  .. dropdown:: New Features
-
-     None
-
-  .. dropdown::  Enhancements
-
-     * **Upgrade to using Python 3.10.4** (`#449 <https://github.com/dtcenter/METviewer/issues/449>`_)
-
-  .. dropdown:: Bugfixes
-
-     None
-
-  .. dropdown:: Internal
-
-     None
 
 Version `v5.0.1 <https://github.com/dtcenter/METviewer>`_ release notes (20230130)
 ----------------------------------------------------------------------------------

diff --git a/docs/version b/docs/version
@@ -1 +1 @@
-5.1.0-rc3
+5.1.0
diff --git a/met_plus_requirements.txt b/met_plus_requirements.txt
@@ -6,7 +6,7 @@ pyyaml==6.0
 kaleido==0.2.1
 pint==0.19.2
 metpy==1.3.1
-pandas==1.5.1
+pandas==1.5.2
 
 attrs==22.1.0
 exceptiongroup==1.0.4

diff --git a/nco_requirements.txt b/nco_requirements.txt
@@ -6,7 +6,7 @@ pyyaml==6.0
 kaleido==0.2.1
 pint==0.19.2
 metpy==1.3.1
-pandas==1.5.1
+pandas==1.5.2
 
 attrs==22.1.0
 exceptiongroup==1.0.4

diff --git a/webapp/metviewer/metviewer1.jsp b/webapp/metviewer/metviewer1.jsp
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <TITLE>METviewer 5.1.0-rc3</TITLE>
+  <TITLE>METviewer 5.1.0</TITLE>
   <link rel="shortcut icon" href="./favicon.ico">
 
   <link rel="stylesheet"
@@ -252,7 +252,7 @@
 
   <div class="toolbar ui-widget" id="toolbar ">
     <div style="float: left; cursor: alias;font-family: 'Arial Black',Gadget,sans-serif;"
-         id="release">METviewer 5.1.0-rc3<span class="ui-icon ui-icon-info " style="float: right;
+         id="release">METviewer 5.1.0<span class="ui-icon ui-icon-info " style="float: right;
               margin-left: .4em;"></span>
 
     </div>