Get ready for 2.0.0 release

Author: ibmmqmet

code/examples/Dockerfile

@@ -10,7 +10,7 @@
 ARG BASE_IMAGE=registry.access.redhat.com/ubi8/python-312
 FROM $BASE_IMAGE
 
-ENV VRMF=9.4.3.0 \
+ENV VRMF=9.4.4.0 \
     genmqpkg_incnls=1 \
     genmqpkg_incsdk=1 \
     genmqpkg_inctls=1
@@ -107,7 +107,7 @@ ENV LD_LIBRARY_PATH=/opt/mqm/lib64
 # User 1001 is the default application user in this base container image
 USER 1001
 
-# Install the MQ Python library. This will build against the installed SDK
+# Install the MQ Python library. This will build against the installed MQ SDK
 RUN pip install --verbose ibmmq
 # RUN pip install ibmmq
 

code/examples/runInContainer.sh

@@ -6,7 +6,7 @@
 # Basic name for the container. If we have a version tag from a git clone, use that
 # in the container tag. Otherwise just use "latest"
 TAG=mq-python-example-connect
-VER=`git tag -l 2>/dev/null| sort | tail -1 `
+VER=`git tag -l 2>/dev/null| grep -v "^v1" | sort | tail -1 `
 if [ -z "$VER" ]
 then
   VER="latest"
@@ -29,14 +29,14 @@ then
   # set an environment variable to explicitly configure it.
   addr=`ip -4 addr | grep -v altname | grep "state UP" -A2 | grep inet | tail -n1 | awk '{print $2}' | cut -f1 -d'/'`
 
-  if [ ! -z "FORCE_ADDR" ]
+  if [ ! -z "$FORCE_ADDR" ]
   then
     addr=$FORCE_ADDR
   fi
 
   echo "Local address is $addr"
   port="1414"
-  if [ ! -z "addr" ]
+  if [ ! -z "$addr" ]
   then
     # Run the container.
     docker run --rm \

setup.py

@@ -17,7 +17,7 @@
 # The version should correspond to PEP440 and gets normalised if
 # not in the right format. VRM can be followed with a|b|rc with a further numeric
 # to indicate alpha/beta/release-candidate versions.
-VERSION = '2.0.0b2'
+VERSION = '2.0.0'
 
 # If the MQ SDK is in a non-default location, set MQ_FILE_PATH environment variable.
 custom_path = os.environ.get('MQ_FILE_PATH', None)
