Merge branch 'master' of github.com:KLayout/klayout

azure-pipelines.yml

@@ -35,6 +35,9 @@ jobs:
       cp312-cp312-win_amd64.whl:
         python.version: '3.12'
         python.architecture: 'x64'
+      cp313-cp313-win_amd64.whl:
+        python.version: '3.13'
+        python.architecture: 'x64'
       cp36-cp36m-win32.whl:
         python.version: '3.6'
         python.architecture: 'x86'
@@ -56,6 +59,9 @@ jobs:
       cp312-cp312-win32.whl:
         python.version: '3.12'
         python.architecture: 'x86'
+      cp313-cp313-win32.whl:
+        python.version: '3.13'
+        python.architecture: 'x86'
     maxParallel: 6
 
   steps:

macbuild/build4mac_util.py

@@ -499,7 +499,7 @@ def GetKLayoutVersionFrom( verfile='version.h' ):
     except Exception as e:
         return version
 
-    verReg = re.compile( u'(KLAYOUT_VERSION=\")([0-9A-Z_a-z\.]+)(\")' )
+    verReg = re.compile( r'(KLAYOUT_VERSION=\")([0-9A-Z_a-z\.]+)(\")' )
     for line in contents:
         m = verReg.match(line)
         if m:

macbuild/makeDMG4mac.py

@@ -279,7 +279,7 @@ def CheckPkgDirectory():
     #     * LW-qt6MP.pkg.macos-Sonoma-release-Rmp33Pmp312
     #-----------------------------------------------------------------------------------------------
     #                  0      1      2                      3                  4                    5         6        7
-    patQRP = u'(ST|LW|HW|EX)([-])([qt5|qt6][0-9A-Za-z]+)([.]pkg[.])([A-Za-z]+[-][A-Za-z]+[-])(release|debug)([-])([0-9A-Za-z]+)'
+    patQRP = r'(ST|LW|HW|EX)([-])([qt5|qt6][0-9A-Za-z]+)([.]pkg[.])([A-Za-z]+[-][A-Za-z]+[-])(release|debug)([-])([0-9A-Za-z]+)'
     regQRP = re.compile(patQRP)
     if not regQRP.match(PkgDir):
         print( "! Cannot identify (Qt, Ruby, Python) from the package directory name" )
@@ -721,7 +721,9 @@ def MakeTargetDMGFile(msg=""):
     #      The folder will open on mount.
     #--------------------------------------------------------
     print( ">>> (10) Setting volume bootability and startup disk options..." )
-    command = "bless --folder %s --openfolder %s" % (MountDir, MountDir)
+    #command = "bless --folder %s --openfolder %s" % (MountDir, MountDir)
+    #bless: The 'openfolder' option is deprecated
+    command = "bless --folder %s" % MountDir
     os.system(command)
     sleep(2)
 

pyproject.toml

@@ -9,7 +9,7 @@ test-command = [
   "TESTSRC={package} python {package}/testdata/pymod/pya_tests.py"
 ]
 # Disable building PyPy wheels on all platforms
-skip = "pp*"
+skip = "pp* cp36-* cp37-*"
 
 [tool.cibuildwheel.linux]
 # beware: the before-all script does not persist environment variables!