Skip to content

Commit

Permalink
chore: update cp version to 2.6.2
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
fd0r committed May 21, 2024
1 parent 55f681a commit 27efc79
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 52 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion deps_licenses/licenses_linux_user.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion deps_licenses/licenses_linux_user.txt.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cc53b7f93bbbf99ecdcc0a67cbbf64b2
1d94a45abceb980d2095153cf7887886
22 changes: 11 additions & 11 deletions deps_licenses/licenses_mac_intel_user.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion deps_licenses/licenses_mac_intel_user.txt.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7be80ba54850fbc203015560c8acb9a8
1d94a45abceb980d2095153cf7887886
25 changes: 13 additions & 12 deletions deps_licenses/licenses_mac_silicon_user.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion deps_licenses/licenses_mac_silicon_user.txt.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7be80ba54850fbc203015560c8acb9a8
19389f20f85a6fecae5aabd811bc1be8
49 changes: 27 additions & 22 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit 27efc79

Please sign in to comment.