PySMT 0.9.6.dev65__py2.py3-none-any.whl → 0.9.7.dev104__py2.py3-none-any.whl

{PySMT-0.9.6.dev65.dist-info → PySMT-0.9.7.dev104.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 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
@@ -32,7 +32,7 @@ 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/)

{PySMT-0.9.6.dev65.dist-info → PySMT-0.9.7.dev104.dist-info}/RECORD

@@ -1,11 +1,11 @@
-pysmt/__init__.py,sha256=wsk6QHIX9cJCu64adAz0f65_X4rPQZ1K1XLeLMETMkQ,1597
+pysmt/__init__.py,sha256=KJugOyK6fEcU0mMk2bH5CVhNiTzjX1OYEO30Nifq734,1598
 pysmt/__main__.py,sha256=rR-MV1QtLYqtVoJyY3m5B5Iz-lua0-5o6YSB0W4lKy8,1085
-pysmt/configuration.py,sha256=MUIhnwCs-R8BIEPAu80GKlnX70RZLsyYvkIcnQFJAWU,4539
-pysmt/constants.py,sha256=l5obyz_O3gGbTaGaNWXgxNKuCobZNkHFrWTHWrr-qMw,4844
+pysmt/configuration.py,sha256=q4Ncd6f2d0VZUpyQAOR8sTPlTodgDnYhUBeRgYYXqTE,4539
+pysmt/constants.py,sha256=QelM9r5fGWSq8UNjjYoEJK2FaLHRr4Z9NZxzjeajEWA,5249
 pysmt/decorators.py,sha256=hBIKVkHlT0QD7H5yGmJIqn2MOafAZM-S2wPLvS2eB4c,3964
 pysmt/environment.py,sha256=rdaxQ0uwmMPmcW4d5WnTYAyHNSCpRTgzRLaXQccG5-4,6522
 pysmt/exceptions.py,sha256=uG3FochPO1Y18cv1lXUjQtNbW-qZKd68zqs8oo2OEF4,4420
-pysmt/factory.py,sha256=iNag-fUAdm6lA4f_3Z6IKhV1FG-9MnPD47HPAlBMoxQ,23923
+pysmt/factory.py,sha256=6QFbob7LV3x8uT4w2nG_rHqXWCqbwNg5oCUMPhpnwmY,24107
 pysmt/fnode.py,sha256=zKZP4yda8JxK6AXW3vCasRLYsLH5NzK_2Bjiy5ogtqo,33256
 pysmt/formula.py,sha256=baexe5-GgrG7z_qH3Wb9s8XQqFcBgyLXnv8Rik5t2YY,43318
 pysmt/logics.py,sha256=yJ1Yv24dVj4LlpnbspgcRT1t5e65RmvGas_bdHOGCAA,28774
@@ -21,18 +21,19 @@ pysmt/type_checker.py,sha256=g5Mbh42ZxsjtLHnS0qizYLZ3kH3bMtNkIuyiZtTuinE,13273
 pysmt/typing.py,sha256=GioU08mUxqsjFmmAYfBYj51mmJoBcFZDunc-t99QKng,17714
 pysmt/utils.py,sha256=t13jG-E8kQNxG_JmS79GDy3SnBohSobwjJTjZHFf3fE,2302
 pysmt/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pysmt/cmd/check_version.py,sha256=ZGCZNEsUPzQ8b_yMNfBRNzp40yDqagWgQ-pNAh7Z54k,2366
-pysmt/cmd/install.py,sha256=l-DJnshvI8_vvDrjkmEZN3duekBSJV6uAHC10H8G4Ic,10202
+pysmt/cmd/check_version.py,sha256=yeY_USo11j60iLjpNcAvq5gAj2i43IiOWcP1dwJS3Rw,2352
+pysmt/cmd/install.py,sha256=l3a-eBhsBIKvR1PEeNM9WYvQH46Ie8vUOzzh6VmWVzs,10239
 pysmt/cmd/shell.py,sha256=ww1juthvLnJQciVHWxYvTJaA5W3-Np0ORfESyePF0bI,4333
