2023.1 patch 1 release code drop

Author: hjain-perforce

LICENSE.txt

@@ -514,6 +514,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
 OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
 THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+
 optional-lite and any-lite
 Martin Moene
 -----------------------
@@ -543,3 +544,28 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
 
+TinyXML-2
+-----------------------
+
+Copyright (c) 2019-present, Lee Thomason and contributors.
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+
+

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#108 $
+    $Id: //depot/main/p4-python/P4.py#109 $
     
     #*******************************************************************************
     # Copyright (c) 2007-2010, Perforce Software, Inc.  All rights reserved.
@@ -355,7 +355,7 @@ def processFilelog(h):
             r.change = int( h[ "change" ][ n ] )
             r.action = h[ "action" ][ n ]
             r.type = h[ "type" ][ n ]
-            r.time = datetime.datetime.utcfromtimestamp( int( h[ "time" ][ n ]) )
+            r.time = datetime.datetime.fromtimestamp( int( h[ "time" ][ n ]), tz=None )
             r.user = h[ "user" ][ n ]
             r.client = h[ "client" ][ n ]
             r.desc = h[ "desc" ][ n ]
@@ -774,7 +774,7 @@ def run_tickets(self, *args):
         fname = self.ticket_file
         with open(fname) as f:
             tickets_raw = f.readlines()
-        pattern = re.compile('([^=]*)=(.*):([^:]*)\n')
+        pattern = re.compile(r'([^=]*)=(.*):([^:]*)\n')
         tickets = [ pattern.match(x).groups() for x in tickets_raw ]
         keys = [ "Host", "User", "Ticket" ]
         result = [ dict(zip(keys, x)) for x in tickets ]
@@ -1082,7 +1082,7 @@ def __check_version(pathToFile):
         output = output.decode('UTF-8')
     chunks = output.split(os.linesep)
 
-    pattern = re.compile("Rev. (?P<Program>.+)/(?P<Platform>.+)/(?P<Release>.+)/(?P<Patch>\d+) \((\d+/\d+/\d+)\).")
+    pattern = re.compile(r"Rev. (?P<Program>.+)/(?P<Platform>.+)/(?P<Release>.+)/(?P<Patch>\d+) \((\d+/\d+/\d+)\).")
 
     for c in chunks:
         match = pattern.match(c)

RELNOTES.txt

@@ -47,8 +47,8 @@ Installation
 
       python3 -m pip install --upgrade p4python
 
-    P4Python is distributed as a binary wheels for Python 3.7, 3.8, 3.9, 3.10 
-    and 3.11. In order for the binary wheel to be used, the ABI tag needs to 
+    P4Python is distributed as a binary wheels for Python 3.7, 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
     match.This often requires updated pip, to do so issue:
       python3 -m pip install --upgrade pip
 
@@ -120,7 +120,7 @@ Compatibility Statements
   Python Compatibility
 
     This release of P4Python is supported building from source with 
-    Python 3.7, 3.8, 3.9, 3.10 and 3.11.
+    Python 3.7, 3.8, 3.9, 3.10, 3.11 and 3.12.
 
     For detailed compatibility, please check the following table:
 
@@ -131,6 +131,7 @@ Compatibility Statements
     3.9            | 2021.1 or later
     3.10           | 2022.1 or later
     3.11           | 2022.2 or later
+    3.12           | 2023.1 or later
 
   OpenSSL Compatibility
 
@@ -294,6 +295,13 @@ Key to symbols used in change notes below.
 
 --------------------------------------------------------------------------
 
+New functionality in 2023.1 Patch 2 (2023.1/2509188) (2023/10/25)
+
+    #2503929 (Job #117105)
+        Added wheels & build support for Python 3.12
+        
+--------------------------------------------------------------------------
+
 New functionality in 2023.1 Patch 1 (2023.1/2477632) (2023/08/21)
 
     #2475832, #2471641, #2468946 (Job #114714)

linux_build/build-wheels.sh

@@ -5,7 +5,7 @@ export PATH=$PATH:/work/p4-bin/bin.linux26x86_64/
 
 # Extract the p4api and set the P4API path var
 mkdir -p /work/p4-api
-tar xvfz /work/p4-bin/bin.linux26x86_64/p4api-glibc2.3-openssl1.1.1.tgz -C /work/p4-api
+tar xvfz /work/p4-bin/bin.linux26x86_64/p4api-glibc2.3-openssl3.tgz -C /work/p4-api
 P4API=`echo /work/p4-api/p4api-20*`
 
 cd /work/p4-python
@@ -31,14 +31,23 @@ for VERSION in $1; do
  	## Upgrade pip
 	"${PYBIN}/python" -m pip install --upgrade pip
 
+	#Install wheel module
+	"${PYBIN}/python" -m pip install wheel
+
 	# Install the wheel
 	"${PYBIN}/python" -m pip install /work/p4-python/dist/$(ls /work/p4-python/dist/ | grep $VERSION | grep \.whl)
 
 	## Test the build
 	"${PYBIN}/python" p4test.py
 
-	## Repair wheel with new ABI tag manylinux2010_x86_64
-	auditwheel repair dist/p4python-*-linux_x86_64.whl --plat manylinux_2_24_x86_64 -w repair
+	## 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
+
+	#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
+
+  #Move wheel to repair directory
+	mv dist/p4python-*-manylinux_2_28_x86_64.whl repair
 
 	rm -rf build p4python.egg-info dist
 done

p4test.py

@@ -68,14 +68,17 @@ def setDirectories(self):
     def cleanupTestTree(self):
         os.chdir(self.startdir)
         if os.path.isdir(self.server_root):
