Issue1157 add stat

.github/workflows/flow.yml

@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
        which_test: [ static_flow, no_mirror, flakey_broker, dynamic_flow, restart_server, partitioned_flow ]
-       osver: [ "ubuntu-20.04", "ubuntu-22.04" ]
+       osver: [ "ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04" ]
 
     runs-on: ${{ matrix.osver }}
 

.github/workflows/flow_basic.yml

@@ -26,7 +26,7 @@ jobs:
       # Don't cancel the entire matrix when one job fails
       fail-fast: false
       matrix:
-       osver: [ "ubuntu-20.04", "ubuntu-22.04" ]
+       osver: [ "ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04" ]
 
     runs-on: ${{ matrix.osver }}
 

.github/workflows/flow_mqtt.yml

@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
       matrix:
        which_test: [ static_flow, no_mirror, flakey_broker, dynamic_flow ]
-       osver: [ "ubuntu-22.04" ]
+       osver: [ "ubuntu-22.04", "ubuntu-24.04" ]
 
     runs-on: ${{ matrix.osver }}
 

.github/workflows/flow_redis.yml

@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
       matrix:
        which_test: [ static_flow, no_mirror, flakey_broker, dynamic_flow, restart_server ]
-       osver: [ "ubuntu-22.04" ]
+       osver: [ "ubuntu-22.04", "ubuntu-24.04" ]
 
     runs-on: ${{ matrix.osver }}
 

debian/changelog

@@ -1,22 +1,18 @@
-metpx-sr3 (3.00.55rc1) unstable; urgency=medium
+metpx-sr3 (3.00.55rc1) UNRELEASED; urgency=medium
 
+  * fix #953 sr3 status queue size updates again.
   * fix #1151 calculate on download not working.
   * fix #1150 bc transport api refactor.
 
  -- SSC-5CD2310S60 <[email protected]>  Tue, 08 Aug 2024 11:24:36 -0400
 
-metpx-sr3 (3.00.54rc3) unstable; urgency=medium
+metpx-sr3 (3.00.54) unstable; urgency=medium
 
   * fix #1142 token authentication re-factor
   * fix #1141 subscribe crash with random checksum.
   * fix #1133 NASA token expiry
   * fix #1089 filAgeMax works more often.
   * improved release documentation.
-
- -- SSC-5CD2310S60 <[email protected]>  Tue, 06 Aug 2024 11:24:36 -0400
-
-metpx-sr3 (3.00.54rc2) unstable; urgency=medium
-
   * CHANGE #33 default queue name generated now includes ${USER}_${HOSTNAME}
   * for #33, use of *queueName* deprecated in favour of *queueShare*
   * NEW/fix #1122 support for implicit FTPS on post 990.
@@ -26,42 +22,36 @@ metpx-sr3 (3.00.54rc2) unstable; urgency=medium
   * enable tests of block transfers #1112
   * fix for #1115: stop won't start, or foreground won't
   * fix redis unit tests broken by inclusion of _name var.
-
-
- -- peter <[email protected]>  Fri, 21 Jun 2024 17:46:14 -0400
-
-metpx-sr3 (3.00.54rc1) unstable; urgency=medium
-
-  [ SSC-5CD2310S60 ]
-  * NEW #1084 add metadata fetch to scheduled http. 
+  * NEW #1084 add metadata fetch to scheduled http.
   * NEW #1104 (EXPERIMENTAL) restored block partitioned transfers.
   * fix #1104 add message per cpu second and cpuS state.
   * only run after_post when actually posted #1101
   * fix #1097 message rates < 1 were parsed as zero, now work correctly.
   * messages reviewed & consolidated: #1094, #1099 (log de-cluttering.)
   * fix crashes/problems with statehost #1076, #1087, #1096
