diff --git a/.bazelrc b/.bazelrc index b63a6bd7..3264dd3c 100644 --- a/.bazelrc +++ b/.bazelrc @@ -47,7 +47,7 @@ build:macos --host_copt=-Wa,--noexecstack build:macos --features=-supports_dynamic_linker build:macos --cxxopt -Wno-error=unused-const-variable build:macos --cxxopt -Wno-error=sign-compare # for eigen 3.4 -build:macos --macos_minimum_os=11.0 +build:macos --macos_minimum_os=12.0 # static link libstdc++ & libgcc build:linux --action_env=BAZEL_LINKOPTS=-static-libstdc++:-static-libgcc diff --git a/.circleci/release-config.yml b/.circleci/release-config.yml index a981c889..002df003 100644 --- a/.circleci/release-config.yml +++ b/.circleci/release-config.yml @@ -60,42 +60,11 @@ jobs: sh ./build_wheel_entrypoint.sh ls dist/*.whl - python3 -m pip install twine - python3 -m twine upload -r pypi -u __token__ -p ${PYPI_TWINE_TOKEN} dist/*.whl - macOS_x64_publish: - macos: - xcode: 15.1 - resource_class: macos.x86.medium.gen2 - parameters: - python_ver: - type: string - steps: - - checkout - - run: - name: Install dependencies - command: | - brew install bazelisk cmake ninja nasm libomp wget - - run: - name: Install Miniconda - command: | - wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O ~/miniconda.sh - bash ~/miniconda.sh -b -p $HOME/miniconda - source $HOME/miniconda/bin/activate - conda init bash zsh - - run: - name: "build package and publish" - command: | - conda create -n build python=<< parameters.python_ver >> -y - conda activate build - - sh ./build_wheel_entrypoint.sh - ls dist/*.whl - python3 -m pip install twine python3 -m twine upload -r pypi -u __token__ -p ${PYPI_TWINE_TOKEN} dist/*.whl macOS_arm64_publish: macos: - xcode: 15.1 + xcode: 15.1.0 resource_class: macos.m1.large.gen1 parameters: python_ver: @@ -138,13 +107,6 @@ workflows: filters: tags: only: /.*(?1 + - macOS 12.0+ (macOS Monterey+)1 - Python - - Python 3.8+ + - Python 3.9+ -1. Due to CI resource limitation, macOS x64 prebuild binary will no longer available since next release. +1. Due to CI resource limitation, macOS x64 prebuild binary is no longer available. ### Install via Pip diff --git a/README_cn.md b/README_cn.md index 51a85a90..6d81d002 100644 --- a/README_cn.md +++ b/README_cn.md @@ -128,9 +128,9 @@ FHE 里程碑 - OS - Ubuntu 18.04+ - Centos 7 - - macOS 11.1+ (macOS Big Sur+) + - macOS 12.0+ (macOS Monterey+) - Python - - Python 3.8+ + - Python 3.9+ ### 通过 Pip 安装 diff --git a/docs/development/phe_dev.rst b/docs/development/phe_dev.rst index 19f95255..976db7ee 100644 --- a/docs/development/phe_dev.rst +++ b/docs/development/phe_dev.rst @@ -288,7 +288,7 @@ HEU 单元测试使用 `GoogleTest `_ 框架,有 运行已有单测(必须) """"""""""""""""""""""""""""""""""" -即使您没有编写任何单测,HEU 也会自动测试您的算法,单测请在 Python 3.8 环境下执行,请执行以下命令测试整个 HEU: +即使您没有编写任何单测,HEU 也会自动测试您的算法,单测请在 Python 3.10 环境下执行,请执行以下命令测试整个 HEU: .. code-block:: shell diff --git a/docs/getting_started/faq.rst b/docs/getting_started/faq.rst index da68b568..1c1a3757 100644 --- a/docs/getting_started/faq.rst +++ b/docs/getting_started/faq.rst @@ -22,7 +22,7 @@ Pip 找不到安装包 HEU 是否支持其它的 Python 版本? """"""""""""""""""""""""""""""""" -支持。为了节约 Pypi 仓库存储空间,dev 版本仅发布基于 Python 3.8 的二进制包,beta 及以上的版本将会发布所有 Python 版本的二进制包。对于 dev 版本,您也可以自助 :doc:`从源码编译<./installation>` 所需的 Python 版本的二进制包 +支持。对于 dev 版本,您也可以自助 :doc:`从源码编译<./installation>` 所需的 Python 版本的二进制包 diff --git a/docs/getting_started/installation.rst b/docs/getting_started/installation.rst index 37b34213..6a096704 100644 --- a/docs/getting_started/installation.rst +++ b/docs/getting_started/installation.rst @@ -4,12 +4,12 @@ 环境准备 -------------- -Python >= 3.8 +Python >= 3.9 OS: - Centos 7 - Ubuntu 18.04+ - - macOS 11.1+ (macOS Big Sur+) + - macOS 12.0+ (macOS Monterey+) 安装 diff --git a/docs/locale/en/LC_MESSAGES/development/phe_dev.po b/docs/locale/en/LC_MESSAGES/development/phe_dev.po index a012df20..1c7e7b71 100644 --- a/docs/locale/en/LC_MESSAGES/development/phe_dev.po +++ b/docs/locale/en/LC_MESSAGES/development/phe_dev.po @@ -558,10 +558,10 @@ msgid "运行已有单测(必须)" msgstr "Run existing unit tests (required)" #: ../../development/phe_dev.rst:291 -msgid "即使您没有编写任何单测,HEU 也会自动测试您的算法,单测请在 Python 3.8 环境下执行,请执行以下命令测试整个 HEU:" +msgid "即使您没有编写任何单测,HEU 也会自动测试您的算法,单测请在 Python 3.10 环境下执行,请执行以下命令测试整个 HEU:" msgstr "" "HEU will automatically test your algorithm even if you haven't written " -"any unit tests. Please set up a Python 3.8 environment and execute the " +"any unit tests. Please set up a Python 3.10 environment and execute the " "following command to test entire HEU:" #: ../../development/phe_dev.rst:299 diff --git a/docs/locale/en/LC_MESSAGES/getting_started/faq.po b/docs/locale/en/LC_MESSAGES/getting_started/faq.po index 57ae2e33..0d3bc722 100644 --- a/docs/locale/en/LC_MESSAGES/getting_started/faq.po +++ b/docs/locale/en/LC_MESSAGES/getting_started/faq.po @@ -66,12 +66,9 @@ msgstr "Docs HEU support other versions of Python" #: ../../getting_started/faq.rst:25 msgid "" -"支持。为了节约 Pypi 仓库存储空间,dev 版本仅发布基于 Python 3.8 的二进制包,beta 及以上的版本将会发布所有 Python" -" 版本的二进制包。对于 dev 版本,您也可以自助 :doc:`从源码编译<./installation>` 所需的 Python 版本的二进制包" +"支持。对于 dev 版本,您也可以自助 :doc:`从源码编译<./installation>` 所需的 Python 版本的二进制包" msgstr "" -"Supported. To conserve PyPI repository storage space, the dev version " -"only releases binary packages based on Python 3.8, while beta and higher " -"versions will release binary packages for all Python versions. For the " +"Supported. For the " "dev version, you can also self-help by :doc:`compiling from " "source<./installation>` the binary package for the required Python " "version." diff --git a/docs/locale/en/LC_MESSAGES/getting_started/installation.po b/docs/locale/en/LC_MESSAGES/getting_started/installation.po index bbd495fc..1bf1c439 100644 --- a/docs/locale/en/LC_MESSAGES/getting_started/installation.po +++ b/docs/locale/en/LC_MESSAGES/getting_started/installation.po @@ -27,7 +27,7 @@ msgid "环境准备" msgstr "Environment" #: ../../getting_started/installation.rst:7 -msgid "Python >= 3.8" +msgid "Python >= 3.9" msgstr "" #: ../../getting_started/installation.rst:13 @@ -43,7 +43,7 @@ msgid "Ubuntu 18.04+" msgstr "" #: ../../getting_started/installation.rst:12 -msgid "macOS 11.1+ (macOS Big Sur+)" +msgid "macOS 12.0+ (macOS Monterey+)" msgstr "" #: ../../getting_started/installation.rst:21 diff --git a/setup.py b/setup.py index b89d1f18..8b3776dd 100644 --- a/setup.py +++ b/setup.py @@ -28,8 +28,8 @@ logger = logging.getLogger(__name__) -# 3.8 is the minimum python version we can support -SUPPORTED_PYTHONS = [(3, 8), (3, 9), (3, 10), (3, 11)] +# 3.9 is the minimum python version we can support +SUPPORTED_PYTHONS = [(3, 9), (3, 10), (3, 11)] BAZEL_MAX_JOBS = os.getenv("BAZEL_MAX_JOBS") ROOT_DIR = os.path.dirname(__file__) @@ -232,7 +232,6 @@ def has_ext_modules(self): long_description_content_type='text/markdown', url="https://github.com/secretflow/heu", classifiers=[ - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11",