From 27efc79c7f7c9aeba0ed10bbeab4bd9b9d004400 Mon Sep 17 00:00:00 2001 From: Luis Montero Date: Tue, 14 May 2024 17:03:20 +0200 Subject: [PATCH] chore: update cp version to 2.6.2 For now we target Zama's index but once 2.6.2 is on pypi we'll need to change it (it will just be about removing the source argument from pyproject.toml). --- Makefile | 2 +- deps_licenses/licenses_linux_user.txt | 2 +- deps_licenses/licenses_linux_user.txt.md5 | 2 +- deps_licenses/licenses_mac_intel_user.txt | 22 ++++----- deps_licenses/licenses_mac_intel_user.txt.md5 | 2 +- deps_licenses/licenses_mac_silicon_user.txt | 25 +++++----- .../licenses_mac_silicon_user.txt.md5 | 2 +- poetry.lock | 49 ++++++++++--------- pyproject.toml | 12 ++++- 9 files changed, 66 insertions(+), 52 deletions(-) diff --git a/Makefile b/Makefile index fd9c074313..e845941d16 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==2024.4.19" +CONCRETE_PYTHON_VERSION="concrete-python==2.6.2" # 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 c1c4945e25..e9fb17a126 100644 --- a/deps_licenses/licenses_linux_user.txt +++ b/deps_licenses/licenses_linux_user.txt @@ -4,7 +4,7 @@ brevitas, 0.8.0, UNKNOWN certifi, 2023.7.22, Mozilla Public License 2.0 (MPL 2.0) charset-normalizer, 3.3.2, MIT License coloredlogs, 15.0.1, MIT License -concrete-python, 2024.4.19, BSD-3-Clause +concrete-python, 2.6.2, BSD-3-Clause dependencies, 2.0.1, BSD License dill, 0.3.8, BSD License filelock, 3.13.4, The Unlicense (Unlicense) diff --git a/deps_licenses/licenses_linux_user.txt.md5 b/deps_licenses/licenses_linux_user.txt.md5 index 5df5e4ac15..4931f36711 100644 --- a/deps_licenses/licenses_linux_user.txt.md5 +++ b/deps_licenses/licenses_linux_user.txt.md5 @@ -1 +1 @@ -cc53b7f93bbbf99ecdcc0a67cbbf64b2 +1d94a45abceb980d2095153cf7887886 diff --git a/deps_licenses/licenses_mac_intel_user.txt b/deps_licenses/licenses_mac_intel_user.txt index db194acd7e..48f32f5e81 100644 --- a/deps_licenses/licenses_mac_intel_user.txt +++ b/deps_licenses/licenses_mac_intel_user.txt @@ -1,28 +1,28 @@ Name, Version, License PyYAML, 6.0.1, MIT License brevitas, 0.8.0, UNKNOWN -certifi, 2024.2.2, Mozilla Public License 2.0 (MPL 2.0) +certifi, 2023.7.22, Mozilla Public License 2.0 (MPL 2.0) charset-normalizer, 3.3.2, MIT License coloredlogs, 15.0.1, MIT License -concrete-python, 2024.4.19, BSD-3-Clause +concrete-python, 2.6.2, BSD-3-Clause dependencies, 2.0.1, BSD License dill, 0.3.8, BSD License -filelock, 3.14.0, The Unlicense (Unlicense) +filelock, 3.13.4, The Unlicense (Unlicense) flatbuffers, 24.3.25, Apache Software License fsspec, 2024.3.1, BSD License huggingface-hub, 0.22.2, Apache Software License humanfriendly, 10.0, MIT License -hummingbird-ml, 0.4.11, MIT License +hummingbird-ml, 0.4.8, MIT License idna, 3.7, BSD License importlib_resources, 6.4.0, Apache Software License joblib, 1.4.0, BSD License jsonpickle, 3.0.4, BSD License mpmath, 1.3.0, BSD License networkx, 3.1, BSD License -numpy, 1.24.3, BSD License -onnx, 1.16.0, Apache License v2.0 +numpy, 1.23.5, BSD License +onnx, 1.15.0, Apache License v2.0 onnxconverter-common, 1.13.0, MIT License -onnxmltools, 1.12.0, Apache Software License +onnxmltools, 1.11.0, Apache Software License onnxoptimizer, 0.3.13, Apache License v2.0 onnxruntime, 1.17.3, MIT License packaging, 24.0, Apache Software License; BSD License @@ -32,19 +32,19 @@ psutil, 5.9.8, BSD License python-dateutil, 2.9.0.post0, Apache Software License; BSD License pytz, 2024.1, MIT License requests, 2.31.0, Apache Software License -scikit-learn, 1.3.2, BSD License +scikit-learn, 1.1.3, BSD License scipy, 1.10.1, BSD License six, 1.16.0, MIT License -skl2onnx, 1.16.0, Apache Software License +skl2onnx, 1.12, Apache Software License skops, 0.5.0, MIT skorch, 0.11.0, new BSD 3-Clause sympy, 1.12, BSD License tabulate, 0.8.10, MIT License -threadpoolctl, 3.5.0, BSD License +threadpoolctl, 3.4.0, BSD License torch, 1.13.1, BSD License tqdm, 4.66.2, MIT License; Mozilla Public License 2.0 (MPL 2.0) typing_extensions, 4.5.0, Python Software Foundation License tzdata, 2024.1, Apache Software License urllib3, 2.2.1, MIT License -xgboost, 1.7.6, Apache Software License +xgboost, 1.6.2, Apache Software License z3-solver, 4.13.0.0, MIT License diff --git a/deps_licenses/licenses_mac_intel_user.txt.md5 b/deps_licenses/licenses_mac_intel_user.txt.md5 index 0aa27f999d..4931f36711 100644 --- a/deps_licenses/licenses_mac_intel_user.txt.md5 +++ b/deps_licenses/licenses_mac_intel_user.txt.md5 @@ -1 +1 @@ -7be80ba54850fbc203015560c8acb9a8 +1d94a45abceb980d2095153cf7887886 diff --git a/deps_licenses/licenses_mac_silicon_user.txt b/deps_licenses/licenses_mac_silicon_user.txt index db194acd7e..0f270978df 100644 --- a/deps_licenses/licenses_mac_silicon_user.txt +++ b/deps_licenses/licenses_mac_silicon_user.txt @@ -1,28 +1,28 @@ Name, Version, License PyYAML, 6.0.1, MIT License brevitas, 0.8.0, UNKNOWN -certifi, 2024.2.2, Mozilla Public License 2.0 (MPL 2.0) +certifi, 2023.7.22, Mozilla Public License 2.0 (MPL 2.0) charset-normalizer, 3.3.2, MIT License coloredlogs, 15.0.1, MIT License -concrete-python, 2024.4.19, BSD-3-Clause +concrete-python, 2.6.2, BSD-3-Clause dependencies, 2.0.1, BSD License dill, 0.3.8, BSD License -filelock, 3.14.0, The Unlicense (Unlicense) +filelock, 3.13.4, The Unlicense (Unlicense) flatbuffers, 24.3.25, Apache Software License fsspec, 2024.3.1, BSD License huggingface-hub, 0.22.2, Apache Software License humanfriendly, 10.0, MIT License -hummingbird-ml, 0.4.11, MIT License +hummingbird-ml, 0.4.8, MIT License idna, 3.7, BSD License importlib_resources, 6.4.0, Apache Software License joblib, 1.4.0, BSD License jsonpickle, 3.0.4, BSD License mpmath, 1.3.0, BSD License networkx, 3.1, BSD License -numpy, 1.24.3, BSD License -onnx, 1.16.0, Apache License v2.0 +numpy, 1.23.5, BSD License +onnx, 1.15.0, Apache License v2.0 onnxconverter-common, 1.13.0, MIT License -onnxmltools, 1.12.0, Apache Software License +onnxmltools, 1.11.0, Apache Software License onnxoptimizer, 0.3.13, Apache License v2.0 onnxruntime, 1.17.3, MIT License packaging, 24.0, Apache Software License; BSD License @@ -31,20 +31,21 @@ protobuf, 3.20.3, BSD-3-Clause psutil, 5.9.8, BSD License python-dateutil, 2.9.0.post0, Apache Software License; BSD License pytz, 2024.1, MIT License -requests, 2.31.0, Apache Software License -scikit-learn, 1.3.2, BSD License +requests, 2.32.1, Apache Software License +scikit-learn, 1.1.3, BSD License scipy, 1.10.1, BSD License six, 1.16.0, MIT License -skl2onnx, 1.16.0, Apache Software License +skl2onnx, 1.12, Apache Software License skops, 0.5.0, MIT skorch, 0.11.0, new BSD 3-Clause sympy, 1.12, BSD License tabulate, 0.8.10, MIT License -threadpoolctl, 3.5.0, BSD License +threadpoolctl, 3.4.0, BSD License torch, 1.13.1, BSD License tqdm, 4.66.2, MIT License; Mozilla Public License 2.0 (MPL 2.0) typing_extensions, 4.5.0, Python Software Foundation License tzdata, 2024.1, Apache Software License urllib3, 2.2.1, MIT License -xgboost, 1.7.6, Apache Software License +xgboost, 1.6.2, Apache Software License z3-solver, 4.13.0.0, MIT License +zipp, 3.18.1, MIT License diff --git a/deps_licenses/licenses_mac_silicon_user.txt.md5 b/deps_licenses/licenses_mac_silicon_user.txt.md5 index 0aa27f999d..e6dca60e38 100644 --- a/deps_licenses/licenses_mac_silicon_user.txt.md5 +++ b/deps_licenses/licenses_mac_silicon_user.txt.md5 @@ -1 +1 @@ -7be80ba54850fbc203015560c8acb9a8 +19389f20f85a6fecae5aabd811bc1be8 diff --git a/poetry.lock b/poetry.lock index 296f3f21e4..2f3103eb13 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "absl-py" @@ -799,23 +799,23 @@ test = ["pytest"] [[package]] name = "concrete-python" -version = "2.6.0rc1" +version = "2.6.2" description = "A state-of-the-art homomorphic encryption framework" optional = false python-versions = ">=3.8" files = [ - {file = "concrete_python-2.6.0rc1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3cc220d6f74d79704a0f77e394f3587d62fd00feb5aeb70edb6db7c55e4535a8"}, - {file = "concrete_python-2.6.0rc1-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:33567f24e4e1b2e127d3f1519d8f3c1dec25f3a770926f8466c11eed07f238a3"}, - {file = "concrete_python-2.6.0rc1-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:8dfb7d3fde6109fc5933cb49ed1287eefb558a7e7a2a6f9ebe3afad95153f2f7"}, - {file = "concrete_python-2.6.0rc1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fc7be5056d4688d487cc9c73fb050609a254505af7c2d8daf881586666b3d4d1"}, - {file = "concrete_python-2.6.0rc1-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:8c5314208719ceb6b5b15894c1e045517803bdbfa769b8cdfcd5089738bb26ee"}, - {file = "concrete_python-2.6.0rc1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:50d8a2718378c16ee5fc66fa3ad843e715a6f05be49e5c8c7eb01dda3df643a2"}, - {file = "concrete_python-2.6.0rc1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:69fa7ef4e02655d07d71d88782636a79d7253967841ce10d8b500d56dd220963"}, - {file = "concrete_python-2.6.0rc1-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:1fa04bd97bac7c71101c3a6f9dfdc7bc9dab232773b811e7c148ed44a61a307c"}, - {file = "concrete_python-2.6.0rc1-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:98505a7b4e34698590783a49b28a8b23c2b4433b90ed95c478c2d2fa68250698"}, - {file = "concrete_python-2.6.0rc1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:76ca78df116f4dcf1cb2d584fdaf51621ed548f9cbb6608ed04878d6c66f748b"}, - {file = "concrete_python-2.6.0rc1-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:8a1404c66d02760494142cc7780665b28147cfcd41a24bd8a71133b20f4b0597"}, - {file = "concrete_python-2.6.0rc1-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:9fe0fb1f031fb2432720b5bc588d55077c26bbce36b3e9bb59ba27bd2e21833c"}, + {file = "concrete_python-2.6.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:92d24071df67316455d32d13c35a80d0eb3405cc128c63dc14bfa26dc500ea82"}, + {file = "concrete_python-2.6.2-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:7229f867d12128a267b85c29d05ba2d8422ad87da0f89458411a5291fc9c4952"}, + {file = "concrete_python-2.6.2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:a7170380aa38952d2b721f25e70fb8a2745bbd89062a2bb8ee0617fe6232579d"}, + {file = "concrete_python-2.6.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4cd899b2eed4aef3ea35734641a12226f070fb936c2120d18dc1ad42b9728514"}, + {file = "concrete_python-2.6.2-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:ecbb5b2f045ee53fcdf8b0930962a9e2939763f8701108311eb0f510100e198f"}, + {file = "concrete_python-2.6.2-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:c975417254c06c2e71c9926369de57f1df56e0c962a2a96faaa3559bddb50705"}, + {file = "concrete_python-2.6.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2d319eac69497d23f95f33f1adbb23ab521c48e78e376cea0c3a06942013e355"}, + {file = "concrete_python-2.6.2-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:aea675787bbaa1ce96a09e44f16824ed8cf999c1a2d4324e9481aab5831a9568"}, + {file = "concrete_python-2.6.2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:c388822f3617a7dd4f0a28188137ccbdbd1bf2f8048b70a439d9ceda9b806ae5"}, + {file = "concrete_python-2.6.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5023ccf72f30da998078421c52d96c7243e2ba91ad2dc038bc98d61551accc8b"}, + {file = "concrete_python-2.6.2-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:a14ff42c4fafb501855bac1476eac11060c8cddbdda6db11752d7f938be37196"}, + {file = "concrete_python-2.6.2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:aeea2644af90b7d2f4327ece1809365c926fc85247d4af90a868ef81d93e04ca"}, ] [package.dependencies] @@ -831,6 +831,11 @@ z3-solver = ">=4.12" dev = ["auditwheel (==5.3.0)", "black (==23.1.0)", "delocate (==0.10.4)", "isort (==5.12.0)", "matplotlib (>=3.7)", "mypy (==1.1.1)", "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" +reference = "zama-pypi" + [[package]] name = "contourpy" version = "1.1.1" @@ -5292,13 +5297,13 @@ files = [ [[package]] name = "requests" -version = "2.31.0" +version = "2.32.1" description = "Python HTTP for Humans." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, - {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, + {file = "requests-2.32.1-py3-none-any.whl", hash = "sha256:21ac9465cdf8c1650fe1ecde8a71669a93d4e6f147550483a2967d08396a56a5"}, + {file = "requests-2.32.1.tar.gz", hash = "sha256:eb97e87e64c79e64e5b8ac75cee9dd1f97f49e289b083ee6be96268930725685"}, ] [package.dependencies] @@ -6905,13 +6910,13 @@ files = [ [[package]] name = "types-requests" -version = "2.31.0.20240406" +version = "2.32.0.20240521" description = "Typing stubs for requests" optional = false python-versions = ">=3.8" files = [ - {file = "types-requests-2.31.0.20240406.tar.gz", hash = "sha256:4428df33c5503945c74b3f42e82b181e86ec7b724620419a2966e2de604ce1a1"}, - {file = "types_requests-2.31.0.20240406-py3-none-any.whl", hash = "sha256:6216cdac377c6b9a040ac1c0404f7284bd13199c0e1bb235f4324627e8898cf5"}, + {file = "types-requests-2.32.0.20240521.tar.gz", hash = "sha256:c5c4a0ae95aad51f1bf6dae9eed04a78f7f2575d4b171da37b622e08b93eb5d3"}, + {file = "types_requests-2.32.0.20240521-py3-none-any.whl", hash = "sha256:ab728ba43ffb073db31f21202ecb97db8753ded4a9dc49cb480d8a5350c5c421"}, ] [package.dependencies] @@ -7310,4 +7315,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.11" -content-hash = "18e37472ff221c5e6f57c7a32e3d4d84ed999622ee5ec3c9900627bd9e01349a" +content-hash = "c390de024486b2215adbe01f97c5ded6483b4ebb4e8b02469d663ae4ae309873" diff --git a/pyproject.toml b/pyproject.toml index e35631fcf4..619f2e70fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,8 @@ 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 = "2.6.0-rc1" +concrete-python = {version=">=2.6.2,<3.0", source = "zama-pypi"} +# concrete-python = ">=2.6.2,<3.0" setuptools = "65.6.3" skops = {version = "0.5.0"} xgboost = "1.6.2" @@ -56,6 +57,12 @@ numpy = "1.23.5" protobuf = "3.20.3" pandas = "2.0.3" +# Needed to have the latest Concrete Python versions +[[tool.poetry.source]] +name = "zama-pypi" +url = "https://pypi.zama.ai/" +priority = "explicit" + [tool.poetry.dev-dependencies] isort = "^5.10.1" black = "^24.3.0" @@ -80,6 +87,8 @@ mdformat = "^0.7.14" mdformat_myst = "^0.1.4" mdformat-toc = "^0.3.0" pip-audit = "^2.1.0" +types-requests = "^2.32.0" +requests="^2.32.1" jupyter = "^1.0.0" py-progress-tracker = "0.6.0" nbqa = "^1.3.1" @@ -90,7 +99,6 @@ jinja2 = "^3.1.2" LinkChecker = "^10.1.0" kaggle = "^1.5.12" tf2onnx = "^1.10.1" -types-requests = "^2.28.0" transformers = "^4.38.0" pdoc3 = "^0.10.0" lazydocs = "^0.4.0"