@@ -185,9 +185,9 @@ def get_locations_by_command_path(command_path):
     print('Here is the message:', msg)
 
 Many more examples are in the `project repository
-<https://github.com/ibm-messaging/mq-mqi-python/tree/main/code/examples/>`_.
+<https://github.com/ibm-messaging/mq-mqi-python/tree/main/code/examples/>`_
 and in the `dev-patterns repository
-<https://github.com/ibm-messaging/mq-dev-patterns/tree/master/Python/>'_.
+<https://github.com/ibm-messaging/mq-dev-patterns/tree/master/Python/>`_.
 
 """
 

tools/check

@@ -119,10 +119,10 @@ then
   exit 1
 fi
 
-cd $src/code/examples
+cd $src
 echo
 echo "Looking for MQ VRMF info..."
-cmdlevel=`grep MQCMDL_CURRENT_LEVEL ../ibmmq/CMQSTRC.py | awk '{print $3}' | sed "s/,//g"`
+cmdlevel=`grep MQCMDL_CURRENT_LEVEL code/ibmmq/CMQSTRC.py | awk '{print $3}' | sed "s/,//g"`
 echo "  Command level in repo = $cmdlevel"
 
 # The Dockerfile ought to be pointing at the most recent version. Whose Redist Client
@@ -131,7 +131,7 @@ echo "  Command level in repo = $cmdlevel"
 # Though we can point the container to download from a local server instead of public instead.
 #
 # No other files currently seem to have a VRMF dependency.
-for f in Dockerfile
+for f in code/examples/Dockerfile
 do
   vrmf=`grep "VRMF=" $f | cut -f2 -d" " | cut -f2 -d=`
   if [ -z "$vrmf" ]
@@ -303,8 +303,9 @@ main 2>&1 |\
 
 echo
 echo "---------------------"
-grep -aq -E "WARN|ERR" $logFile
-if [ $? -eq 0 ]
+# It's ok to get a warning when an uninstall fails because it's not already installed
+cnt=`grep -a -E "WARN|ERR" $logFile | grep -v "Skipping" | wc -l`
+if [ $cnt -ne 0 ]
 then
   echo
   echo "ERROR: Checking process has a problem. Review $logFile for details."

tools/checkBaseLevel.sh

@@ -19,7 +19,7 @@ do
 
   cd $curdir
   . $venv/bin/activate
-  pip uninstall -y ibmmq
+  pip uninstall -y ibmmq >/dev/null 2>&1
   cd ..
 
   # Do an install of the local tree to check it builds

tools/copyDefs

@@ -8,7 +8,6 @@
 # Files are renamed as they are copied, and the primary
 # CMQC.py uses the correct platform-specific variant.
 
-
 # Copyright (c) 2025 IBM Corporation. All Rights Reserved.
 
 function printSyntax {
@@ -19,9 +18,9 @@ Options:
       1 or USER   : release-stream-USER-level_P
       2 or STREAM : release-stream-level_P
       3 or RELEASE: release-level_P
-      4 or FREE   : the full level as entered (no added _P)
-      5 or GOLD   : gold/level_P
-    -l level   (no default)
+      4 or FREE   : the full level as entered (no automatically added _P)
+      5 or GOLD   : gold/release-level_P
+    -l level   (no default, example "L251003.10")
     -m major number in output tree (default: $defaultMajor)
     -r release (default: $defaultRelease)
     -s stream  (default: $defaultStream)
@@ -67,7 +66,7 @@ curdir=`pwd`
 
 # Default values
 defaultMajor=p940
-defaultRelease=p943
+defaultRelease=p944
 defaultStream=dfct
 defaultFormat=USER
 defaultLevel="" # No default
@@ -144,7 +143,7 @@ case $FORMAT in
   ;;
 5|GOLD)
   gold=true
-  BUILD="gold/$LEVEL"
+  BUILD="gold/$RELEASE-$LEVEL"
   ;;
 *)
   printSyntax

tools/linter

@@ -21,7 +21,7 @@ fi
 
 if false
 then
-pip uninstall -y ibmmq
+pip uninstall -y ibmmq >/dev/null 2>&1
 cd $root
 pip install -e .
 fi

tools/pyInst.sh

@@ -18,7 +18,7 @@ then
   exit 1
 fi
 
-pip uninstall -y  $pkg
+pip uninstall -y  $pkg >/dev/null 2>&1
 echo "Waiting ..."
 for i in 1 # 2 3 4 5 6 7 8 9 10 11 12
 do
@@ -42,4 +42,4 @@ fi
 python -i << EOF
 import $pkg
 print("MQRC_NOT_AUTHORIZED = ",$pkg.CMQC.MQRC_NOT_AUTHORIZED)
-EOF
+EOF

tools/runApp

@@ -25,7 +25,7 @@ trap cleanup EXIT
 
 if [ -z "$NOREBUILD" ]
 then
-pip uninstall -y ibmmq
+pip uninstall -y ibmmq >/dev/null 2>&1
 
 # verbose="-v"
 

tools/testInstClient.sh

@@ -31,7 +31,7 @@ fi
 
 cd $venv
 
-pip uninstall -y $pkg
+pip uninstall -y $pkg >/dev/null 2>&1
 # List available versions including pre-release
 echo
 pip index --index http://localhost:8080 --pre versions $pkg