-pysmt/cmd/installers/__init__.py,sha256=mcX_yjJR-OX4OXWRV26rblVs-RIbGsiNM4vuRbUYynY,1094
-pysmt/cmd/installers/base.py,sha256=ifgq7lLaAhEsFe7d_p5x0xlcrrZDEF0Z7apnS07q_I4,12723
+pysmt/cmd/installers/__init__.py,sha256=nHJaEXfCpsEkzBy0NL91P9extUda6jb0u88nwPYTvGo,1170
+pysmt/cmd/installers/base.py,sha256=1usHiBHrIBam9BlbVKG-6F52KPsIkJBeghkd_ckh-8U,12811
 pysmt/cmd/installers/bdd.py,sha256=Qq8YlYAVvxUqNXjoOlH9_Lhj4cj6WEt7HuhbSiF_L6k,2539
 pysmt/cmd/installers/btor.py,sha256=0fsCJEKqQ_Y4HURYNct-F3ui8Zsk5qd4Gp0AWRXAUBo,4067
-pysmt/cmd/installers/cvc4.py,sha256=uBZkKIX4gZEMfjrhrparUSDydMcvGIGZM2Y8JYD0GzE,3916
-pysmt/cmd/installers/msat.py,sha256=Z_WQcjQ0Gkl_3Hc6XkvEQZAUg5GAqgL1oWtvxFx5qC4,5422
+pysmt/cmd/installers/cvcfive.py,sha256=PRSuEd2_y2qQO0G3gUGtCsKB2PMV40C1WwjpgbJkefE,1493
+pysmt/cmd/installers/cvcfour.py,sha256=uBZkKIX4gZEMfjrhrparUSDydMcvGIGZM2Y8JYD0GzE,3916
+pysmt/cmd/installers/msat.py,sha256=euWgHJO9IBbb6Bpf2vQlQoJ6tfRy9TstT0o9LRyedS8,5418
 pysmt/cmd/installers/pico.py,sha256=XJpVbY5YHboL3OEMBvjwv8QwKdJ7Y62Blb78tEGyMxU,3141
-pysmt/cmd/installers/yices.py,sha256=qGWAvOXWDrSgeCKgQrl4G1OOT8PytKJss1u2svVo_FE,3312
-pysmt/cmd/installers/z3.py,sha256=OvWy2Qu3N2JqF-3fnhRk84IeuUI8krnCQFhnUGimtHE,3334
+pysmt/cmd/installers/yices.py,sha256=M99P641jqGtAWOgQpAQzt4T1KwmSClw1VDEETzsSZe0,3010
+pysmt/cmd/installers/z3.py,sha256=5wP6O-a602-y1cuEyr22bkdWnOWHx8bIaPQ24xDtxX8,1386
 pysmt/smtlib/__init__.py,sha256=JXBHtcb4Lv-Sb8whc9JuGbRH2EBLWwtLUh3PL9HhNE8,650
 pysmt/smtlib/annotations.py,sha256=BKL6CbUTVFxT-PojRNetfcPtor9ExAOzcxng0Ic25-k,4167
 pysmt/smtlib/commands.py,sha256=RG0swe9N0r4i7TuiivjKbalm8pBeULDLd5TG9lAdy0U,1940
@@ -40,12 +41,13 @@ pysmt/smtlib/printers.py,sha256=jjX3qAHdbRd5BkKfMcjIrV305f43TDyZY0FwGFrEQRM,2455
 pysmt/smtlib/script.py,sha256=4tATsRYDavjz1DVKXzfVVZxVXYOtBRhh4Ya0Ng4XxHY,13387
 pysmt/smtlib/solver.py,sha256=dWBzYBuYDVyCsQI1KlqndxpqX4xHQUDcHAuefwbHv24,7987
 pysmt/smtlib/utils.py,sha256=XNp7mW1DB6cZRtQhkAOTR-xrwYaGDBEcF3Q-edKDeU8,2043