-  * when plugins go bad, report better, recover better: #1085, #1091, 
+  * when plugins go bad, report better, recover better: #1085, #1091,
   * performance improvements #1083, #1086
   * fix #1079 watch posting events it should not.
   * fix #1076 bogus messages and mkdir crash on HPC ( #1087 )
   * merge PR #1067 (closing #824 ) sr3 status flow state detail improved.
     * adds lag,rtry,slow,reje states to status display.
     * adds checks for running process to cleanup, fail if running.
     * adds cleanup to remove, don't remove if cleanup fails.
-    * adds progressive logs to transfers  (closing #966) 
+    * adds progressive logs to transfers  (closing #966)
   * several fixes for sender crashes ( #1091, #1095, #1099 )
   * add #1054 can now convert multiple configs, and overwrite (with --wololo)
   * fixed #1064 poll crash.
   * fixed #927 sanity not restarting crashed polls.
   * reduced processing overhead ( #1086 )
-  * misc bug fixes ( #1070, #1092, #1103, #1108, #1109 ) 
+  * misc bug fixes ( #1070, #1092, #1103, #1108, #1109 )
   * NEW added logFormat option.
   * bug fixes and unit tests for AM ( #1036, $1068, #1074, #1075, #1078, #1079 )
   * many unit tests added, improved coverage (though still poor.)
   * many other plugin improvements. (#1085, #1082, #1091 )
   * search function restored on web-site documentation. ( #1062, #1072)
 
- -- SSC-5CD2310S60 <[email protected]>  Fri, 17 May 2024 12:29:22 -0400
+ -- SSC-5CD2310S60 <[email protected]>  Fri, 12 Aug 2024 12:29:22 -0400
+
 
 metpx-sr3 (3.00.53) unstable; urgency=medium
 

docs/source/Contribution/Release.rst

@@ -55,12 +55,14 @@ To publish a pre-release one needs to:
   - find redhat 8 server.  build package::
 
          * git checkout development_py36
+         * git pull
          * python3 setup.py bdist_rpm*
          * run flow tests
 
-  - find redhat 9 server,  build package:: 
+  - find redhat 9 server,  build package::
 
          * git checkout development_py36
+         * git pull
          * python3 setup.py bdist_rpm*
          * run flow tests
 
@@ -77,31 +79,32 @@ To publish a pre-release one needs to:
 
      * git pull
      * git checkout development_py36
+     * git pull
      * git tag -a o3.xx.yyrcz -m "pre-release o3.xx.yy.rcz"
      * git pull 
      * git checkout pre_release_py36
      * git pull
      * git merge development_py36
      * git push
+     * git push origin o3.xx.yyrcz
 
      * git checkout development
      * git tag -a v3.xx.yy.rcZ -m "pre-release v3.xx.yy.rcz"
      * git checkout pre_release
      * git pull
      * git merge development
      * git push
+     * git push origin v3.xx.yyrcz
 
-- push the above.  
 
-     * git push origin o3.xx.yyrcz
-     * git push origin v3.xx.yyrcz
 
 - pypi.org
 
   - to ensure compatiblity with python3.6, update a python3.6 branch (for redhat 8 and/or ubuntu 18.)
   - use the python3.6 branch to release to pypi (because upward compatibility works, but not downward.)
 
     * git checkout pre_release_py36
+    * git pull
     * python3 setup.py bdist_wheel
 
   - upload the pre-release so that installation with pip succeeds.
@@ -131,16 +134,17 @@ To publish a pre-release one needs to:
 
   - find redhat 8 server. build package:: 
 
-        git checkout stable_py36
+        git checkout pre-release_py36
+        git pull
         python3 setup.py bdist_rpm 
 
 
   - find redhat 9 server, build package::
 
-        git checkout stable_py36
+        git checkout pre-release_py36
+        git pull
         python3 setup.py bdist_rpm 
 
-
 - on github: Draft a release.
 
   - create release notes as prompted.
@@ -163,8 +167,14 @@ the stable release does not require any explicit testing.
 
 * merge from pre-release to stable::
 
+
+     git checkout pre-release
+     git pull
      git checkout stable
+     git pull
      git merge pre-release
+     git push
+
      # there will be conflicts here for debian/changelog and sarracenia/_version.py
      # for changelog:
      #   - merge all the rcX changelogs into a single stable one.
@@ -177,12 +187,30 @@ the stable release does not require any explicit testing.
 
 * merge from pre-release_py36 to stable_py36::
 
+     git checkout pre_release_py36
+     git pull
      git checkout stable_py36
+     git pull
      git merge pre_release_py36
+     git push
      # same editing required as above.
      git tag -a o3.xx.yy -m "o3.xx.yy"
      git push origin o3.xx.yy
 
+* pypi.org
+
+  - to ensure compatiblity with python3.6, update a python3.6 branch (for redhat 8 and/or ubuntu 18.)
+  - use the python3.6 branch to release to pypi (because upward compatibility works, but not downward.)
+
+    * git checkout stable_py36
+    * git pull
+    * python3 setup.py bdist_wheel
+
+  - upload the pre-release so that installation with pip succeeds.
+
+    * twine upload dist/the_wheel_produced_above.whl 
+
+
 * go on Launchpad, 
 
    * stable branch ready.
@@ -197,6 +225,7 @@ the stable release does not require any explicit testing.
 * go on ubuntu 18.04, build bdist_wheel::
 
       git checkout stable_py36
+      git pull
       python3 setup.py bdist_wheel 
 
 note that *pip3 install wheel* is needed, because the one from
@@ -205,12 +234,18 @@ ubuntu 18 is not compatible with the current pypi.org.
 * go on redhat 8, build rpm::
 
       git checkout stable_py36
+      git pull
       python3 setup.py bdist_rpm 
+      ls dist/
+      mv rpm file to have rh8 in the name somewhere.
 
-* go on redhat 9, build rpm::
+* go on redhat 9, build rpm **NOTE: Broken!, for now use redhat 8 process** ::
 
       git checkout stable_py36
+      git pull
       rpmbuild --build-in-place -bb metpx-sr3.spec
+      ls dist/
+      mv rpm file to have rh8 in the name somewhere.
 
 
 * On github.com, create release.
@@ -219,8 +254,7 @@ ubuntu 18 is not compatible with the current pypi.org.
   * attach wheel build on ubuntu 18.
   * attach redhat 8 rpm
   * attach redhat 9 rpm 
-  * attach windows exe
-
+  * attach windows exe ... see: `Building a Windows Installer`_
 
 Details
 -------
@@ -246,11 +280,13 @@ prior to accepting a release, and barring known exceptions,
   tests: static, no_mirror, flakey_broker, restart_server, dynamic_flow::
 
        git checkout pre_release_py36
+       git pull
        python3 setup.py bdist_rpm
 
 * Redhat 9 rpms currently do not work... vm and run the flow test there to ensure that it works::
 
        git checkout pre_release_py36
+       git pull
        python3 setup.py bdist_rpm
 
 
@@ -655,13 +691,16 @@ by pynsist to build the executable, so look at::
     https://www.python.org/downloads/windows/
 
 Then go look on python.org, for the "right" version (for 3.10, it is 3.10.11 )
-Then, from the shell, run::
+It will contain *embed* in the file names. Once you find the correct version
+From the shell, run::
 
- sudo apt install nsis
- pip3 install pynsist wheel
- ./generate-win-installer.sh 3.10.11 2>&1 > log.txt
+   sudo apt install nsis
+   pip3 install pynsist wheel
+   ./generate-win-installer.sh 3.10.11 2>&1 > log.txt
 
-The final package will be generated into build/nsis directory.
+The final package will be generated into *build/nsis* directory. Sometimes editing of 
+the *generate-win-installer.sh* script is needed to add *--no-isolation* to the *python -m build* line.
+It's not clear when that is needed.
 
 
 github