PySMT 0.9.1.dev166__tar.gz → 0.9.6__tar.gz

{PySMT-0.9.1.dev166 → PySMT-0.9.6}/MANIFEST.in

@@ -1,2 +1,4 @@
 include LICENSE README.rst
 recursive-include docs *.rst
+include pysmt/test/configs/*
+

{PySMT-0.9.1.dev166/PySMT.egg-info → PySMT-0.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: PySMT
-Version: 0.9.1.dev166
+Version: 0.9.6
 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.1.dev166 → PySMT-0.9.6/PySMT.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: PySMT
-Version: 0.9.1.dev166
+Version: 0.9.6
 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.1.dev166 → PySMT-0.9.6}/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
@@ -116,6 +118,8 @@ pysmt/test/test_typechecker.py
 pysmt/test/test_unsat_cores.py
 pysmt/test/test_walker_ext.py
 pysmt/test/test_walkers.py
+pysmt/test/configs/config1.ini
+pysmt/test/configs/config_bad.ini
 pysmt/test/smtlib/__init__.py
 pysmt/test/smtlib/parser_utils.py
 pysmt/test/smtlib/test_annotations.py

{PySMT-0.9.1.dev166 → PySMT-0.9.6}/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/)
@@ -182,7 +182,7 @@ Installation
 ============
 You can install the latest stable release of pySMT from PyPI::
 
-  # pip install pysmt
+  $ pip install pysmt
 
 this will additionally install the *pysmt-install* command, that can
 be used to install the solvers: e.g., ::
@@ -237,9 +237,9 @@ each of the available solvers.
  +==================+===========+================================+=============+========================+============+==============+
  | MathSAT          |  msat     | UF, LIA, LRA, BV, AX           |  No         | msat-fm, msat-lw       | Yes        | Yes          |
  +------------------+-----------+--------------------------------+-------------+------------------------+------------+--------------+
- | Z3               |  z3       | UF, LIA, LRA, BV, AX, NRA, NIA |  z3         | z3                     | Yes        | Yes          |
+ | 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.1.dev166 → PySMT-0.9.6}/docs/CHANGES.rst

@@ -1,6 +1,89 @@
 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
+----------------------------------------
+
+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
+
+* 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
+* Fixed a bug in yices quantifier support and added regression test by @mikand in https://github.com/pysmt/pysmt/pull/657
+* Fix Boolector install script by @4tXJ7f in https://github.com/pysmt/pysmt/pull/656
+* BUG: define UFNIA as logic with integer arithmetic by @johnyf in https://github.com/pysmt/pysmt/pull/659
+* Handling of algebraic constants in simplify by @EnricoMagnago in https://github.com/pysmt/pysmt/pull/658
+* Integer div by @EnricoMagnago in https://github.com/pysmt/pysmt/pull/667
+* Fix CVC4 installation on macOS by @kammoh in https://github.com/pysmt/pysmt/pull/666
+* Bug in times distributor by @EnricoMagnago in https://github.com/pysmt/pysmt/pull/671
+* Fixed reset_assertion method for incremental-tracking solvers by @mikand in https://github.com/pysmt/pysmt/pull/672
+* Minor Corrections by @mfarif in https://github.com/pysmt/pysmt/pull/673
+* implement add_assertions method for solver. by @EnricoMagnago in https://github.com/pysmt/pysmt/pull/679
+* Fix "get_model" when called from a generic solver (Fix #674) by @btwael in https://github.com/pysmt/pysmt/pull/675
+* Remove six and python 2 compatibility code by @marcogario in https://github.com/pysmt/pysmt/pull/684
+* Added fallback to Swig3 to address as much as possible issue #682 by @mikand in https://github.com/pysmt/pysmt/pull/685
+* Fix to correctly pass logic to solvers started by Portfolio by @ekilmer in https://github.com/pysmt/pysmt/pull/683
+* SmtLib model validation support by @mikand in https://github.com/pysmt/pysmt/pull/681
+* Fix iss694 by @EnricoMagnago in https://github.com/pysmt/pysmt/pull/695
+* Fixed CVC4 installer after upstream repository renaming by @mikand in https://github.com/pysmt/pysmt/pull/697
+* Remove call to `FNode.substitute` in SmtLibExecutionCache by @EnricoMagnago in https://github.com/pysmt/pysmt/pull/699
+* Added printing of annotations to smt lib printers by @agirardi-fbk in https://github.com/pysmt/pysmt/pull/703
+* Integer div by @EnricoMagnago in https://github.com/pysmt/pysmt/pull/705
+* Updated docker images to solve deprecation issue on azure pipelines by @mikand in https://github.com/pysmt/pysmt/pull/706
+* Workaround to fix Z3 segfault by @mikand in https://github.com/pysmt/pysmt/pull/713
+* Add possibility to use several BV operators as left associative by @agirardi-fbk in https://github.com/pysmt/pysmt/pull/714
+* Fixed issue #613 by @mikand in https://github.com/pysmt/pysmt/pull/710
+
+## New Contributors
+* @4tXJ7f made their first contribution in https://github.com/pysmt/pysmt/pull/656
+* @johnyf made their first contribution in https://github.com/pysmt/pysmt/pull/659
+* @kammoh made their first contribution in https://github.com/pysmt/pysmt/pull/666
+* @mfarif made their first contribution in https://github.com/pysmt/pysmt/pull/673
+* @btwael made their first contribution in https://github.com/pysmt/pysmt/pull/675
+* @ekilmer made their first contribution in https://github.com/pysmt/pysmt/pull/683
+* @agirardi-fbk made their first contribution in https://github.com/pysmt/pysmt/pull/703
+
+**Full Changelog**: https://github.com/pysmt/pysmt/compare/v0.9.0...v0.9.5
+
 0.9.0: 2020-04-26 -- PySMT as module
 ------------------------------------
 

{PySMT-0.9.1.dev166 → PySMT-0.9.6}/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.1.dev166 → PySMT-0.9.6}/pysmt/__init__.py

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

{PySMT-0.9.1.dev166 → PySMT-0.9.6}/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.1.dev166 → PySMT-0.9.6}/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.1", {}),
+    Installer(MSatInstaller,    "5.6.10", {}),
+    Installer(CVC5Installer,    "1.1.2", {}),
     Installer(CVC4Installer,    "1.7-prerelease",
               {"git_version" : "391ab9df6c3fd9a3771864900c1718534c1e4666"}),
-    Installer(Z3Installer,      "4.8.7", {"osx": "10.14.6"}),
-    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.1.dev166 → PySMT-0.9.6}/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.1.dev166 → PySMT-0.9.6}/pysmt/cmd/installers/base.py

@@ -22,8 +22,7 @@ import subprocess
 import urllib.request
 
 from contextlib import contextmanager
-from distutils import spawn
-from distutils.dist import Distribution
+from setuptools import Distribution
 
 from urllib.error import HTTPError, URLError
 
@@ -99,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:
@@ -116,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"""
@@ -304,14 +304,14 @@ class SolverInstaller(object):
         command = None
         for alt in alternatives:
             name = command_tplate % alt
-            command = spawn.find_executable(name)
+            command = shutil.which(name)
             if command is not None:
                 break
         return command
 
 
 def package_install_site(name='', user=False, plat_specific=False):
-    """pip-inspired, distutils-based method for fetching the
+    """pip-inspired method for fetching the
     default install location (site-packages path).
 
     Returns virtual environment or system site-packages, unless

{PySMT-0.9.1.dev166 → PySMT-0.9.6}/pysmt/cmd/installers/bdd.py

@@ -45,8 +45,8 @@ class CuddInstaller(SolverInstaller):
             print("WARNING: the BDD solver does not work with Swig4 < 4.0.2. Fallback to Swig3")
             swig = "swig3.0" # This is the Ubuntu naming of the executable
 
-        import distutils.sysconfig as sysconfig
-        PYTHON_INCLUDE_DIR = sysconfig.get_python_inc()
+        import sysconfig
+        PYTHON_INCLUDE_DIR = sysconfig.get_path("include")
         SolverInstaller.run("make -C %s -f %s PYTHON_INCL=-I%s SWIG=%s" %
                             (self.extract_path, makefile, PYTHON_INCLUDE_DIR, swig))
 

{PySMT-0.9.1.dev166 → PySMT-0.9.6}/pysmt/cmd/installers/btor.py

@@ -44,10 +44,11 @@ class BtorInstaller(SolverInstaller):
         # path into Boolector's CMake because CMake can get confused
         # if multiple interpreters are available, especially python 2
         # vs python 3.
-        import distutils.sysconfig as sysconfig
+        import sysconfig
         import sys
         PYTHON_LIBRARY = os.environ.get('PYSMT_PYTHON_LIBDIR')
-        PYTHON_INCLUDE_DIR = sysconfig.get_python_inc()
+        PYTHON_INCLUDE_DIR = sysconfig.get_path("include")
+
         PYTHON_EXECUTABLE = sys.executable
         CMAKE_OPTS = ' -DPYTHON_INCLUDE_DIR=' + PYTHON_INCLUDE_DIR
         CMAKE_OPTS += ' -DPYTHON_EXECUTABLE=' + PYTHON_EXECUTABLE

PySMT-0.9.6/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.1.dev166/pysmt/cmd/installers/cvc4.py → PySMT-0.9.6/pysmt/cmd/installers/cvcfour.py

@@ -58,9 +58,9 @@ class CVC4Installer(SolverInstaller):
 
         # Inject Python library and include paths into CMake because CVC4 search
         # system can be fooled in some systems
-        import distutils.sysconfig as sysconfig
+        import sysconfig
         PYTHON_LIBRARY = os.environ.get('PYSMT_PYTHON_LIBDIR')
-        PYTHON_INCLUDE_DIR = sysconfig.get_python_inc()
+        PYTHON_INCLUDE_DIR = sysconfig.get_path("include")
         PYTHON_EXECUTABLE = sys.executable
 
         CMAKE_OPTS = '-DPYTHON_INCLUDE_DIR=' + PYTHON_INCLUDE_DIR

{PySMT-0.9.1.dev166 → PySMT-0.9.6}/pysmt/cmd/installers/msat.py

@@ -26,21 +26,24 @@ class MSatInstaller(SolverInstaller):
                  mirror_link=None):
 
         # Getting the right archive name
-        os_name = self.os_name
-        arch = self.architecture
-        ext = "tar.gz"
-        if os_name == "windows":
-            ext = "zip"
-            arch = "msvc"
-            if self.architecture == "x86_64":
-                os_name = "win64"
-            else:
-                os_name = "win32"
-        elif os_name == "darwin":
-            os_name = "darwin-libcxx"
-
-        archive_name = "mathsat-%s-%s-%s.%s" % (solver_version, os_name,
-                                                arch, ext)
+        archive_name_template = "mathsat-{version}-{os}-{arch}.{ext}"
+        format = {
+                "version": solver_version,
+                "os" : self.os_name,
+                "arch": self.architecture,
+                "ext": "tar.gz"
+        }
+        if self.os_name == "windows":
+            format["ext"] = "zip"
+            format["arch"] = "msvc"
+            format["os"] = "win64" if self.architecture == "x86_64" else "win32"
+        elif self.os_name == "darwin":
+            # Since version 5.6.7 the architecture is not included in the
+            # pkg name for the OSX release as it is considered a "univeral binary"
+            archive_name_template = "mathsat-{version}-{os}.{ext}"
+            format["os"] = "osx"
+
+        archive_name = archive_name_template.format(**format)
 
         native_link = "http://mathsat.fbk.eu/download.php?file={archive_name}"
 
@@ -100,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/griggio/Documents/src/mathsat_release/build/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.1.dev166 → PySMT-0.9.6}/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.6/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.1.dev166 → PySMT-0.9.6}/pysmt/cmd/shell.py

@@ -32,7 +32,7 @@ from pysmt.smtlib.commands import CHECK_SAT, GET_VALUE
 welcome_msg = \
 """Welcome to pySMT!!!
 
-You are within a Python shell enhanched with pySMT functionalities.
+You are within a Python shell enhanced with pySMT functionalities.
 
 First time here? Try: