From b3f892da4c8f4f6b5ee18f54c0693e63a754ba9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordan=20Fr=C3=A9ry?= Date: Fri, 29 Sep 2023 11:38:33 +0200 Subject: [PATCH] chore: update to CP 2.4.0 --- Makefile | 2 +- deps_licenses/licenses_linux_user.txt | 2 +- deps_licenses/licenses_linux_user.txt.md5 | 2 +- poetry.lock | 33 +++++++++++------------ pyproject.toml | 3 +-- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index c7f681116..cf441033f 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ OPEN_PR="true" # If one wants to force the installation of a given rc version # /!\ WARNING /!\: This version should NEVER be a wildcard as it might create some # issues when trying to run it in the future. -CP_VERSION_SPEC_FOR_RC="concrete-python==2.4.0rc1" +CP_VERSION_SPEC_FOR_RC="concrete-python==2.4.0" # If one wants to use the last RC version # CP_VERSION_SPEC_FOR_RC="$$(poetry run python \ diff --git a/deps_licenses/licenses_linux_user.txt b/deps_licenses/licenses_linux_user.txt index 15ccaca94..94dddb0ce 100644 --- a/deps_licenses/licenses_linux_user.txt +++ b/deps_licenses/licenses_linux_user.txt @@ -9,7 +9,7 @@ certifi, 2023.7.22, Mozilla Public License 2.0 (MPL 2.0) charset-normalizer, 3.2.0, MIT License click, 8.1.7, BSD License coloredlogs, 15.0.1, MIT License -concrete-python, 2.4.0rc1, BSD-3-Clause +concrete-python, 2.4.0, BSD-3-Clause dependencies, 2.0.1, BSD License dill, 0.3.7, BSD License exceptiongroup, 1.1.3, MIT License diff --git a/deps_licenses/licenses_linux_user.txt.md5 b/deps_licenses/licenses_linux_user.txt.md5 index a1e7515a2..f0ff1e35e 100644 --- a/deps_licenses/licenses_linux_user.txt.md5 +++ b/deps_licenses/licenses_linux_user.txt.md5 @@ -1 +1 @@ -60ba8097c49614bc52a447b05062107f +5ea389d8b97dc534603abf9b77ff8a40 diff --git a/poetry.lock b/poetry.lock index a80add681..1c3281e27 100644 --- a/poetry.lock +++ b/poetry.lock @@ -445,7 +445,7 @@ typing = ["mypy (>=0.990)"] [[package]] name = "concrete-python" -version = "2.2.0" +version = "2.4.0" description = "A state-of-the-art homomorphic encryption framework" category = "main" optional = false @@ -459,7 +459,7 @@ torch = ">=1.13" z3-solver = ">=4.12" [package.extras] -dev = ["auditwheel (==5.3.0)", "black (==23.1.0)", "delocate (==0.10.4)", "isort (==5.12.0)", "mypy (==1.1.1)", "pybind11 (==2.10.4)", "pydocstyle (==6.3.0)", "pylint (==2.17.1)", "pytest (==7.2.2)", "pytest-cov (==4.0.0)", "pytest-xdist (==3.2.1)", "ruff (==0.0.259)", "wheel (==0.40.0)"] +dev = ["auditwheel (==5.3.0)", "black (==23.1.0)", "delocate (==0.10.4)", "isort (==5.12.0)", "mypy (==1.1.1)", "pybind11 (==2.10.4)", "pydocstyle (==6.3.0)", "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)"] [[package]] name = "contourpy" @@ -4303,7 +4303,7 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "1.1" python-versions = ">=3.8.1,<3.11" -content-hash = "9e055f01706280945a64d8293dab8e1e822aab0a865ec006dca0ae0260be2b11" +content-hash = "24a88ab121e893df3d89ccc18393b88b18fd57eb9bf95a1dab54828fe59d3743" [metadata.files] absl-py = [ @@ -4692,18 +4692,18 @@ comm = [ {file = "comm-0.1.4.tar.gz", hash = "sha256:354e40a59c9dd6db50c5cc6b4acc887d82e9603787f83b68c01a80a923984d15"}, ] concrete-python = [ - {file = "concrete_python-2.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:db9128634dcbbc9c74f6eefd688fabfea2b4144b8e7b30db8d57d232c8d75747"}, - {file = "concrete_python-2.2.0-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5615ff90aa828a073cc2e283cc23e6bd0124b509b29318b070687931e801f714"}, - {file = "concrete_python-2.2.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:5b97d661a99282abd65e84f709fd0728de9940c5250b9077fec208ef2ad98793"}, - {file = "concrete_python-2.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:126bbd5ad2066a5c052f65def6ca6261e8c42d5892908071164f871fdff4245c"}, - {file = "concrete_python-2.2.0-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:c0b226e5e7ebf82c6df1e90f37f6281dd60c4d95d6d5029c663bc73d916121c1"}, - {file = "concrete_python-2.2.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:b11b5a5b0d02cc9cd1b9fe0d8e6f91201d7bf10dc3681c6b6c9e8ac3b874fcd9"}, - {file = "concrete_python-2.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:80ca3281530fd11e54c778c47166fb711f45cc8499be78fab7ffb2ac51aa65c8"}, - {file = "concrete_python-2.2.0-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:ab982563fcdca457a9c36ccef9af83eff5409bb951a250c07948b44b626063a4"}, - {file = "concrete_python-2.2.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:9d24194ff858eea7bd503b0fc2c5fa23a20b8b3026e04677882a3add663b1e84"}, - {file = "concrete_python-2.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9ce9cafde72e4e1e018f8cfaee744943b7c736ca7bba329f49a2ed94ec3c532b"}, - {file = "concrete_python-2.2.0-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:fcf5c32ad552f8b25b73ecc31f0c23e5ea39187233d50de1971c7e3473523f0c"}, - {file = "concrete_python-2.2.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:41d552f41977d83f3a39d78ff77644ebad2305f313509a9d4d8faf32c519eae2"}, + {file = "concrete_python-2.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:417f7e3cd7027e09a9da0d19d41067200b8073d6f3d80ca4792113184ff4a7cd"}, + {file = "concrete_python-2.4.0-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:6f86b4ed1f25c0d0fe26e38bb910704704ee32f1e0d59491141e19c693adf3b3"}, + {file = "concrete_python-2.4.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:1e3dd30ce85b48cb76e3ed0f7ce6fbff402d21117d2a077b8e5f1eb9595b0cdb"}, + {file = "concrete_python-2.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ad3164ae77962a8f5e6b03e88e1d436015148b35ba2a594f9dc7ca63e7c5a5bf"}, + {file = "concrete_python-2.4.0-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:185ac9fe385dfc783fc0864777118f7e7ac389f823302df84f62d7de6527a1a4"}, + {file = "concrete_python-2.4.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:f5a9bac76e6b4d28f36a2eb41dad6bbdeabb9629408a6b902aa42b58e9ee5a1f"}, + {file = "concrete_python-2.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:712b3b66afc8b05c724f3dd6c1ae075cf915de7ef78306b75cd30c7c6d5f730e"}, + {file = "concrete_python-2.4.0-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:fd96a527d09ab53a86605f28f387b846656a83ad7635c2b32be1c85a7cfb1383"}, + {file = "concrete_python-2.4.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:7bf22485cc7e32e1b75c11bef1e353a1f56183af722cfc7ef5de7f49689e49df"}, + {file = "concrete_python-2.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:14d36ef65016cd6cb3e3b48fe071a010e3c06760cd24ffb9ecccfb81b6bb57da"}, + {file = "concrete_python-2.4.0-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:401351d95ef1123656f5b6c0bc1a666c8d82e49d35da36876ec4d5476b7f323b"}, + {file = "concrete_python-2.4.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:f7ba1684ec0bff6a964340dd9a0a7781bf0b288baabd2ec1c2f7eb6b8e4b0439"}, ] contourpy = [ {file = "contourpy-1.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:89f06eff3ce2f4b3eb24c1055a26981bffe4e7264acd86f15b97e40530b794bc"}, @@ -6772,8 +6772,7 @@ ruamel-yaml-clib = [ {file = "ruamel.yaml.clib-0.2.7-cp310-cp310-win32.whl", hash = "sha256:763d65baa3b952479c4e972669f679fe490eee058d5aa85da483ebae2009d231"}, {file = "ruamel.yaml.clib-0.2.7-cp310-cp310-win_amd64.whl", hash = "sha256:d000f258cf42fec2b1bbf2863c61d7b8918d31ffee905da62dede869254d3b8a"}, {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:045e0626baf1c52e5527bd5db361bc83180faaba2ff586e763d3d5982a876a9e"}, - {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-macosx_13_0_arm64.whl", hash = "sha256:1a6391a7cabb7641c32517539ca42cf84b87b667bad38b78d4d42dd23e957c81"}, - {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-manylinux2014_aarch64.whl", hash = "sha256:9c7617df90c1365638916b98cdd9be833d31d337dbcd722485597b43c4a215bf"}, + {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-macosx_12_6_arm64.whl", hash = "sha256:721bc4ba4525f53f6a611ec0967bdcee61b31df5a56801281027a3a6d1c2daf5"}, {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:41d0f1fa4c6830176eef5b276af04c89320ea616655d01327d5ce65e50575c94"}, {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-win32.whl", hash = "sha256:f6d3d39611ac2e4f62c3128a9eed45f19a6608670c5a2f4f07f24e8de3441d38"}, {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-win_amd64.whl", hash = "sha256:da538167284de58a52109a9b89b8f6a53ff8437dd6dc26d33b57bf6699153122"}, diff --git a/pyproject.toml b/pyproject.toml index ac358f065..fa77a1d92 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,8 +34,7 @@ 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" -# FIXME: https://github.com/zama-ai/concrete-ml-internal/issues/3379 -concrete-python = "2.2.0" +concrete-python = "2.4.0" setuptools = "65.6.3" skops = {version = "0.5.0"} xgboost = "1.6.2"