-pysmt/smtlib/parser/__init__.py,sha256=OzRgPJXGkmihZHmr_aELDlIKzHGHF5wGl6U5DB2wpM0,4482
+pysmt/smtlib/parser/__init__.py,sha256=Tgl8AAjZPmCrABGmKRSC4Yu634mn8r22qn18M3u-pfk,4771
 pysmt/smtlib/parser/parser.py,sha256=3eMEhW6t2XHSK_1EkGmjB4ZWrg6kWgfwVDVcyOxyWS0,58387
 pysmt/solvers/__init__.py,sha256=JXBHtcb4Lv-Sb8whc9JuGbRH2EBLWwtLUh3PL9HhNE8,650
 pysmt/solvers/bdd.py,sha256=my3398_-8Rkqy1pluzZa7_12qsA43ARbs8-YAPqdMWs,15938
 pysmt/solvers/btor.py,sha256=DFBnYsa4oG8GC58UWvKf6FHwVK9AmnOQ8ytrEaYlZbI,25295
-pysmt/solvers/cvc4.py,sha256=odWm_MAgoPlhOf6gaarZQAqQS4fN-8PH-xGIYaiErQE,24538
+pysmt/solvers/cvcfive.py,sha256=z8o4VxrZBC6sdb_JYTWfRS3BXdWJPznakN3k7rD4EY8,21073
+pysmt/solvers/cvcfour.py,sha256=odWm_MAgoPlhOf6gaarZQAqQS4fN-8PH-xGIYaiErQE,24538
 pysmt/solvers/eager.py,sha256=Py2_XaFj7YIOotH3Zv14JhmyLiZPTxKwzLuLztFqNIs,3297
 pysmt/solvers/interpolation.py,sha256=PYvn81xp5or_p3wE4-ReI5OMY06s7nzuNvM0zs9_XyI,1851
 pysmt/solvers/msat.py,sha256=34PJPLIMZZmrhtq1N-L3qm38cI_I0kBWe-K_xMeDb5Q,54967
@@ -55,7 +57,7 @@ pysmt/solvers/portfolio.py,sha256=OrWMzlFugE9wsKSKGolwsB6atadkt0nE_3e3TGg-3k8,91
 pysmt/solvers/qelim.py,sha256=Fjy54lbyIKahAzGajhaihXYQyYn97h83Ud2er-zjwcw,4822
 pysmt/solvers/smtlib.py,sha256=6gGq-UdCVrrdmliCNl2RByyn5qMqBtVVDP_sB2jXiQ8,8998
 pysmt/solvers/solver.py,sha256=lOOdtGKWaWdqQDLSUDS-GunZ60EeKJAYIVfmeimzuy0,17663
-pysmt/solvers/yices.py,sha256=O7WcknXXSF2t0gopM7GP3udkwQzThkRjtHutEOLREeE,23348
+pysmt/solvers/yices.py,sha256=ZU3iqj29oKnqDnDnPnfKvS1QBAGEMecrQgZ14qRsoUQ,24489
 pysmt/solvers/z3.py,sha256=_XMiY04kJVdpyfBSN8p5qPaEsCjZ60uBr4na55Vcq1k,40768
 pysmt/test/__init__.py,sha256=9YsAQOuHVQ4N8MzKN9U0eAfRjPiKBVH_D_xV1MJZjkg,4985
 pysmt/test/examples.py,sha256=XymEXLmIZxMtS9qTfzrXYbi4DBaMTgPzd_ijKh1H2aM,39485
@@ -63,11 +65,11 @@ pysmt/test/test_array.py,sha256=OypmqKf_ciigxK1X_W2b9sm0EWOA3wqH376QXt7oGCM,6237
 pysmt/test/test_back.py,sha256=3O7XTx4WfuizjT7-yueZq6oGG-uqovkie7R3A5GklTk,3372
 pysmt/test/test_bdd.py,sha256=GsFiq0YQd3exbN9k2fCurKZlvDl3H2VAucYc9tKGKEc,6195
 pysmt/test/test_bv.py,sha256=-pnOgslpMAeK9US4f_z4CU8LK0ZmDr-yceS1u1kwgps,12284
-pysmt/test/test_bv_simplification.py,sha256=R7cdr_Ob2TAQF-NG0Z3JtKApBif9e893xhWa0kX6Kbc,14511
-pysmt/test/test_cnf.py,sha256=eeIhziVmAI2Q8wFKlj0zkdMSvM_GKtu1-Up8nY_2cRk,3369
+pysmt/test/test_bv_simplification.py,sha256=gbXcSyjM9I9Zxlu5n43a66fW3RomarP2_DEj6IzYQTc,14637
+pysmt/test/test_cnf.py,sha256=_pYNU9y06o5dJNK3zg7TINDHjI6FMduSayn7fyyxVp0,3363
 pysmt/test/test_configuration.py,sha256=uyCmS8-cdeI844TGqmzHBlFPtHBJhT_mKrrWJUF0AN0,3757
 pysmt/test/test_constants.py,sha256=wdqc9duJ8Ykt1LCxy2CL3Mt_7Gal5-bCVL7QT5GHS3s,4618
-pysmt/test/test_cvc4_quantifiers.py,sha256=iFGkqpsHoDBgSS2VFTi9siT6fq9-ieipkpr_cIrA7xY,1851
+pysmt/test/test_cvc_quantifiers.py,sha256=a40NDyPKNynVpqq9M5pDTR8qFL_EumR8whw8escxP4I,1850
 pysmt/test/test_dwf.py,sha256=nQubO2IYjW3NnRjNz3xkhpXgK_5coZp9uZ_U-ElmFRw,2850
 pysmt/test/test_eager_model.py,sha256=hF9V8wQYXVeyW2Bo4sACa98xeJtfOMYjMvjWMHQaGag,3662
 pysmt/test/test_env.py,sha256=tshVfiKotjMUNXl0RCo7-itTnVJimWGPyMkuGHX_B6I,4118
@@ -81,28 +83,28 @@ pysmt/test/test_lira.py,sha256=1B4y1y2U-5CttF6h22tniJkAedUDIwjp1Ad0_Ha_s-8,2175
 pysmt/test/test_logics.py,sha256=Nppv0G7z0XIE8wHyWI3F04Vy1PY2iMVwvjyDcYBeS8A,6980
 pysmt/test/test_models.py,sha256=npqGoF-3DgAw0DTx6se32ZEZRFBJDcnkppzgyjLDbps,2748
 pysmt/test/test_native_qe.py,sha256=RGZgwbpAkPBTjIqcCbOkZ_nQXIDZ4Fznrr7Ldx6oA38,3439
-pysmt/test/test_nia.py,sha256=bYi1P3IVDPpsAKqMyV90wP-73lb_TgJCpOAj9RY2B_g,6500
-pysmt/test/test_nlira.py,sha256=T3d657oZeTP8wNkU_PdJOjywELnQT04B36OoMoVkokg,4795
+pysmt/test/test_nia.py,sha256=x51d0X5jnZnxTPvPLrlD0WilunZ5uNrDU4vWY78_xpU,6640
+pysmt/test/test_nlira.py,sha256=s2sTnkgYNxikMxyKkR9_0GJoRr017Dm7Bx8dbqgRpyw,4957
 pysmt/test/test_oracles.py,sha256=cHBPTUoi9cPmIvR-DG4bbzohOaBdUJzpKLoQXImxS_c,5615
-pysmt/test/test_portfolio.py,sha256=CNLuCfnf6PEAMJzLOiFTgm1-7qaEpGzafdoQwPvd2AY,7133
+pysmt/test/test_portfolio.py,sha256=k0Jdrdr-EX-BVCxqYNUS3YjC77aCpzzdhezjB8U3OCM,7125
 pysmt/test/test_printing.py,sha256=iKOSUrA3aOsG27RQ84fXNqsUGmVHcGgN8mt05ThVGAw,8749
-pysmt/test/test_qe.py,sha256=hX81DSq_05xti3e6f0KTHgYMAbd-sSYG6gSN3ds-cLI,7136
+pysmt/test/test_qe.py,sha256=k8zYX-lcij0ua9yuRXl7wErUklEgLSEh68QDpV8J9xs,7157
 pysmt/test/test_regressions.py,sha256=OHBptJUWQnUkXT17VH4z9Qea0QQeUF2v4sw_RYyottE,20119
-pysmt/test/test_rewritings.py,sha256=EZDYoFG965bxUy8CxzZRYAwPrZFQdZd509zQI6gU0Z4,15625
+pysmt/test/test_rewritings.py,sha256=1eeseDwZyQD2VrOFBABXHTYJFJOXszP4olbCNeLcwfA,15607
 pysmt/test/test_shannon_expansion.py,sha256=yaiZuB24wj1Zi-KdzRTmWuzAVaF9bQ603uto7zi6XBs,3082
-pysmt/test/test_simplify.py,sha256=EdBm2rGD9OzQ2t7cuWjO0oUvSsni6gWHi4GvGTxogls,7620
+pysmt/test/test_simplify.py,sha256=ckQn_DUxVvGspaRNZmSPHkudhpUlG5K2w6C0wDqhL1w,7620
 pysmt/test/test_size.py,sha256=p3aqCMHfBiGLxvF0P8hE-PRQTT8VMPIJCjblq8Txh1w,3261
-pysmt/test/test_solving.py,sha256=-Js6iSkgQjcL_bbWCMu-_3MxPY0IXjC8VR1XaHES8yQ,24929
+pysmt/test/test_solving.py,sha256=8x9dNHbICFzHmCLZDR_Nnm3ScRal6seGoRRA89uOB4w,24906
 pysmt/test/test_sorts.py,sha256=erfInyPH91WVB8JBUYLteTo5X5skKKP3vEXdUUKC-YE,6033
 pysmt/test/test_string.py,sha256=Y6VBfkLNKuePo8-HIzcwBH3eaYj0i-k1Y8tpFyw03zw,8096
 pysmt/test/test_typechecker.py,sha256=obrRf5LSkrZjw2Kn7B4WNWVUykE7c9tU3jW-dEteHBs,6977
 pysmt/test/test_unsat_cores.py,sha256=J-ip4SInZ9l96NCsLsKmvIiSI04hKpdyrPeKRh6b6aM,6563
 pysmt/test/test_walker_ext.py,sha256=4x6Ew522P_0fLpKRIL0_0igB4I3_VrWWA4juuqolhag,3522
 pysmt/test/test_walkers.py,sha256=AKVMvEUtMBht08bE1vCMaeMtdgGa6j_weDSHz_9Br3Q,9481
-pysmt/test/configs/config1.ini,sha256=qq5n3Y92zVrB2OPIQWsNZ--e9xZz2lptEA5WxTBYJks,224
+pysmt/test/configs/config1.ini,sha256=MAXPN6VVW-S7jpWmglMPN5a3JYgorTqKAF6cmfohMpo,224
 pysmt/test/configs/config_bad.ini,sha256=AOiZPmUcmAjVXOd5Bp4_euaYJG8EfccBy5iKUEcbxz8,88
 pysmt/test/smtlib/__init__.py,sha256=JXBHtcb4Lv-Sb8whc9JuGbRH2EBLWwtLUh3PL9HhNE8,650
-pysmt/test/smtlib/parser_utils.py,sha256=MpK9opJa3jPF-IsT7Bf79ihMXmwk7nL-b-k_ab2MU_8,8434
+pysmt/test/smtlib/parser_utils.py,sha256=1e1AnrVgHbjL-nKGz-vbJfvECMc2iNEnAwCEi1cia4o,8635
 pysmt/test/smtlib/test_annotations.py,sha256=AyL8tZUMySQgUOmT8UPB_dnEglWCOo5EXM6kQxL_I3o,6209
 pysmt/test/smtlib/test_fuzzed.py,sha256=pswc1F2ngXMZo-laFOs6pXnDg69JMfGPx1vMTsXdAX0,2124
 pysmt/test/smtlib/test_generic_wrapper.py,sha256=Gn_cWynRWAFqUcAWpRgmJlkkwHcqdnARZN0-blRwM-Q,7869
@@ -126,10 +128,10 @@ pysmt/walkers/dag.py,sha256=pUdVTZx7CQyjrAb6jMfmsqS07J4kiDqHU8R4_9UvwkQ,5352
 pysmt/walkers/generic.py,sha256=q1j1T2RvCeJn1PM0H5d8vNV4FTYAEQgT7h8X5DJhDf8,4534
 pysmt/walkers/identitydag.py,sha256=f_D5qA198ayd3QO4u59fBX1RS_UiSBnPeV9O3ULvQv0,8737
 pysmt/walkers/tree.py,sha256=WIWN9IM0riWkaD40iP4Tt3BCN21iSdE1S7gRZqy56SU,2846
-PySMT-0.9.6.dev65.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-PySMT-0.9.6.dev65.dist-info/METADATA,sha256=lErOlhhLoCLJ-b8szGDX-NEyr6gIfkIZEViS-Zfz0IE,1620
-PySMT-0.9.6.dev65.dist-info/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
-PySMT-0.9.6.dev65.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-PySMT-0.9.6.dev65.dist-info/entry_points.txt,sha256=si0hIk-v3V35G3p8QGINoQ4QW-v4RYDRqj-asgyCgeM,58
-PySMT-0.9.6.dev65.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
-PySMT-0.9.6.dev65.dist-info/RECORD,,
+PySMT-0.9.7.dev104.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+PySMT-0.9.7.dev104.dist-info/METADATA,sha256=xEPujFNbAZvFTwyiKqBow_Dtv_F6ldODqPdWvXP-txM,1617
+PySMT-0.9.7.dev104.dist-info/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
+PySMT-0.9.7.dev104.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+PySMT-0.9.7.dev104.dist-info/entry_points.txt,sha256=si0hIk-v3V35G3p8QGINoQ4QW-v4RYDRqj-asgyCgeM,58
+PySMT-0.9.7.dev104.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
+PySMT-0.9.7.dev104.dist-info/RECORD,,

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/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/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/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/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/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/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/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/cmd/installers/z3.py

@@ -24,62 +24,15 @@ class Z3Installer(SolverInstaller):
     SOLVER = "z3"
 
     def __init__(self, install_dir, bindings_dir, solver_version,
-                 mirror_link=None, osx=None, git_version=None, commit=None):
-        arch = self.architecture
-        if arch == "x86_64":
-            arch = "x64"
-
-        system = self.os_name
-        if system == "linux":
-            system = "glibc-2.31"
-        elif system == "darwin":
-            system = "osx-%s" % osx
-        elif system == "windows":
-            system = "win"
-
-        if git_version is None:
-            # Stable versions template
-            if commit:
-                archive_name = "z3-%s.%s-%s-%s.zip" % (solver_version, commit, arch, system)
-            else:
-                archive_name = "z3-%s-%s-%s.zip"  % (solver_version, arch, system)
-            native_link = "https://github.com/Z3Prover/z3/releases/download/z3-" + solver_version + "/{archive_name}"
-            # print(native_link)
-        else:
-            # Nightly build template
-            archive_name = "z3-%s.%s-%s-%s.zip" % (solver_version, git_version, arch, system)
-            native_link = "https://github.com/pysmt/Z3bin/blob/master/nightly/{archive_name}?raw=true"
+                 mirror_link=None):
 
         SolverInstaller.__init__(self, install_dir=install_dir,
                                  bindings_dir=bindings_dir,
                                  solver_version=solver_version,
-                                 archive_name=archive_name,
-                                 native_link=native_link,
                                  mirror_link=mirror_link)
 
-    def move(self):
-        bpath = os.path.join(self.extract_path, "bin")
-        libfiles = []
-        if self.os_name == "linux":
-            libfiles += glob.glob(bpath + '/*.so')
-        elif self.os_name == "darwin":
-            libfiles += glob.glob(bpath + '/*.a')
-            libfiles += glob.glob(bpath + '/*.dylib')
-        elif self.os_name == "windows":
-            libfiles += glob.glob(bpath + '/*.dll')
-            libfiles += glob.glob(bpath + '/*.lib')
-
-        SolverInstaller.mv(os.path.join(bpath, "python/z3"), self.bindings_dir)
-
-        # z3 will check for shared libraries in z3/lib, before builtins.Z3_LIB_DIRS,
-        # and Z3_LIBRARY_PATH env var lookup (or OS-level LD_LIBRARY_PATH)
-        # (see z3/z3core.py)
-        libpath = os.path.join(self.bindings_dir, "z3/lib/")
-        if not os.path.exists(libpath):
-            os.mkdir(libpath)
-
-        for f in libfiles:
-            SolverInstaller.mv(f, libpath)
+    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/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/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/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/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')