PySMT 0.9.7.dev485__py2.py3-none-any.whl → 0.9.7.dev489__py2.py3-none-any.whl

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/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/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/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/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/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/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/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/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/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.dist-info → pysmt-0.9.7.dev489.dist-info}/METADATA

@@ -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.dist-info → pysmt-0.9.7.dev489.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pysmt/__init__.py,sha256=-1nhsqf1cDJwZGajwhlm8vA59g3l6eLyADmCUslgp7k,1701
+pysmt/__init__.py,sha256=5bkWQvoNDZsOlGJZABNYsf-aLMybC2XXRHF8FQ3MxlM,1701
 pysmt/__main__.py,sha256=rR-MV1QtLYqtVoJyY3m5B5Iz-lua0-5o6YSB0W4lKy8,1085
 pysmt/configuration.py,sha256=Iq_46QZ9z_jpBMk76euJWTqGEwHad2qyiEDPix5sXsA,4538
 pysmt/constants.py,sha256=pulb6NvROY_X8BePeyyX8T9MJLB79HZ_1FUYSlZ7Jfg,5769
@@ -22,19 +22,19 @@ pysmt/typing.py,sha256=aI8ZKEin4J2XLAHsY5fW1Pt4hZvlBlArxM4nrrmBas4,19550
 pysmt/utils.py,sha256=_dSgl45k-u9cMXSyR672GBJcKMKdtl6xSTjqXKTSfcs,2906
 pysmt/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pysmt/cmd/check_version.py,sha256=DCS6pHVuQm9J_vfSSDDGxtvrV6P1mEhQK-IUjacDh3s,2895
-pysmt/cmd/install.py,sha256=-PT8N0nbl9fkd0LLQ1LMdHy1szzsGVimGdmuogH3xcc,10467
+pysmt/cmd/install.py,sha256=kV6Dsn4mZfmo17iPr-cmXNTCDzseG8dXWfaawkAj6lg,10467
 pysmt/cmd/shell.py,sha256=1H5NJ9St879-U3EDizq_5l34vKPUJr-wi3MyBy164Sc,6594
 pysmt/cmd/installers/__init__.py,sha256=fEAD4FUh0Hjv7u-o9dc5nYMjzPUAzR8bWo8DSgUQjq4,1438
-pysmt/cmd/installers/base.py,sha256=agHbXV4ILfW2my8bjFLoRPmK9Jq8fPz9aESPGbPLu-g,13201
-pysmt/cmd/installers/bdd.py,sha256=IfTSdsFYhgefb0fapbwOeyNbjkrWzgBVH6M5NvOz4qM,2190
-pysmt/cmd/installers/btor.py,sha256=gUl_urKcWtbSYS_Vde_O7RJM0H-kRqh6hceTju-Sbcs,4995
-pysmt/cmd/installers/cvcfive.py,sha256=vWqAm5xF7IMY0JWEeyx3_ochCqyHx0dlcZBo9QcQ-uk,1460
+pysmt/cmd/installers/base.py,sha256=CKs_qq64_TE0a244L4TjWGTau9MQqfuzn2IMO1XXAe8,13168
+pysmt/cmd/installers/bdd.py,sha256=99NWkS4_Kb2JNiT-Cu-4kz2JTonRkVeCB-fSAaYEp00,1867
+pysmt/cmd/installers/btor.py,sha256=wHTyJzUVEmvSCjmZqjftRtQGeOxKc4S2AuJqdWEwfX4,4999
+pysmt/cmd/installers/cvcfive.py,sha256=k2zJGIlFDrx_9yeqKfdHph6HTmTr3OxYjUpqTy_44yA,1472
 pysmt/cmd/installers/cvcfour.py,sha256=uBZkKIX4gZEMfjrhrparUSDydMcvGIGZM2Y8JYD0GzE,3916
-pysmt/cmd/installers/msat.py,sha256=PnHNSbMLB99SPCkv2cuK8LyWweJVa7cOOcGvsFTgzsU,5547
+pysmt/cmd/installers/msat.py,sha256=cL2xMn0UOrV7rAlI2Tsx-MqEiurpM1LJjZYL8utQT4I,5508
 pysmt/cmd/installers/optimsat.py,sha256=E9W0mKtMdV_LsaywEM-baVzj_T70sNclqiFucqzWYCU,4359
 pysmt/cmd/installers/pico.py,sha256=U4sXr1oj4BJJpO5H7vB8WqJ6OEPazpYkmmXP1XWhvys,3027
