diff --git a/Makefile b/Makefile index b3c3a21cd..e97660e52 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ OPEN_PR="true" # Force the installation of a Concrete Python version, which is very useful with nightly versions # /!\ WARNING /!\: This version should NEVER be a wildcard as it might create some # issues when trying to run it in the future. -CONCRETE_PYTHON_VERSION="concrete-python==2.8.0rc1" +CONCRETE_PYTHON_VERSION="concrete-python==2.7.0" # Force the installation of Concrete Python's latest version, release-candidates included # CONCRETE_PYTHON_VERSION="$$(poetry run python \ diff --git a/deps_licenses/licenses_linux_user.txt b/deps_licenses/licenses_linux_user.txt index ed5b1a4a0..9f1f80f95 100644 --- a/deps_licenses/licenses_linux_user.txt +++ b/deps_licenses/licenses_linux_user.txt @@ -4,10 +4,10 @@ brevitas, 0.8.0, UNKNOWN certifi, 2024.6.2, Mozilla Public License 2.0 (MPL 2.0) charset-normalizer, 3.3.2, MIT License coloredlogs, 15.0.1, MIT License -concrete-python, 2.8.0rc1, BSD-3-Clause +concrete-python, 2.7.0, BSD-3-Clause dependencies, 2.0.1, BSD License dill, 0.3.8, BSD License -filelock, 3.15.1, The Unlicense (Unlicense) +filelock, 3.15.3, The Unlicense (Unlicense) flatbuffers, 24.3.25, Apache Software License fsspec, 2024.6.0, BSD License huggingface-hub, 0.23.4, Apache Software License @@ -16,7 +16,7 @@ hummingbird-ml, 0.4.8, MIT License idna, 3.7, BSD License importlib_resources, 6.4.0, Apache Software License joblib, 1.4.2, BSD License -jsonpickle, 3.2.1, BSD License +jsonpickle, 3.2.2, BSD License mpmath, 1.3.0, BSD License networkx, 3.1, BSD License numpy, 1.23.5, BSD License diff --git a/deps_licenses/licenses_linux_user.txt.md5 b/deps_licenses/licenses_linux_user.txt.md5 index 47f967209..4dfc9a891 100644 --- a/deps_licenses/licenses_linux_user.txt.md5 +++ b/deps_licenses/licenses_linux_user.txt.md5 @@ -1 +1 @@ -997c88b08ca43aa4847861a77bd073d4 +adb925c3b7be3e651975febcf49b6543 diff --git a/deps_licenses/licenses_mac_intel_user.txt b/deps_licenses/licenses_mac_intel_user.txt index 323609b40..66c655689 100644 --- a/deps_licenses/licenses_mac_intel_user.txt +++ b/deps_licenses/licenses_mac_intel_user.txt @@ -4,10 +4,10 @@ brevitas, 0.8.0, UNKNOWN certifi, 2024.6.2, Mozilla Public License 2.0 (MPL 2.0) charset-normalizer, 3.3.2, MIT License coloredlogs, 15.0.1, MIT License -concrete-python, 2.8.0rc1, BSD-3-Clause +concrete-python, 2.7.0, BSD-3-Clause dependencies, 2.0.1, BSD License dill, 0.3.8, BSD License -filelock, 3.15.1, The Unlicense (Unlicense) +filelock, 3.15.3, The Unlicense (Unlicense) flatbuffers, 24.3.25, Apache Software License fsspec, 2024.6.0, BSD License huggingface-hub, 0.23.4, Apache Software License @@ -16,7 +16,7 @@ hummingbird-ml, 0.4.8, MIT License idna, 3.7, BSD License importlib_resources, 6.4.0, Apache Software License joblib, 1.4.2, BSD License -jsonpickle, 3.2.1, BSD License +jsonpickle, 3.2.2, BSD License mpmath, 1.3.0, BSD License networkx, 3.1, BSD License numpy, 1.23.5, BSD License diff --git a/deps_licenses/licenses_mac_intel_user.txt.md5 b/deps_licenses/licenses_mac_intel_user.txt.md5 index 47f967209..4dfc9a891 100644 --- a/deps_licenses/licenses_mac_intel_user.txt.md5 +++ b/deps_licenses/licenses_mac_intel_user.txt.md5 @@ -1 +1 @@ -997c88b08ca43aa4847861a77bd073d4 +adb925c3b7be3e651975febcf49b6543 diff --git a/deps_licenses/licenses_mac_silicon_user.txt b/deps_licenses/licenses_mac_silicon_user.txt index 323609b40..66c655689 100644 --- a/deps_licenses/licenses_mac_silicon_user.txt +++ b/deps_licenses/licenses_mac_silicon_user.txt @@ -4,10 +4,10 @@ brevitas, 0.8.0, UNKNOWN certifi, 2024.6.2, Mozilla Public License 2.0 (MPL 2.0) charset-normalizer, 3.3.2, MIT License coloredlogs, 15.0.1, MIT License -concrete-python, 2.8.0rc1, BSD-3-Clause +concrete-python, 2.7.0, BSD-3-Clause dependencies, 2.0.1, BSD License dill, 0.3.8, BSD License -filelock, 3.15.1, The Unlicense (Unlicense) +filelock, 3.15.3, The Unlicense (Unlicense) flatbuffers, 24.3.25, Apache Software License fsspec, 2024.6.0, BSD License huggingface-hub, 0.23.4, Apache Software License @@ -16,7 +16,7 @@ hummingbird-ml, 0.4.8, MIT License idna, 3.7, BSD License importlib_resources, 6.4.0, Apache Software License joblib, 1.4.2, BSD License -jsonpickle, 3.2.1, BSD License +jsonpickle, 3.2.2, BSD License mpmath, 1.3.0, BSD License networkx, 3.1, BSD License numpy, 1.23.5, BSD License diff --git a/deps_licenses/licenses_mac_silicon_user.txt.md5 b/deps_licenses/licenses_mac_silicon_user.txt.md5 index 47f967209..4dfc9a891 100644 --- a/deps_licenses/licenses_mac_silicon_user.txt.md5 +++ b/deps_licenses/licenses_mac_silicon_user.txt.md5 @@ -1 +1 @@ -997c88b08ca43aa4847861a77bd073d4 +adb925c3b7be3e651975febcf49b6543 diff --git a/poetry.lock b/poetry.lock index a1b9012ad..6cf1a99bf 100644 --- a/poetry.lock +++ b/poetry.lock @@ -800,23 +800,23 @@ test = ["pytest"] [[package]] name = "concrete-python" -version = "2.8.0rc1" +version = "2.7.0" description = "A state-of-the-art homomorphic encryption framework" optional = false python-versions = ">=3.8" files = [ - {file = "concrete_python-2.8.0rc1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3a98d9b8daab119517911a80b1b1b0cc885e1ab112e2352f791916b252b07b88"}, - {file = "concrete_python-2.8.0rc1-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:64c5a25463233ab119d51ff8ce286de1ec22c1c734dd22e1ab7de6bdc885ae8b"}, - {file = "concrete_python-2.8.0rc1-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:c1a6fc9a6265dd9fca8541a52a85a0bc4fa41d123ba41edfc898b7cd998ceac5"}, - {file = "concrete_python-2.8.0rc1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e1fa3d06da600b4497f4c448930359e7dcc46c0b14a11a75c291c4732d21bb94"}, - {file = "concrete_python-2.8.0rc1-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:9c51b14ca11cfb7ee94a00737fe200eeb0c7348b6fb0387ef5e8acd80a46d64c"}, - {file = "concrete_python-2.8.0rc1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:c5222b028ef7572ecc2dbf30f6878f2673ffdb7465d71ba20ee6f577bb179f1b"}, - {file = "concrete_python-2.8.0rc1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:8d8c3c6c07729cce361f1279b0d56510b7b7f6268a2c51e5833c65a067592c97"}, - {file = "concrete_python-2.8.0rc1-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:8f5dc3efdf9b5df56f2800bf29ccbca89e624e4a91b43e13194a9c3f83af5740"}, - {file = "concrete_python-2.8.0rc1-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:ceea590ef4f38cb8880c03cb218a7bd802ae90cc5398bfae95b2ae6d06987bde"}, - {file = "concrete_python-2.8.0rc1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:67049b284d725f0a06af431490bcce341fc77bbbb689f5b28d4a36e2d4ba8f35"}, - {file = "concrete_python-2.8.0rc1-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:4e01942ad43d25cf540a6eb9d175efb96926a35ac95a4feb4309689c7b14bd20"}, - {file = "concrete_python-2.8.0rc1-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:eb85b461e67a8ef945b2f4e697202b6d96e9980b534576f3d057fa29dab3b3d4"}, + {file = "concrete_python-2.7.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:05efb76ec4e6b6922bfb1b45ffb0ea89d6d01349a39e99c70f76f267876779c7"}, + {file = "concrete_python-2.7.0-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5fff285dda24eaacbde0b81efa658b191920958933fb1c01aa001fa04464435a"}, + {file = "concrete_python-2.7.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:d28f4a6b74ec752214f544589ea5e0095c51f31feb961ce04c9161aed7fe0fd3"}, + {file = "concrete_python-2.7.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:61c1c50388057e59123d9a66697c944be88220c01f936d98f8741970e6455387"}, + {file = "concrete_python-2.7.0-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:ae7d70af82cb22938b2f3b3c3fea5dff840c0084cf5150d4cc272c9afd652d0b"}, + {file = "concrete_python-2.7.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:f770d473f51d5378869f351df50d63ceb5668d2743755ca1dac6be009948af80"}, + {file = "concrete_python-2.7.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:61721b517f35294d14edd41a5afe905ad72d2a5bbcf540ead374522ee2f4a605"}, + {file = "concrete_python-2.7.0-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:0d6f7c28529f4a83ce373b76839779a0be3c8a7c7069f8bd3f2235b84049266e"}, + {file = "concrete_python-2.7.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:ec7b911fc5c546b73d62a07150fdbafd819d94972749c63ce746eba820fc4292"}, + {file = "concrete_python-2.7.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ed13b050ce4c5e80105e34e848ec4da63ae9a2b257f53199f7bc5638c907136d"}, + {file = "concrete_python-2.7.0-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:a836384147b996870dfc18f5ce2bb14c013a1d6b7a9ac27c71767f18d829247a"}, + {file = "concrete_python-2.7.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:ac729b747a444d6efb0c13012a48902a471e920b8f0af3dfb03b057387d727f8"}, ] [package.dependencies] @@ -832,11 +832,6 @@ z3-solver = ">=4.12" dev = ["auditwheel (==5.3.0)", "black (==24.4.0)", "delocate (==0.10.4)", "isort (==5.12.0)", "matplotlib (>=3.7)", "mypy (==1.10.0)", "pillow (>=10.2)", "pybind11 (==2.10.4)", "pydocstyle (==6.3.0)", "pygraphviz (>=1.11)", "pylint (==2.17.1)", "pytest (==7.2.2)", "pytest-cov (==4.0.0)", "pytest-randomly (==3.15.0)", "pytest-xdist (==3.2.1)", "ruff (==0.0.259)", "wheel (==0.40.0)"] full = ["matplotlib (>=3.7)", "pillow (>=10.2)", "pygraphviz (>=1.11)"] -[package.source] -type = "legacy" -url = "https://pypi.zama.ai/cpu" -reference = "zama-pypi-cpu" - [[package]] name = "contourpy" version = "1.1.1" @@ -1256,18 +1251,18 @@ devel = ["colorama", "json-spec", "jsonschema", "pylint", "pytest", "pytest-benc [[package]] name = "filelock" -version = "3.15.1" +version = "3.15.3" description = "A platform independent file lock." optional = false python-versions = ">=3.8" files = [ - {file = "filelock-3.15.1-py3-none-any.whl", hash = "sha256:71b3102950e91dfc1bb4209b64be4dc8854f40e5f534428d8684f953ac847fac"}, - {file = "filelock-3.15.1.tar.gz", hash = "sha256:58a2549afdf9e02e10720eaa4d4470f56386d7a6f72edd7d0596337af8ed7ad8"}, + {file = "filelock-3.15.3-py3-none-any.whl", hash = "sha256:0151273e5b5d6cf753a61ec83b3a9b7d8821c39ae9af9d7ecf2f9e2f17404103"}, + {file = "filelock-3.15.3.tar.gz", hash = "sha256:e1199bf5194a2277273dacd50269f0d87d0682088a3c561c15674ea9005d8635"}, ] [package.extras] docs = ["furo (>=2023.9.10)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8.0.1)", "pytest (>=7.4.3)", "pytest-asyncio (>=0.21)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8.0.1)", "pytest (>=7.4.3)", "pytest-asyncio (>=0.21)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)", "virtualenv (>=20.26.2)"] typing = ["typing-extensions (>=4.8)"] [[package]] @@ -2193,13 +2188,13 @@ files = [ [[package]] name = "jsonpickle" -version = "3.2.1" +version = "3.2.2" description = "Python library for serializing arbitrary object graphs into JSON" optional = false python-versions = ">=3.7" files = [ - {file = "jsonpickle-3.2.1-py3-none-any.whl", hash = "sha256:ec291e4719674dd35d390fbdb521ac6517fbe9f541d361c8bffc8131133b1661"}, - {file = "jsonpickle-3.2.1.tar.gz", hash = "sha256:4b6d7640974199f7acf9035295365b5a1a71a91109effa15ba170fbb48cf871c"}, + {file = "jsonpickle-3.2.2-py3-none-any.whl", hash = "sha256:87cd82d237fd72c5a34970e7222dddc0accc13fddf49af84111887ed9a9445aa"}, + {file = "jsonpickle-3.2.2.tar.gz", hash = "sha256:d425fd2b8afe9f5d7d57205153403fbf897782204437882a477e8eed60930f8c"}, ] [package.extras] @@ -7313,4 +7308,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.11" -content-hash = "b85578cf8a5fbf29d49ad9bfda9bd4d0b4d7a8c16989c11cfd50bdb9584c7298" +content-hash = "0154834379e9d9c6d5d8658aa5ea2ec3b5d44312f5e7d2e6717e872609d65d9b" diff --git a/pyproject.toml b/pyproject.toml index 5e80a3c83..180352c74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,11 @@ readme = "README.md" # Investigate if it is better to fix specific versions or use lower and upper bounds # FIXME: https://github.com/zama-ai/concrete-ml-internal/issues/2665 python = ">=3.8.1,<3.11" -concrete-python = {version="==2.8.0rc1", source = "zama-pypi-cpu"} +# Based on the following link, explicitly indicating the source makes poetry only look for that +# source, so we should only use this for Concrete Python's non-public releases +# https://python-poetry.org/docs/1.7/repositories#project-configuration +# concrete-python = {version="==2.7.0", source = "zama-pypi-cpu"} +concrete-python = "2.7.0" setuptools = "65.6.3" skops = {version = "0.5.0"} xgboost = "1.6.2"