2024.2 release code drop

2024.2 release code drop

Author: hjain-perforce

P4.py

@@ -7,7 +7,7 @@
     This uses the Python type P4API.P4Adapter, which is a wrapper for the
     Perforce ClientApi object.
     
-    $Id: //depot/main/p4-python/P4.py#112 $
+    $Id: //depot/main/p4-python/P4.py#114 $
     
     #*******************************************************************************
     # Copyright (c) 2007-2010, Perforce Software, Inc.  All rights reserved.
@@ -59,24 +59,34 @@ class P4Exception(Exception):
     def __init__(self, value):
         super().__init__(value)
         if isinstance(value, (list, tuple)) and len(value) > 2:
+            self.value = value[0]
+            self.warnings = value[2]
             if len(value[1]) > 0 or len(value[2]) > 0:
-                self.value = value[0]
                 self.errors = value[1]
-                self.warnings = value[2]
             else:
-                self.value = value[0]
                 self.errors = [re.sub(r'\[.*?\] ', '', str(self.value).split("\n")[0])]
-                self.warnings = value[2]
         else:
             self.value = value
+            self.errors =self.warnings = None
 
     def __str__(self):
         if self.errors:
-            return str(self.errors[0])
+            if isinstance(self.errors, (list, tuple)):
+                return str(self.errors[0])
+            else:
+                return str(self.errors)
         elif self.warnings:
-            return str(self.warnings[0])
+            if isinstance(self.warnings, (list, tuple)):
+                return str(self.warnings[0])
+            else:
+                return str(self.warnings)
+        elif self.errors is None and self.warnings is None:
+            return str(self.value)
         else:
-            return re.sub(r'\[.*?\] ', '', str(self.value).split("\n")[0])
+            if isinstance(self.value, (list, tuple)):
+                return re.sub(r'\[.*?\] ', '', str(self.value).split("\n")[0])
+            else:
+                return str(self.value)
 
     def __repr__(self):
         return f"{self.__class__.__name__}({str(self)!r})"
@@ -615,7 +625,7 @@ def run(self, *args, **kargs):
         flatArgs = self.__flatten(args)
 
         if self.logger:
-            self.logger.info("p4 " + " ".join(flatArgs))
+            self.logger.info("p4 " + " ".join(str(x) for x in flatArgs))
 
         # if encoding is set, translate to Bytes
         if hasattr(self,"encoding") and self.encoding and not self.encoding == 'raw':

PythonClientAPI.cpp

@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-$Id: //depot/main/p4-python/PythonClientAPI.cpp#79 $
+$Id: //depot/main/p4-python/PythonClientAPI.cpp#80 $
 *******************************************************************************/
 
 #include <Python.h>
@@ -75,6 +75,8 @@ PythonClientAPI::PythonClientAPI()
     maxResults = 0;
     maxScanRows = 0;
     maxLockTime = 0;
+    maxOpenFiles = 0;
+    maxMemory = 0;
     prog = "unnamed p4-python script";
     apiLevel = atoi( P4Tag::l_client );
     enviro = new Enviro;
