PySMT 0.9.6.dev65__tar.gz → 0.9.7.dev104__tar.gz

{PySMT-0.9.6.dev65/PySMT.egg-info → PySMT-0.9.7.dev104}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: PySMT
-Version: 0.9.6.dev65
+Version: 0.9.7.dev104
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team
@@ -30,7 +30,7 @@ Description: ============================================================
         
         * MathSAT (http://mathsat.fbk.eu/)
         * Z3 (https://github.com/Z3Prover/z3/)
-        * CVC4 (http://cvc4.cs.nyu.edu/web/)
+        * cvc5 (https://cvc5.github.io/)
         * Yices 2 (http://yices.csl.sri.com/)
         * CUDD (http://vlsi.colorado.edu/~fabio/CUDD/)
         * PicoSAT (http://fmv.jku.at/picosat/)

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104/PySMT.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: PySMT
-Version: 0.9.6.dev65
+Version: 0.9.7.dev104
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team
@@ -30,7 +30,7 @@ Description: ============================================================
         
         * MathSAT (http://mathsat.fbk.eu/)
         * Z3 (https://github.com/Z3Prover/z3/)
-        * CVC4 (http://cvc4.cs.nyu.edu/web/)
+        * cvc5 (https://cvc5.github.io/)
         * Yices 2 (http://yices.csl.sri.com/)
         * CUDD (http://vlsi.colorado.edu/~fabio/CUDD/)
         * PicoSAT (http://fmv.jku.at/picosat/)

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/PySMT.egg-info/SOURCES.txt

@@ -45,7 +45,8 @@ pysmt/cmd/installers/__init__.py
 pysmt/cmd/installers/base.py
 pysmt/cmd/installers/bdd.py
 pysmt/cmd/installers/btor.py
-pysmt/cmd/installers/cvc4.py
+pysmt/cmd/installers/cvcfive.py
+pysmt/cmd/installers/cvcfour.py
 pysmt/cmd/installers/msat.py
 pysmt/cmd/installers/pico.py
 pysmt/cmd/installers/yices.py
@@ -62,7 +63,8 @@ pysmt/smtlib/parser/parser.py
 pysmt/solvers/__init__.py
 pysmt/solvers/bdd.py
 pysmt/solvers/btor.py
-pysmt/solvers/cvc4.py
+pysmt/solvers/cvcfive.py
+pysmt/solvers/cvcfour.py
 pysmt/solvers/eager.py
 pysmt/solvers/interpolation.py
 pysmt/solvers/msat.py
@@ -84,7 +86,7 @@ pysmt/test/test_bv_simplification.py
 pysmt/test/test_cnf.py
 pysmt/test/test_configuration.py
 pysmt/test/test_constants.py
-pysmt/test/test_cvc4_quantifiers.py
+pysmt/test/test_cvc_quantifiers.py
 pysmt/test/test_dwf.py
 pysmt/test/test_eager_model.py
 pysmt/test/test_env.py

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/README.rst

@@ -105,7 +105,7 @@ solving using multiple solvers and multiple solver configurations.
    x, y = Symbol("x"), Symbol("y")
    f = x.Implies(y)
 
-   with Portfolio(["cvc4",
+   with Portfolio(["cvc5",
                    "yices",
                    ("msat", {"random_seed": 1}),
                    ("msat", {"random_seed": 17}),
@@ -167,7 +167,7 @@ combinations. The following solvers are supported through native APIs:
 
 * MathSAT (http://mathsat.fbk.eu/)
 * Z3 (https://github.com/Z3Prover/z3/)
-* CVC4 (http://cvc4.cs.nyu.edu/web/)
+* cvc5 (https://cvc5.github.io/)
 * Yices 2 (http://yices.csl.sri.com/)
 * CUDD (http://vlsi.colorado.edu/~fabio/CUDD/)
 * PicoSAT (http://fmv.jku.at/picosat/)
@@ -239,7 +239,7 @@ each of the available solvers.
  +------------------+-----------+--------------------------------+-------------+------------------------+------------+--------------+
  | Z3               |  z3       | UF, LIA, LRA, BV, AX, NRA, NIA |  Yes        | z3                     | Yes        | No           |
  +------------------+-----------+--------------------------------+-------------+------------------------+------------+--------------+
- | CVC4             |  cvc4     | UF, LIA, LRA, BV, AX, S        |  Yes        | No                     | No         | No           |
+ | cvc5             |  cvc5     | UF, LIA, LRA, BV, AX, S        |  Yes        | No                     | No         | No           |
  +------------------+-----------+--------------------------------+-------------+------------------------+------------+--------------+
  | Yices            |  yices    | UF, LIA, LRA, BV               |  No         | No                     | No         | No           |
  +------------------+-----------+--------------------------------+-------------+------------------------+------------+--------------+

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/docs/CHANGES.rst

@@ -1,6 +1,43 @@
 Change Log
 ==========
 
+0.9.6: 2022-06-24 -- CVC5 and upgraded solvers
+----------------------------------------------
+
+**What's Changed**:
+
+* Fixed issue #613 by @mikand in https://github.com/pysmt/pysmt/pull/710 - Thanks @ekiwi for reporting
+* Fix missing file in Manifest by @marcogario in https://github.com/pysmt/pysmt/pull/718
+* Upgrade MathSAT to 5.6.6 by @marcogario in https://github.com/pysmt/pysmt/pull/720
+* CI: Avoid running on PR branch push by @marcogario in https://github.com/pysmt/pysmt/pull/721
+* Upgrade MathSAT to 5.6.7 by @marcogario in https://github.com/pysmt/pysmt/pull/719
+* Fix misspellings by @jayvdb in https://github.com/pysmt/pysmt/pull/724
+* Upgrade Z3 to 4.8.17 by @marcogario in https://github.com/pysmt/pysmt/pull/723
+* make FormulaContextualizer singleton in FormulaManager. by @enmag in https://github.com/pysmt/pysmt/pull/698
+* README: Remove interpolants from Z3 by @marcogario in https://github.com/pysmt/pysmt/pull/727
+* Parse logic str in Portfolio by @marcogario in https://github.com/pysmt/pysmt/pull/726
+* Make sudoku.py Python3 compatible by @akumm2k in https://github.com/pysmt/pysmt/pull/734
+* Fix the definition of BVXnor by @YikeZhou in https://github.com/pysmt/pysmt/pull/748
+* Deterministic get_closer_logic by @marcogario in https://github.com/pysmt/pysmt/pull/733
+* Grammar correction by @quantik-git in https://github.com/pysmt/pysmt/pull/750
+* example/parallel.py: typo fix by @tias in https://github.com/pysmt/pysmt/pull/755
+* Fix for pyximport by @marcogario in https://github.com/pysmt/pysmt/pull/766
+* Remove deprecated distutils by @marcogario in https://github.com/pysmt/pysmt/pull/765
+* Fixed removed imp module in Python 3.12 by @cybaol in https://github.com/pysmt/pysmt/pull/770
+* [Boolector] Add support for const arrays and boolean indices/elements by @nbailluet in https://github.com/pysmt/pysmt/pull/771
+* Update of all solvers  by @mikand in https://github.com/pysmt/pysmt/pull/761
+
+## New Contributors
+* @jayvdb made their first contribution in https://github.com/pysmt/pysmt/pull/724
+* @akumm2k made their first contribution in https://github.com/pysmt/pysmt/pull/734
+* @YikeZhou made their first contribution in https://github.com/pysmt/pysmt/pull/748
+* @quantik-git made their first contribution in https://github.com/pysmt/pysmt/pull/750
+* @tias made their first contribution in https://github.com/pysmt/pysmt/pull/755
+* @cybaol made their first contribution in https://github.com/pysmt/pysmt/pull/770
+* @nbailluet made their first contribution in https://github.com/pysmt/pysmt/pull/771
+
+**Full Changelog**: https://github.com/pysmt/pysmt/compare/v0.9.5...v0.9.6
+
 0.9.5: 2022-05-28 -- 2 years of bugfixes
 ----------------------------------------
 
@@ -8,7 +45,7 @@ Intermediate release that collects 2 years of bugfixes and improvements.
 
 Python 2 was deprecated in version 0.9.0, and this version removes the use of compatible code for that version.
 
-## What's Changed
+**What's Changed**:
 
 * Add support for boolean-typed array in the AtomsOracle by @mikand in https://github.com/pysmt/pysmt/pull/644
 * Switched from nosetests to pytest by @mikand in https://github.com/pysmt/pysmt/pull/662

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/docs/getting_started.rst

@@ -18,7 +18,7 @@ solver. Moreover, pySMT can leverage the API of the following solvers:
 
 * MathSAT (http://mathsat.fbk.eu/)
 * Z3 (https://github.com/Z3Prover/z3/)
-* CVC4 (http://cvc4.cs.nyu.edu/web/)
+* cvc5 (https://cvc5.github.io/)
 * Yices 2 (http://yices.csl.sri.com/)
 * CUDD (http://vlsi.colorado.edu/~fabio/CUDD/)
 * PicoSAT (http://fmv.jku.at/picosat/)
@@ -204,7 +204,7 @@ Solver      pySMT name
 =========   ==========
 MathSAT     msat
 Z3          z3
-CVC4        cvc4
+cvc5        cvc5
 Yices       yices
 Boolector   btor
 Picosat     picosat

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/pysmt/__init__.py

@@ -16,7 +16,7 @@
 #   limitations under the License.
 #
 
-VERSION = (0, 9, 6, "dev", 65)
+VERSION = (0, 9, 7, "dev", 104)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/pysmt/cmd/check_version.py

@@ -41,6 +41,11 @@ def check_version(module):
             import pyboolector
             version = "OK" # Just checking if import succeeds
 
+        elif module == "cvc5":
+            import cvc5
+            solver = cvc5.Solver()
+            version = solver.getVersion().decode('ascii')
+
         elif module == "cvc4":
             import CVC4
             version = CVC4.Configuration_getVersionString()
@@ -50,11 +55,8 @@ def check_version(module):
             version = picosat.picosat_version()
 
         elif module == "yices":
-            import yicespy
-            v = yicespy.__dict__['__YICES_VERSION']
-            m = yicespy.__dict__['__YICES_VERSION_MAJOR']
-            p = yicespy.__dict__['__YICES_VERSION_PATCHLEVEL']
-            version = "%d.%d.%d" % (v, m, p)
+            import yices_api
+            version = yices_api.yices_python_version
         else:
             print("Invalid argument '%s'"  % module)
             exit(-2)

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/pysmt/cmd/install.py

@@ -20,8 +20,8 @@ import platform
 from collections import namedtuple
 
 from pysmt.cmd.installers import MSatInstaller, Z3Installer, PicoSATInstaller
-from pysmt.cmd.installers import CVC4Installer, YicesInstaller, BtorInstaller
-from pysmt.cmd.installers import CuddInstaller
+from pysmt.cmd.installers import CVC5Installer, YicesInstaller, BtorInstaller
+from pysmt.cmd.installers import CuddInstaller, CVC4Installer
 from pysmt.cmd.installers.base import solver_install_site
 
 from pysmt.environment import get_env
@@ -32,13 +32,13 @@ from pysmt import __version__ as pysmt_version
 Installer = namedtuple("Installer",
                        ["InstallerClass", "version", "extra_params"])
 INSTALLERS = [
-    Installer(MSatInstaller,    "5.6.7", {}),
+    Installer(MSatInstaller,    "5.6.10", {}),
+    Installer(CVC5Installer,    "1.1.2", {}),
     Installer(CVC4Installer,    "1.7-prerelease",
               {"git_version" : "391ab9df6c3fd9a3771864900c1718534c1e4666"}),
-    Installer(Z3Installer,      "4.8.17", {"osx": "10.16"}),
-    Installer(YicesInstaller,   "2.6.2",
-              {"yicespy_version": "f0768ffeec15ea310f830d10878971c9998454ac"}),
-    Installer(BtorInstaller,    "3.2.1", {}),
+    Installer(Z3Installer,      "4.13.0", {}),
+    Installer(YicesInstaller,   "2.6.4", {"yices_api_version": "1.1.5"}),
+    Installer(BtorInstaller,    "3.2.3", {}),
     Installer(PicoSATInstaller, "965",
               {"pypicosat_minor_version" : "1708010052"}),
     Installer(CuddInstaller,    "2.0.3",
@@ -56,7 +56,7 @@ def get_requested_solvers():
         keys = requested_solvers_str.split(",")
         requested_solvers = [x.lower().strip() for x in keys]
         if "all" in requested_solvers:
-            requested_solvers = [x.InstallerClass.SOLVER for x in INSTALLERS]
+            requested_solvers = [x.InstallerClass.SOLVER for x in INSTALLERS if x != "cvc4"]
     return requested_solvers
 
 
@@ -206,7 +206,7 @@ def main():
     all_solvers = options.all_solvers
     for i in INSTALLERS:
         name = i.InstallerClass.SOLVER
-        if all_solvers or getattr(options, name):
+        if (all_solvers and name != "cvc4") or getattr(options, name):
             solvers_to_install.append(i)
 
     # Env variable controlling the solvers to be installed or checked

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/pysmt/cmd/installers/__init__.py

@@ -14,11 +14,12 @@
 
 from pysmt.cmd.installers.msat import MSatInstaller
 from pysmt.cmd.installers.z3 import Z3Installer
-from pysmt.cmd.installers.cvc4 import CVC4Installer
+from pysmt.cmd.installers.cvcfive import CVC5Installer
+from pysmt.cmd.installers.cvcfour import CVC4Installer
 from pysmt.cmd.installers.yices import YicesInstaller
 from pysmt.cmd.installers.btor import BtorInstaller
 from pysmt.cmd.installers.pico import PicoSATInstaller
 from pysmt.cmd.installers.bdd import CuddInstaller
 
-assert MSatInstaller and Z3Installer and CVC4Installer and YicesInstaller
-assert BtorInstaller and PicoSATInstaller and CuddInstaller
+assert MSatInstaller and Z3Installer and CVC5Installer and YicesInstaller
+assert BtorInstaller and PicoSATInstaller and CuddInstaller and CVC4Installer

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/pysmt/cmd/installers/base.py

@@ -98,7 +98,7 @@ class SolverInstaller(object):
 
     def download(self):
         """Downloads the archive from one of the mirrors"""
-        if not os.path.exists(self.archive_path):
+        if self.archive_path and not os.path.exists(self.archive_path):
             for turn in range(self.trials_404):
                 for i, link in enumerate(self.download_links()):
                     try:
@@ -115,15 +115,16 @@ class SolverInstaller(object):
 
     def unpack(self):
         """Unpacks the archive"""
-        path = self.archive_path
-        if path.endswith(".zip"):
-            SolverInstaller.unzip(path, directory=self.base_dir)
-        elif path.endswith(".tar.bz2"):
-            SolverInstaller.untar(path, directory=self.base_dir, mode='r:bz2')
-        elif path.endswith(".tar.gz"):
-            SolverInstaller.untar(path, directory=self.base_dir)
-        else:
-            raise ValueError("Unsupported archive for extraction: %s" % path)
+        if self.archive_path:
+            path = self.archive_path
+            if path.endswith(".zip"):
+                SolverInstaller.unzip(path, directory=self.base_dir)
+            elif path.endswith(".tar.bz2"):
+                SolverInstaller.untar(path, directory=self.base_dir, mode='r:bz2')
+            elif path.endswith(".tar.gz"):
+                SolverInstaller.untar(path, directory=self.base_dir)
+            else:
+                raise ValueError("Unsupported archive for extraction: %s" % path)
 
     def compile(self):
         """Performs the compilation if needed"""

PySMT-0.9.7.dev104/pysmt/cmd/installers/cvcfive.py

@@ -0,0 +1,42 @@
+# Copyright 2014 Andrea Micheli and Marco Gario
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import
+
+import os
+import sys
+import multiprocessing
+
+from pysmt.cmd.installers.base import SolverInstaller
+
+
+class CVC5Installer(SolverInstaller):
+
+    SOLVER = "cvc5"
+
+    def __init__(self, install_dir, bindings_dir, solver_version,
+                 mirror_link=None, git_tag='master'):
+        SolverInstaller.__init__(self, install_dir=install_dir,
+                                 bindings_dir=bindings_dir,
+                                 solver_version=solver_version,
+                                 mirror_link=mirror_link)
+
+    def move(self):
+        pass
+
+    def compile(self):
+        print(self.bindings_dir)
+        SolverInstaller.run_python("-m pip install --upgrade --target=%s cvc5==%s" % (self.bindings_dir, self.solver_version))
+
+    def get_installed_version(self):
+        return self.get_installed_version_script(self.bindings_dir, "cvc5")

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/pysmt/cmd/installers/msat.py

@@ -103,10 +103,10 @@ class MSatInstaller(SolverInstaller):
             if f.endswith(".so") or f.endswith(".dll") or f.endswith(".dylib"):
                 SolverInstaller.mv(os.path.join(libdir, f), self.bindings_dir)
 
-        # Fix issue in MathSAT 5.5.1 linking to incorrect directory on OSX
+        # Fix issue in MathSAT 5.6.10 linking to incorrect directory on OSX
         if self.os_name == "darwin":
             soname = glob.glob(self.bindings_dir + "/_mathsat*.so")[0]
-            old_path = "/Users/alb/src/build_mathsat5/opt/libmathsat.dylib"
+            old_path = "/Users/alb/src/release/build/libmathsat.dylib"
             new_path = "%s/libmathsat.dylib" % self.bindings_dir
             SolverInstaller.run("install_name_tool -change %s %s %s" %
                                 (old_path, new_path, soname))

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/pysmt/cmd/installers/yices.py

@@ -23,7 +23,7 @@ class YicesInstaller(SolverInstaller):
     SOLVER = "yices"
 
     def __init__(self, install_dir, bindings_dir, solver_version,
-                 mirror_link=None, yicespy_version='HEAD'):
+                 mirror_link=None, yices_api_version=None):
 
         archive_name = "Yices-%s.tar.gz" % (solver_version)
         native_link = "https://github.com/SRI-CSL/yices2/archive/{archive_name}"
@@ -34,29 +34,9 @@ class YicesInstaller(SolverInstaller):
                                  native_link=native_link,
                                  mirror_link=mirror_link)
 
+        self.yices_api_version = yices_api_version
         self.extract_path = os.path.join(self.base_dir, "yices2-Yices-%s" % self.solver_version)
-        self.yices_path = os.path.join(self.bindings_dir, "yices_bin")
-        self.yicespy_git_version = yicespy_version
-
-    def install_yicespy(self):
-        yicespy_git_version = self.yicespy_git_version
-        yicespy_base_name =  "yicespy"
-        yicespy_archive_name = "%s.tar.gz" % yicespy_base_name
-        yicespy_archive = os.path.join(self.base_dir, yicespy_archive_name)
-        yicespy_dir_path = os.path.join(self.base_dir,
-                                        yicespy_base_name + "-" + yicespy_git_version)
-
-        yicespy_download_link = "https://codeload.github.com/pysmt/yicespy/tar.gz/%s" % (yicespy_git_version)
-        SolverInstaller.do_download(yicespy_download_link, yicespy_archive)
-
-        SolverInstaller.clean_dir(yicespy_dir_path)
-
-        SolverInstaller.untar(yicespy_archive, self.base_dir)
-        # Build yicespy
-        SolverInstaller.run_python("setup.py --yices-dir=%s -- build_ext bdist_wheel --dist-dir=%s " % (self.yices_path, self.base_dir),
-                                   directory=yicespy_dir_path)
-        wheel_file = glob.glob(os.path.join(self.base_dir, "yicespy") + "*.whl")[0]
-        SolverInstaller.unzip(wheel_file, self.bindings_dir)
+        self.yices_path = os.path.join(self.base_dir, "yices_bin")
 
     def compile(self):
         # Prepare an empty folder for installing yices
@@ -69,8 +49,21 @@ class YicesInstaller(SolverInstaller):
         SolverInstaller.run("make", directory=self.extract_path)
         SolverInstaller.run("make install", directory=self.extract_path)
 
-        self.install_yicespy()
-
+        if self.yices_api_version is None:
+            SolverInstaller.run_python("-m pip install --upgrade --target=%s yices" % self.bindings_dir)
+        else:
+            SolverInstaller.run_python("-m pip install --upgrade --target=%s yices==%s" % (self.bindings_dir, self.yices_api_version))
+
+        libdir = os.path.join(self.yices_path, "lib")
+        yices_api_file = os.path.join(self.bindings_dir, "yices_api.py")
+        with open(yices_api_file, 'r') as f:
+            lines = f.readlines()
+            if "sys.stderr.write" in lines[215]:
+                lines.pop(215)
+            if "else" in lines[226]:
+                lines.insert(226, "    if _loadYicesFromPath('%s', libyicespath):\n        return\n" % libdir)
+        with open(yices_api_file, 'w') as f:
+            f.write("".join(lines))
 
     def get_installed_version(self):
         return self.get_installed_version_script(self.bindings_dir, "yices")

PySMT-0.9.7.dev104/pysmt/cmd/installers/z3.py

@@ -0,0 +1,38 @@
+# Copyright 2014 Andrea Micheli and Marco Gario
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import
+
+import os
+import glob
+
+from pysmt.cmd.installers.base import SolverInstaller
+
+
+class Z3Installer(SolverInstaller):
+
+    SOLVER = "z3"
+
+    def __init__(self, install_dir, bindings_dir, solver_version,
+                 mirror_link=None):
+
+        SolverInstaller.__init__(self, install_dir=install_dir,
+                                 bindings_dir=bindings_dir,
+                                 solver_version=solver_version,
+                                 mirror_link=mirror_link)
+
+    def compile(self):
+        SolverInstaller.run_python("-m pip install --upgrade --target=%s z3-solver==%s" % (self.bindings_dir, self.solver_version))
+
+    def get_installed_version(self):
+        return self.get_installed_version_script(self.bindings_dir, "z3")

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/pysmt/configuration.py

@@ -21,7 +21,7 @@ The following is an example of configuration file.
 
 [global]
 use_infix_notation: true
-solver_preference_list: msat z3 cvc4 z3-smt mathsat-smt
+solver_preference_list: msat z3 cvc5 z3-smt mathsat-smt
 
 [smtlibsolver z3-smt]
 command: z3 -smt2 -in

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/pysmt/constants.py

@@ -182,6 +182,15 @@ if USE_Z3:
         def __hash__(self):
             return hash(self.sexpr())
 
+        def __del__(self):
+            # This might be a small memory leak, but it seems that Z3 does not
+            # like subclassing z3.z3num.Numeral
+            #
+            # For some reason, it performs a double free, we need to investigate
+            # if this is a pysmt issue or a z3 issue. For now, we accept the
+            # minimal memory leak of the algebraic constants
+            pass
+
 else:
     class Numeral(object):
         """Represents a Number (Algebraic)"""

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/pysmt/factory.py

@@ -38,8 +38,8 @@ from pysmt.solvers.qelim import (ShannonQuantifierEliminator,
 from pysmt.solvers.solver import SolverOptions
 from pysmt.solvers.portfolio import Portfolio
 
-DEFAULT_SOLVER_PREFERENCE_LIST = ['msat', 'z3', 'cvc4', 'yices', 'btor',
-                                  'picosat', 'bdd']
+DEFAULT_SOLVER_PREFERENCE_LIST = ['msat', 'z3', 'cvc5', 'yices', 'btor',
+                                  'picosat', 'bdd', 'cvc4']
 DEFAULT_QELIM_PREFERENCE_LIST = ['z3', 'msat_fm', 'msat_lw', 'bdd',
                                  'shannon', 'selfsub']
 DEFAULT_INTERPOLATION_PREFERENCE_LIST = ['msat']
@@ -230,7 +230,13 @@ class Factory(object):
             pass
 
         try:
-            from pysmt.solvers.cvc4 import CVC4Solver
+            from pysmt.solvers.cvcfive import CVC5Solver
+            installed_solvers['cvc5'] = CVC5Solver
+        except SolverAPINotFound:
+            pass
+
+        try:
+            from pysmt.solvers.cvcfour import CVC4Solver
             installed_solvers['cvc4'] = CVC4Solver
         except SolverAPINotFound:
             pass
@@ -598,7 +604,7 @@ class Factory(object):
 # If PYSMT_SOLVER is "None" (literal None), the preference list will be empty
 #
 # Otherwise PYSMT_SOLVER is treated as  a comma-separated list: e.g.
-#   "msat, z3, cvc4"
+#   "msat, z3, cvc5"
 #
 import os
 ENV_SOLVER_LIST = os.environ.get("PYSMT_SOLVER")

{PySMT-0.9.6.dev65 → PySMT-0.9.7.dev104}/pysmt/smtlib/parser/__init__.py

@@ -90,6 +90,14 @@ else:
         else:
             import pyximport._pyximport3 as pyximport
 
+    if not hasattr(pyximport, "build_module"):
+        import sys
+        if sys.version_info < (3, 5):
+            # _pyximport3 module requires at least Python 3.5
+            import pyximport._pyximport2 as pyximport
+        else:
+            import pyximport._pyximport3 as pyximport
+
     pyx = pyximport.install()
     pyximport.uninstall(*pyx)
     build_dir = os.path.join(os.path.expanduser('~'), '.pyxbld')