-pysmt/cmd/installers/yices.py,sha256=M99P641jqGtAWOgQpAQzt4T1KwmSClw1VDEETzsSZe0,3010
-pysmt/cmd/installers/z3.py,sha256=5wP6O-a602-y1cuEyr22bkdWnOWHx8bIaPQ24xDtxX8,1386
+pysmt/cmd/installers/yices.py,sha256=smnsD6LVeuAV2EkvUFoKCQK_JSHnes4g4r1bxTRurOw,3039
+pysmt/cmd/installers/z3.py,sha256=28PtWI27tvoQsfwe97wDb9-0RmdQA2bvJ-wAcy7P51E,1398
 pysmt/optimization/__init__.py,sha256=JXBHtcb4Lv-Sb8whc9JuGbRH2EBLWwtLUh3PL9HhNE8,650
 pysmt/optimization/goal.py,sha256=b6--z8gi-vyDjYSVNYIy9fiYhLXz51EPv5jxP64H_oI,10128
 pysmt/optimization/msat.py,sha256=yj5-vqxQFJnK3zjVlYpxemZ2BWG-6IrCTDKvjl94xNY,937
@@ -89,6 +89,7 @@ pysmt/test/test_euf.py,sha256=B0VRx1NwfKZZIG5Fc6gYPj7G6gNWMzYJvgbh-2q2E28,3455
 pysmt/test/test_formula.py,sha256=nd550r7dBRHvoNKedCCdKfmV0WD4oMfjZekfAtk7GSg,40493
 pysmt/test/test_hr_parsing.py,sha256=bi-iTu7y1C7diMcWsQ7EI40MipDbzTKbMGPnLWX85A8,3118
 pysmt/test/test_imports.py,sha256=f41EUBrlDItgQ_6SPhWW8-tuwMrdMFXHJzaxrHHB43Q,1583
+pysmt/test/test_installers.py,sha256=0eaaHk-DhdR47jCL-qT0Jb80iKrar8TWzTWhfOfByuU,679
 pysmt/test/test_int.py,sha256=dk72Q6viqRUs9XiPB40n6RrwiqsV6GbbKuSlYaQMU9k,1980
 pysmt/test/test_interpolation.py,sha256=WTodZtnxH5slIvUWbHbjjnI2o0naXgZwZawTGhh3E0o,3941
 pysmt/test/test_lira.py,sha256=o8z7Bcb9zH2ptC7oYTueAJB05a-SINh2a__UNUUP610,5006
@@ -144,10 +145,10 @@ pysmt/walkers/dag.py,sha256=hw9qUfadQTpihX685YQobfxKv9XA84ffiA8XRMUQEfU,5694
 pysmt/walkers/generic.py,sha256=2oMr_MDr7FswSlyx2ulbJ9ke5FsTCKABURnCsMeg4fc,5093
 pysmt/walkers/identitydag.py,sha256=EAxSneEW91Z8GphlkbMPsPdlac7_FDcVj-_6_aunU2s,10902
 pysmt/walkers/tree.py,sha256=1vquhaChRMSG_pvbz16wqKOFnsQAkzLvjh_xbB3dg5c,2730
-pysmt-0.9.7.dev485.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pysmt-0.9.7.dev485.dist-info/licenses/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
-pysmt-0.9.7.dev485.dist-info/METADATA,sha256=oY0W4dADbjmGgO9xwljRC_pXSAXQq1KmOeH4xAjXQk4,1774
-pysmt-0.9.7.dev485.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
-pysmt-0.9.7.dev485.dist-info/entry_points.txt,sha256=gDc1XM0xTJJMDGC_nXd0kfbX-Omjke9Dn9F3awMLYIU,57
-pysmt-0.9.7.dev485.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
-pysmt-0.9.7.dev485.dist-info/RECORD,,
+pysmt-0.9.7.dev489.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pysmt-0.9.7.dev489.dist-info/licenses/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
+pysmt-0.9.7.dev489.dist-info/METADATA,sha256=bf2QML6n9GZtd1mZvinmKFJTSZTj1fH9wmxG7dOa6Cw,1823
+pysmt-0.9.7.dev489.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
+pysmt-0.9.7.dev489.dist-info/entry_points.txt,sha256=gDc1XM0xTJJMDGC_nXd0kfbX-Omjke9Dn9F3awMLYIU,57
+pysmt-0.9.7.dev489.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
+pysmt-0.9.7.dev489.dist-info/RECORD,,