@@ -157,6 +159,8 @@ PythonClientAPI::intattribute_t PythonClientAPI::intattributes[] = {
 	{ "maxresults",		&PythonClientAPI::SetMaxResults,	&PythonClientAPI::GetMaxResults },
 	{ "maxscanrows",	&PythonClientAPI::SetMaxScanRows,	&PythonClientAPI::GetMaxScanRows },
 	{ "maxlocktime",	&PythonClientAPI::SetMaxLockTime,	&PythonClientAPI::GetMaxLockTime },
+	{ "maxopenfiles",	&PythonClientAPI::SetMaxOpenFiles,	&PythonClientAPI::GetMaxOpenFiles },
+	{ "maxmemory",	&PythonClientAPI::SetMaxMemory,	&PythonClientAPI::GetMaxMemory },
 	{ "exception_level",	&PythonClientAPI::SetExceptionLevel,	&PythonClientAPI::GetExceptionLevel },
 	{ "debug",		&PythonClientAPI::SetDebug,		&PythonClientAPI::GetDebug },
 	{ "track",		&PythonClientAPI::SetTrack,		&PythonClientAPI::GetTrack },
@@ -1234,6 +1238,8 @@ void PythonClientAPI::RunCmd(const char *cmd, ClientUser *ui, int argc, char * c
     if( maxResults  )	client.SetVar( "maxResults",  maxResults  );
     if( maxScanRows )	client.SetVar( "maxScanRows", maxScanRows );
     if( maxLockTime )	client.SetVar( "maxLockTime", maxLockTime );
+    if( maxOpenFiles )	client.SetVar( "maxOpenFiles", maxOpenFiles );
+    if( maxMemory)	client.SetVar( "maxMemory", maxMemory );
 
     // if progress is set, set the progress var
     if( ((PythonClientUser*)ui)->GetProgress() != Py_None )

PythonClientAPI.h

@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: //depot/main/p4-python/PythonClientAPI.h#44 $
+ * $Id: //depot/main/p4-python/PythonClientAPI.h#45 $
  *
  * Build instructions:
  *  Use Distutils - see accompanying setup.py
@@ -103,6 +103,8 @@ class PythonClientAPI
     int SetMaxResults( int v )		{ maxResults = v; return 0; }
     int SetMaxScanRows( int v )		{ maxScanRows = v; return 0; }
     int SetMaxLockTime( int v )		{ maxLockTime = v; return 0; }
+    int SetMaxOpenFiles( int v )	{ maxOpenFiles = v; return 0; }
+    int SetMaxMemory( int v )	    { maxMemory = v; return 0; }
 
     int SetCaseFolding( int v )		{ StrPtr::SetCaseFolding((StrPtr::CaseUse) v); return 0;}
 
@@ -154,6 +156,8 @@ class PythonClientAPI
     int GetMaxResults()			{ return maxResults; }
     int GetMaxScanRows()		{ return maxScanRows; }
     int GetMaxLockTime()		{ return maxLockTime; }
+    int GetMaxOpenFiles()		{ return maxOpenFiles; }
+    int GetMaxMemory()		{ return maxMemory; }
     int GetDebug()			{ return debug.getDebug(); }
     int GetApiLevel()			{ return apiLevel; }
     int GetCaseFolding()		{ return (int) StrPtr::CaseUsage(); }
@@ -329,6 +333,8 @@ class PythonClientAPI
     int			maxResults;
     int			maxScanRows;
     int			maxLockTime;
+    int			maxOpenFiles;
+    int			maxMemory;
 };
 
 #endif

RELNOTES.txt

@@ -1,7 +1,7 @@
                             Release Notes for
                P4Python, Helix Core API for Python
 
-                             Version 2024.1
+                             Version 2024.2
 
 Introduction
 
@@ -23,6 +23,14 @@ Introduction
 
 --------------------------------------------------------------------------
 
+Important End-of-Life Notice
+
+    This major release of P4Python would be the last to provide wheels for and
+    test against Python 3.8. This is part of our commitment to focus on 
+    supported technology platforms
+
+--------------------------------------------------------------------------
+
 Installation
 
   Installation via pip
@@ -40,7 +48,7 @@ Installation
       python3 -m pip install --upgrade p4python
 
     P4Python is distributed as a binary wheels for Python 3.8, 3.9, 3.10,
-    3.11 and 3.12. In order for the binary wheel to be used, the ABI tag needs to
+    3.11, 3.12 and 3.13. In order for the binary wheel to be used, the ABI tag needs to
     match.This often requires updated pip, to do so issue:
       python3 -m pip install --upgrade pip
 
@@ -64,6 +72,9 @@ Installation
 
     Ubuntu 22.04      
         perforce-p4python3-python3.10
+    
+    Ubuntu 24.04      
+        perforce-p4python3-python3.12
 
   Installing P4Python for Maya.
 
@@ -106,13 +117,13 @@ Compatibility Statements
 
   API Compatibility
 
-    This release of P4Python requires at least 2024.1 Perforce API 
-    (2024.1/2596294). Older releases will not compile and are not supported.
+    This release of P4Python requires at least 2024.2 Perforce API 
+    (2024.2/2675662). Older releases will not compile and are not supported.
 
   Python Compatibility
 
     This release of P4Python is supported building from source with 
-    Python 3.8, 3.9, 3.10, 3.11 and 3.12.
+    Python 3.8, 3.9, 3.10, 3.11, 3.12 and 3.13.
 
     For detailed compatibility, please check the following table:
 
@@ -123,6 +134,7 @@ Compatibility Statements
     3.10           | 2022.1 or later
     3.11           | 2022.2 or later
     3.12           | 2023.1 or later
+    3.13           | 2024.2 or later
 
   OpenSSL Compatibility
 
@@ -138,15 +150,19 @@ Compatibility Statements
 
     This release is certified on the following platforms:
 
-    Windows (x86, x86_64)
-        Server 2016
+    Windows for Intel(x86, x86_64)
+        Server 2016, 2019, 2022
+        Windows 10, 11
     Mac OS
         11, 12 (x86_64)
         12, 13 (ARM64)
-    Linux (x86, x86_64)
-        Ubuntu 20.04, 22.04
+    Linux kernel 2.6+ for Intel(x86, x86_64)
+        Ubuntu 20.04, 22.04, 24.04
         CentOS 8
         Rocky Linux 9.1
+    Linux kernel 2.6+ for ARM(aarch64)
+        Ubuntu 20.04, 22.04, 24.04
+        Rocky Linux 9.4
 
     The above platforms are tested and subject to regression testing on a 
     frequent basis. Errors or bugs discovered in these platforms are prioritized
@@ -286,6 +302,42 @@ Key to symbols used in change notes below.
 
 --------------------------------------------------------------------------
 
+New functionalities in 2024.2 (2024.2/2682690) (2024/11/15)
+
+    #2677188 (Job #122598)
+        Built P4Python with P4API 2024.2 (2024.2/2675662)
+
+    #2670765 (Job #122603)
+        Added wheels & build support for Python 3.13
+
+    #2659612 (Job #122764)
+        Added Linux binary package for Ubuntu24
+        
+Bugs fixed in 2024.2 (2024.2/2682690) (2024/11/15)
+
+    #2669917 (Job #123092)
+        Fixed exception on joining non-string element in run args,
+        when logger is enabled.
+
+--------------------------------------------------------------------------
+
+New functionalities in 2024.1 Patch 1 (2024.1/2645203) (2024/08/27)
+
+    #2643104 (Job #119627)
+        Added wheels & build support for Linux ARM64/AARCH64 architecture.
+        
+Bugs fixed in 2024.1 Patch 1 (2024.1/2645203) (2024/08/27)
+
+    #2630486 (Job #121699)
+        Fixed error in P4.P4Exception class when creating object of class 
+        with single string parameter.
+        
+    #2630485 (Job #121721)
+        Implemented p4.maxopenfiles and p4.maxmemory group specs as P4 Class
+        instance attributes.
+
+--------------------------------------------------------------------------
+
 New functionalities in 2024.1 (2024.1/2625398) (2024/07/17)
 
     #2603816 (Job #120930)

SpecMgr.cpp

@@ -23,7 +23,7 @@
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- $Id: //depot/main/p4-python/SpecMgr.cpp#57 $
+ $Id: //depot/main/p4-python/SpecMgr.cpp#58 $
  *******************************************************************************/
 
 /*******************************************************************************
@@ -60,7 +60,7 @@ struct specdata {
     const char *type;
     const char *spec;
 } speclist[] = {
- 
+
     {
 	"branch",
 	"Branch;code:301;rq;ro;fmt:L;len:32;;"
@@ -149,6 +149,10 @@ struct specdata {
 	"Owners;code:408;type:wlist;len:32;opt:default;;"
 	"Users;code:405;type:wlist;len:32;opt:default;;"
     },
+    {
+	"hotfiles",
+	"HotFiles;code:1051;fmt:C;type:wlist;words:1;maxwords:3;len:64;opt:default;z;;"
+    },
     {
 	"job",
 	"Job;code:101;rq;len:32;;"

Version

@@ -11,7 +11,7 @@
 # SUPPDATE = 2010 06 17 ;
 #	Of the build.  The copyright date is derived from SUPPDATE.
 
-RELEASE = 2024 1;
-PATCHLEVEL = 2603570 ;
-SUPPDATE = 2024 05 29 ;
+RELEASE = 2024 2;
+PATCHLEVEL = 2676807 ;
+SUPPDATE = 2024 11 07 ;
 

linux_build/build-wheels.sh

@@ -1,11 +1,18 @@
 #!/bin/bash
 set -eEx
+ARCH=$(arch)
 
-export PATH=$PATH:/work/p4-bin/bin.linux26x86_64/
+export PATH=$PATH:/work/p4-bin/bin.linux26${ARCH}/
 
 # Extract the p4api and set the P4API path var
 mkdir -p /work/p4-api
-tar xvfz /work/p4-bin/bin.linux26x86_64/p4api-glibc2.12-openssl3.tgz -C /work/p4-api
+# Check the condition
+if [ "$ARCH" = x86_64 ]; then
+    tar xvfz /work/p4-bin/bin.linux26${ARCH}/p4api-glibc2.12-openssl3.tgz -C /work/p4-api
+else
+    tar xvfz /work/p4-bin/bin.linux26${ARCH}/p4api-openssl3.tgz -C /work/p4-api
+fi
+
 P4API=`echo /work/p4-api/p4api-20*`
 
 cd /work/p4-python
@@ -17,7 +24,7 @@ mkdir -p repair
 
 # Compile wheels
 for VERSION in $1; do
-	PYBIN="/opt/python/$(ls /opt/python/ | grep cp$VERSION | grep -v 27mu)/bin"
+	PYBIN="/opt/python/$(ls /opt/python/ | grep -E "cp$VERSION-cp$VERSION$")/bin"
 
 	## Set env path for apidir and ssl directories 
 	export apidir=$P4API
@@ -38,14 +45,14 @@ for VERSION in $1; do
 	## Test the build
 	"${PYBIN}/python" p4test.py
 
-	## Repair wheel with new ABI tag manylinux_2_28_x86_64
-	#auditwheel repair dist/p4python-*-linux_x86_64.whl --plat manylinux_2_28_x86_64 -w repair
+	## Repair wheel with new ABI tag manylinux_2_28_${ARCH}
+	#auditwheel repair dist/p4python-*-linux_${ARCH}.whl --plat manylinux_2_28_${ARCH} -w repair
 
-	#Changing wheel platform ABI tag to manylinux_2_28_x86_64
-	"${PYBIN}/python" -m wheel tags --platform-tag=manylinux_2_28_x86_64 dist/p4python-*-linux_x86_64.whl
+	#Changing wheel platform ABI tag to manylinux_2_28_${ARCH}
+	"${PYBIN}/python" -m wheel tags --platform-tag=manylinux_2_28_${ARCH} dist/p4python-*-linux_${ARCH}.whl
 
   #Move wheel to repair directory
-	mv dist/p4python-*-manylinux_2_28_x86_64.whl repair
+	mv dist/p4python-*-manylinux_2_28_${ARCH}.whl repair
 
 	rm -rf build p4python.egg-info dist
 done

p4test.py

@@ -112,6 +112,8 @@ def testEnvironment(self):
         self.p4.maxresults      = 100000
         self.p4.maxscanrows     = 1000000
         self.p4.maxlocktime     = 10000
+        self.p4.maxopenfiles    = 1000
+        self.p4.maxmemory       = 2000
         self.p4.password        = "mypassword"
         self.p4.port            = "myserver:1666"
         self.p4.prog            = "myprogram"
@@ -126,6 +128,8 @@ def testEnvironment(self):
         self.assertEqual( self.p4.maxresults, 100000, "maxresults" )
         self.assertEqual( self.p4.maxscanrows, 1000000, "maxscanrows" )
         self.assertEqual( self.p4.maxlocktime, 10000, "maxlocktime" )
+        self.assertEqual( self.p4.maxopenfiles, 1000, "maxopenfiles" )
+        self.assertEqual( self.p4.maxmemory, 2000, "maxmemory" )
         self.assertEqual( self.p4.password, "mypassword", "password" )
         self.assertEqual( self.p4.port, "myserver:1666", "port" )
         self.assertEqual( self.p4.tagged, 1, "tagged" )

tools/PlatformInfo.py

@@ -108,7 +108,7 @@ def __init__(self, api_version, release_version, ssl, ssl_ver):
                 if unameOut.machine == 'arm64':
                     os.environ["MACOSX_DEPLOYMENT_TARGET"] = "12.6"
                 else:
-                    os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.12"
+                    os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.15"
 
                 arch = self.architecture(unameOut[4])
 
@@ -180,6 +180,8 @@ def architecture(self, str):
             return 'X86_64'
         elif str == 'sparc':
             return 'SPARC'
+        elif str == 'aarch64':
+            return 'ARM'
         elif re.match('arm.*', str):
             return "ARM"