-            shutil.rmtree(self.server_root, False, onRmTreeError)
+            if sys.version_info.minor < 12:
+                shutil.rmtree(self.server_root, False, onRmTreeError)
+            else:
+                shutil.rmtree(self.server_root, False, onexc=onRmTreeError)
 
     def ensureDirectory(self, directory):
         if not os.path.isdir(directory):
             os.mkdir(directory)
 
     def getServerPatchLevel(self, info):
-        c = re.compile("[^/]*/[^/]*/[^/]*/([^/]*)\s\(\d+/\d+/\d+\)")
+        c = re.compile(r"[^/]*/[^/]*/[^/]*/([^/]*)\s\(\d+/\d+/\d+\)")
 
         serverVersion = info[0]["serverVersion"]
         m = c.match(serverVersion)
@@ -552,7 +555,7 @@ def testMap(self):
         map = P4.Map(a)
         self.assertEqual(map.count(), 3, "Map does not contain 3 elements")
 
-        map2 = P4.Map("//ws/...", "C:\Work\...")
+        map2 = P4.Map("//ws/...", r"C:\Work\...")
         self.assertEqual(map2.count(), 1, "Map2 does not contain any elements")
 
         map3 = P4.Map.join(map, map2)
@@ -997,7 +1000,7 @@ def testEncoding( self ):
             # create a file with windows encoding for its filename
             uname = platform.uname()
             if uname.system == 'Darwin':
-                comp = re.compile('(\d+)\.(\d+)\.(\d+)')
+                comp = re.compile(r'(\d+)\.(\d+)\.(\d+)')
                 match = comp.match(uname.release)
                 major = int(match.group(1))
                 if major >= 16: # macos Sierra or higher

tools/P4APIFtp.py

@@ -88,7 +88,7 @@ def findPlatform(self):
         return platform_str
 
     def get_glib_ver(self):
-        pattern = re.compile("ldd\s+\(.*\)\s+(\d+)\.(\d+)")
+        pattern = re.compile(r"ldd\s+\(.*\)\s+(\d+)\.(\d+)")
         gentry = subprocess.check_output("ldd --version | grep ldd", executable="/bin/bash", shell="True")
         if type(gentry) == bytes:
             gentry = gentry.decode()
@@ -100,7 +100,7 @@ def get_glib_ver(self):
 
 
     def get_ssl_ver(self, ssl_ver_string):
-        pattern = re.compile("(\d+)\.(\d+).(\d+).*")
+        pattern = re.compile(r"(\d+)\.(\d+).(\d+).*")
         match = pattern.match(str(ssl_ver_string))
         if match:
             return match.group(1), match.group(2), match.group(3)

tools/P4APIHttps.py

@@ -10,7 +10,7 @@
 class P4APIHttps:
 
     def get_ssl_ver(self, ssl_ver_string):
-        pattern = re.compile("(\d+)\.(\d+).(\d+).*")
+        pattern = re.compile(r"(\d+)\.(\d+).(\d+).*")
         match = pattern.match(str(ssl_ver_string))
         if match:
             return match.group(1), match.group(2), match.group(3)

tools/PlatformInfo.py

@@ -127,7 +127,7 @@ def __init__(self, api_version, release_version, ssl, ssl_ver):
 
             elif unameOut[0] == "SunOS":
                 unix = "SOLARIS"
-                release = re.match("5.(\d+)", unameOut[2]).group(1)
+                release = re.match(r"5.(\d+)", unameOut[2]).group(1)
                 arch = self.architecture(unameOut[4])
             elif unameOut[0] == 'FreeBSD':
                 unix = "FREEBSD"
@@ -184,7 +184,7 @@ def architecture(self, str):
             return "ARM"
 
     def get_ssl_ver(self, ssl_ver_string):
-        pattern = re.compile("(\d+)\.(\d+).(\d+).*")
+        pattern = re.compile(r"(\d+)\.(\d+).(\d+).*")
         match = pattern.match(ssl_ver_string)
         if match:
             return match.group(1), match.group(2), match.group(3)

tools/Version.py

@@ -8,7 +8,7 @@ def __init__(self, version_string):
         self.process(version_string)
 
     def process(self, version_string):
-        r = re.compile("r(\d+).(\d+)")
+        r = re.compile(r"r(\d+).(\d+)")
         m = r.match(version_string)
         if m:
             self.year = m.group(1)

tools/VersionInfo.py

@@ -14,9 +14,9 @@ def __init__(self, p4api_dir):
     self.suppdate_month = None
     self.suppdate_day = None
 
-    releasePattern = re.compile("RELEASE\s+=\s+(?P<year>\d+)\s+(?P<version>\d+)\s*(?P<special>.*?)\s*;")
-    patchlevelPattern = re.compile("PATCHLEVEL\s+=\s+(?P<level>\d+)")
-    suppdatePattern = re.compile("SUPPDATE\s+=\s+(?P<year>\d+)\s+(?P<month>\d+)\s+(?P<day>\d+)")
+    releasePattern = re.compile(r"RELEASE\s+=\s+(?P<year>\d+)\s+(?P<version>\d+)\s*(?P<special>.*?)\s*;")
+    patchlevelPattern = re.compile(r"PATCHLEVEL\s+=\s+(?P<level>\d+)")
+    suppdatePattern = re.compile(r"SUPPDATE\s+=\s+(?P<year>\d+)\s+(?P<month>\d+)\s+(?P<day>\d+)")
 
     self.patterns=[]
     self.patterns.append((releasePattern, self.handleRelease))
@@ -37,7 +37,7 @@ def __init__(self, p4api_dir):
   def handleRelease(self, year=0, version=0, special=''):
     self.release_year = year
     self.release_version = version
-    self.release_special = re.sub("\s+", ".", special)
+    self.release_special = re.sub(r"\s+", ".", special)
 
   def handlePatchlevel(self, level=0):
     self.patchlevel = level