PySMT 0.9.7.dev485__tar.gz → 0.9.7.dev489__tar.gz

{pysmt-0.9.7.dev485/PySMT.egg-info → pysmt-0.9.7.dev489}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySMT
-Version: 0.9.7.dev485
+Version: 0.9.7.dev489
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team
@@ -8,12 +8,14 @@ Author-email: info@pysmt.org
 License: APACHE
 License-File: LICENSE
 License-File: NOTICE
+Requires-Dist: setuptools
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file
+Dynamic: requires-dist
 Dynamic: summary
 
 ============================================================

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489/PySMT.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySMT
-Version: 0.9.7.dev485
+Version: 0.9.7.dev489
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team
@@ -8,12 +8,14 @@ Author-email: info@pysmt.org
 License: APACHE
 License-File: LICENSE
 License-File: NOTICE
+Requires-Dist: setuptools
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file
+Dynamic: requires-dist
 Dynamic: summary
 
 ============================================================

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/PySMT.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ PySMT.egg-info/PKG-INFO
 PySMT.egg-info/SOURCES.txt
 PySMT.egg-info/dependency_links.txt
 PySMT.egg-info/entry_points.txt
+PySMT.egg-info/requires.txt
 PySMT.egg-info/top_level.txt
 docs/CHANGES.rst
 docs/api_ref.rst
@@ -106,6 +107,7 @@ pysmt/test/test_euf.py
 pysmt/test/test_formula.py
 pysmt/test/test_hr_parsing.py
 pysmt/test/test_imports.py
+pysmt/test/test_installers.py
 pysmt/test/test_int.py
 pysmt/test/test_interpolation.py
 pysmt/test/test_lira.py

pysmt-0.9.7.dev489/PySMT.egg-info/requires.txt

@@ -0,0 +1 @@
+setuptools

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/docs/CHANGES.rst

@@ -4,6 +4,14 @@ Change Log
 (unreleased)
 ------------
 
+* BDD: Upgrade to repycudd 3.0.1, which bundles CUDD 3.0.0 in place of
+  2.4.2 and builds with pip on Linux and 64-bit Windows.
+  ``pysmt-install --bdd`` now works on Windows (it needs the Microsoft
+  C++ Build Tools), and no longer needs ``make`` or a system SWIG on
+  Linux. The repycudd API that pysmt uses is unchanged. Results that
+  depend on CUDD's heuristics, such as BDD sizes after reordering, may
+  differ.
+
 * Fixed: MathSAT segfaulted in ``get_unsat_core()`` after solving under
   a non-literal assumption, because reading the core popped the
   assumption level and left MathSAT's core with dangling terms. Z3 did

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/pysmt/__init__.py

@@ -19,7 +19,7 @@
 from typing import Tuple, Union
 
 
-VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 485)
+VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 489)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/pysmt/cmd/install.py

@@ -41,8 +41,8 @@ INSTALLERS = [
     Installer(BtorInstaller,    "3.2.3", {}),
     Installer(PicoSATInstaller, "965",
               {"pypicosat_minor_version" : "1708010052"}),
-    Installer(CuddInstaller,    "2.0.3",
-              {"git_version" : "0dabef26859b15710fd92e68e4eb6cf922a09de9"}),
+    Installer(CuddInstaller,    "3.0.1",
+              {"git_version" : "b87421c596a1bc2cafeb10ec40fcceacc952eda2"}),
     Installer(OptiMSatInstaller, "1.7.5", {})
 ]
 

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/pysmt/cmd/installers/base.py

@@ -197,8 +197,9 @@ class SolverInstaller(object):
         if sys.executable:
             interpreter = sys.executable
 
-        cmd = '{interpreter} {script}'.format(interpreter=interpreter,
-                                              script=script)
+        if isinstance(script, str):
+            script = script.split()
+        cmd = [interpreter] + script
         return SolverInstaller.run(cmd, directory=directory,
                                    env_variables=env_variables,
                                    get_output=get_output)
@@ -296,7 +297,7 @@ class SolverInstaller(object):
                 env[k] = bindings_dir
 
         try:
-            output = self.run_python("%s %s" % (check_version_script, package),
+            output = self.run_python([check_version_script, package],
                                      env_variables=env,
                                      get_output=True)
             output = output.strip()

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/pysmt/cmd/installers/bdd.py

@@ -11,8 +11,6 @@
 # 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.
-import os
-
 from pysmt.cmd.installers.base import SolverInstaller
 
 
@@ -34,22 +32,11 @@ class CuddInstaller(SolverInstaller):
 
 
     def compile(self):
-        # Select the correct Makefile to be used
-        makefile = "Makefile"
-        if self.architecture == "x86_64":
-            makefile = "Makefile_64bit"
-
-        import sysconfig
-        PYTHON_INCLUDE_DIR = sysconfig.get_path("include")
-        SolverInstaller.run("make -C %s -f %s PYTHON_INCL=-I%s" %
-                            (self.extract_path, makefile, PYTHON_INCLUDE_DIR))
-
-
-    def move(self):
-        SolverInstaller.mv(os.path.join(self.extract_path, "repycudd.py"),
-                           self.bindings_dir)
-        SolverInstaller.mv(os.path.join(self.extract_path, "_repycudd.so"),
-                           self.bindings_dir)
+        # repycudd's own build fetches SWIG from PyPI and compiles CUDD into
+        # the extension, so this is the same on every OS.
+        SolverInstaller.run_python(["-m", "pip", "install", "--no-deps",
+                                    "--upgrade", "--target", self.bindings_dir,
+                                    self.extract_path])
 
 
     def get_installed_version(self):

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/pysmt/cmd/installers/btor.py

@@ -79,7 +79,7 @@ class BtorInstaller(SolverInstaller):
             f.write(CYTHON_PATCH.encode())
             f.flush()
             f.seek(0)
-            SolverInstaller.run("patch src/api/python/pyboolector.pyx -i %s" % f.name,
+            SolverInstaller.run(["patch", "src/api/python/pyboolector.pyx", "-i", f.name],
                                 directory=self.extract_path)
 
         # Build lingeling

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/pysmt/cmd/installers/cvcfive.py

@@ -35,7 +35,7 @@ class CVC5Installer(SolverInstaller):
         pass
 
     def compile(self):
-        SolverInstaller.run_python("-m pip install --upgrade --target=%s cvc5==%s" % (self.bindings_dir, self.solver_version))
+        SolverInstaller.run_python(["-m", "pip", "install", "--upgrade", "--target", self.bindings_dir, "cvc5==%s" % self.solver_version])
 
     def get_installed_version(self):
         return self.get_installed_version_script(self.bindings_dir, "cvc5")

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/pysmt/cmd/installers/msat.py

@@ -114,8 +114,7 @@ class MSatInstaller(SolverInstaller):
             soname = glob.glob(self.bindings_dir + "/_mathsat*.so")[0]
             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))
+            SolverInstaller.run(["install_name_tool", "-change", old_path, new_path, soname])
 
 
     def get_installed_version(self):

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/pysmt/cmd/installers/yices.py

@@ -44,15 +44,15 @@ class YicesInstaller(SolverInstaller):
 
         SolverInstaller.run("autoconf", directory=self.extract_path)
 
-        SolverInstaller.run("bash configure --prefix %s" % self.yices_path,
+        SolverInstaller.run(["bash", "configure", "--prefix", self.yices_path],
                             directory=self.extract_path)
         SolverInstaller.run("make", directory=self.extract_path)
         SolverInstaller.run("make install", directory=self.extract_path)
 
         if self.yices_api_version is None:
-            SolverInstaller.run_python("-m pip install --upgrade --target=%s yices" % self.bindings_dir)
+            SolverInstaller.run_python(["-m", "pip", "install", "--upgrade", "--target", self.bindings_dir, "yices"])
         else:
-            SolverInstaller.run_python("-m pip install --upgrade --target=%s yices==%s" % (self.bindings_dir, self.yices_api_version))
+            SolverInstaller.run_python(["-m", "pip", "install", "--upgrade", "--target", self.bindings_dir, "yices==%s" % self.yices_api_version])
 
         libdir = os.path.join(self.yices_path, "lib")
         yices_api_file = os.path.join(self.bindings_dir, "yices_api.py")

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/pysmt/cmd/installers/z3.py

@@ -32,7 +32,7 @@ class Z3Installer(SolverInstaller):
                                  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))
+        SolverInstaller.run_python(["-m", "pip", "install", "--upgrade", "--target", self.bindings_dir, "z3-solver==%s" % self.solver_version])
 
     def get_installed_version(self):
         return self.get_installed_version_script(self.bindings_dir, "z3")

pysmt-0.9.7.dev489/pysmt/test/test_installers.py

@@ -0,0 +1,22 @@
+import os
+import tempfile
+
+from pysmt.cmd.installers.base import SolverInstaller
+from pysmt.test import TestCase, main
+
+
+class TestInstallers(TestCase):
+
+    def test_run_python_path_with_space(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            script = os.path.join(tmp, "with space", "echo.py")
+            os.makedirs(os.path.dirname(script))
+            with open(script, "w") as f:
+                f.write("import sys; print(sys.argv[1])")
+            arg = os.path.join(tmp, "another dir")
+            out = SolverInstaller.run_python([script, arg], get_output=True)
+            self.assertEqual(out.strip(), arg)
+
+
+if __name__ == "__main__":
+    main()

{pysmt-0.9.7.dev485 → pysmt-0.9.7.dev489}/setup.py

@@ -57,6 +57,8 @@ setup(
     license='APACHE',
     description='A solver-agnostic library for SMT Formulae manipulation and solving',
     long_description=long_description,
+    # pysmt.cmd.installers.base imports setuptools at runtime
+    install_requires=['setuptools'],
     entry_points={
         'console_scripts': [
             'pysmt-install = pysmt.cmd.install:main',