Merge branch 'master' of https://github.com/z3prover/z3 into polysat

scripts/mk_nuget_release.py

@@ -48,7 +48,7 @@ os_info = {"z64-ubuntu-14" : ('so', 'ubuntu.14.04-x64'),
            'x64-win' : ('dll', 'win-x64'),
 # Skip x86 as I can't get dotnet build to produce AnyCPU TargetPlatform           
 #          'x86-win' : ('dll', 'win-x86'),
-           'osx' : ('dylib', 'macos'),
+           'osx' : ('dylib', 'osx-x64'),
            'debian' : ('so', 'debian.8-x64') }
 
 def classify_package(f):
@@ -69,7 +69,7 @@ def unpack():
     #    +- ubuntu.16.04-x64
     #    +- ubuntu.14.04-x64
     #    +- debian.8-x64
-    #    +- macos
+    #    +- osx-x64
     # +
     for f in os.listdir("packages"):
         print(f)

scripts/mk_nuget_task.py

@@ -28,7 +28,7 @@ os_info = {"z64-ubuntu-14" : ('so', 'ubuntu.14.04-x64'),
            'glibc-2.31' : ('so', 'glibc-x64'),
            'x64-win' : ('dll', 'win-x64'),
            'x86-win' : ('dll', 'win-x86'),
-           'osx' : ('dylib', 'macos'),
+           'osx' : ('dylib', 'osx-x64'),
            'debian' : ('so', 'debian.8-x64') }
 
 def classify_package(f):
@@ -52,7 +52,7 @@ def unpack(packages, symbols):
     #    +- win-x64
     #    +- win-x86
     #    +- ubuntu-x64
-    #    +- macos
+    #    +- osx-x64
     # +
     tmp = "tmp" if not symbols else "tmpsym"
     for f in os.listdir(packages):

scripts/nightly.yaml

@@ -74,7 +74,7 @@ stages:
       vmImage: "Ubuntu-18.04"
     container: "quay.io/pypa/manylinux2010_x86_64:latest"
     variables:
-      python: "/opt/python/cp35-cp35m/bin/python"
+      python: "/opt/python/cp37-cp37m/bin/python"
     steps:
     - script: $(python) scripts/mk_unix_dist.py --nodotnet --nojava
     - script: git clone https://github.com/z3prover/z3test z3test