From d31d17e7aa71b260d4499d51e6ac7d1602b8ac3b Mon Sep 17 00:00:00 2001 From: Linlang Date: Thu, 19 Dec 2024 17:18:36 +0800 Subject: [PATCH] rewrite deploy with macos --- .github/workflows/python-publish.yml | 203 ++++++++++++----------- .github/workflows/test_qlib_from_pip.yml | 56 ------- qlib/__init__.py | 2 +- 3 files changed, 111 insertions(+), 150 deletions(-) delete mode 100644 .github/workflows/test_qlib_from_pip.yml diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 45efda3631..43d369d552 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -3,106 +3,123 @@ name: Upload Python Package -on: - release: - types: [published] - # on: -# push: -# branches: [ main ] -# pull_request: -# branches: [ main ] +# release: +# types: [published] + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] jobs: - deploy_with_bdist_wheel: - runs-on: ${{ matrix.os }} + # deploy_with_windows: + # runs-on: ${{ matrix.os }} + # strategy: + # matrix: + # os: [windows-latest, macos-13, macos-latest] + # python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + + # steps: + # - uses: actions/checkout@v3 + # - name: Set up Python ${{ matrix.python-version }} + # uses: actions/setup-python@v4 + # with: + # python-version: ${{ matrix.python-version }} + # - name: Install dependencies + # run: | + # make dev + # - name: Build wheel on ${{ matrix.os }} + # run: | + # make build + # - name: change macos version and arm64 + # if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-latest' }} + # run: | + # python -c " + # from pathlib import Path + # import subprocess + # replaced = subprocess.run(['sw_vers', '-productVersion'], capture_output=True, text=True).stdout.strip().split('.', 1)[0] + '_0_arm64' + # for whl_file in Path('./dist').glob('*.whl'): + # if 'universal2' in whl_file.stem: + # parts = whl_file.stem.split('_') + # be_replaced = '_'.join(parts[1:]) + # new_name = whl_file.name.replace(be_replaced, replaced) + # new_whl_file = whl_file.with_name(new_name) + # whl_file.rename(new_whl_file) + # print(f'Renamed: {whl_file} -> {new_whl_file}') + # " + # - name: change macos version and x86_64 + # if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-latest' }} + # run: | + # make build + # python -c " + # from pathlib import Path + # import subprocess + # replaced = subprocess.run(['sw_vers', '-productVersion'], capture_output=True, text=True).stdout.strip().split('.', 1)[0] + '_0_x86_64' + # for whl_file in Path('./dist').glob('*.whl'): + # if 'universal2' in whl_file.stem: + # parts = whl_file.stem.split('_') + # be_replaced = '_'.join(parts[1:]) + # new_name = whl_file.name.replace(be_replaced, replaced) + # new_whl_file = whl_file.with_name(new_name) + # whl_file.rename(new_whl_file) + # print(f'Renamed: {whl_file} -> {new_whl_file}') + # " + # - name: change macos version and arm64 + # if: ${{ (matrix.os != 'macos-13' || matrix['python-version'] != '3.11') && (matrix.os != 'macos-13' || matrix['python-version'] != '3.12') }} + # run: | + # make build + # python -c " + # from pathlib import Path + # for whl_file in Path('./dist').glob('*.whl'): + # if 'universal2' in whl_file.stem: + # new_name = whl_file.name.replace('universal2', 'arm64') + # new_whl_file = whl_file.with_name(new_name) + # whl_file.rename(new_whl_file) + # print(f'Renamed: {whl_file} -> {new_whl_file}') + # " + # - name: change macos version and x86_64 + # if: ${{ (matrix.os != 'macos-13' || matrix['python-version'] != '3.11') && (matrix.os != 'macos-13' || matrix['python-version'] != '3.12') }} + # run: | + # make build + # python -c " + # from pathlib import Path + # for whl_file in Path('./dist').glob('*.whl'): + # if 'universal2' in whl_file.stem: + # new_name = whl_file.name.replace('universal2', 'x86_64') + # new_whl_file = whl_file.with_name(new_name) + # whl_file.rename(new_whl_file) + # print(f'Renamed: {whl_file} -> {new_whl_file}') + # " + # - name: Build the project + # if: ${{ (matrix.os != 'macos-13' || matrix['python-version'] != '3.11') && (matrix.os != 'macos-13' || matrix['python-version'] != '3.12') }} + # run: | + # make build + # - name: Build and publish + # env: + # TWINE_USERNAME: __token__ + # TWINE_PASSWORD: ${{ secrets.TESTPYPI_TOKEN }} + # run: | + # twine check dist/*.whl + # twine upload --repository-url https://test.pypi.org/legacy/ dist/*.whl --verbose + + deploy_with_macos: + runs-on: ${{ matrix.buildplat[0] }} strategy: matrix: - os: [macos-13, macos-latest] + buildplat: + - [macos-13, macosx_arm64, ""] + - [macos-13, macosx_x86_64, ""] + - [macos-14, macosx_arm64, ""] + - [macos-14, macosx_x86_64, ""] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] - steps: - - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - make dev - - name: Build wheel on ${{ matrix.os }} - run: | - make build - - name: change macos version and arm64 - if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-latest' }} - run: | - python -c " - from pathlib import Path - import subprocess - replaced = subprocess.run(['sw_vers', '-productVersion'], capture_output=True, text=True).stdout.strip().split('.', 1)[0] + '_0_arm64' - for whl_file in Path('./dist').glob('*.whl'): - if 'universal2' in whl_file.stem: - parts = whl_file.stem.split('_') - be_replaced = '_'.join(parts[1:]) - new_name = whl_file.name.replace(be_replaced, replaced) - new_whl_file = whl_file.with_name(new_name) - whl_file.rename(new_whl_file) - print(f'Renamed: {whl_file} -> {new_whl_file}') - " - - name: change macos version and x86_64 - if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-latest' }} - run: | - make build - python -c " - from pathlib import Path - import subprocess - replaced = subprocess.run(['sw_vers', '-productVersion'], capture_output=True, text=True).stdout.strip().split('.', 1)[0] + '_0_x86_64' - for whl_file in Path('./dist').glob('*.whl'): - if 'universal2' in whl_file.stem: - parts = whl_file.stem.split('_') - be_replaced = '_'.join(parts[1:]) - new_name = whl_file.name.replace(be_replaced, replaced) - new_whl_file = whl_file.with_name(new_name) - whl_file.rename(new_whl_file) - print(f'Renamed: {whl_file} -> {new_whl_file}') - " - - name: change macos version and arm64 - if: ${{ (matrix.os != 'macos-13' || matrix['python-version'] != '3.11') && (matrix.os != 'macos-13' || matrix['python-version'] != '3.12') }} - run: | - make build - python -c " - from pathlib import Path - for whl_file in Path('./dist').glob('*.whl'): - if 'universal2' in whl_file.stem: - new_name = whl_file.name.replace('universal2', 'arm64') - new_whl_file = whl_file.with_name(new_name) - whl_file.rename(new_whl_file) - print(f'Renamed: {whl_file} -> {new_whl_file}') - " - - name: change macos version and x86_64 - if: ${{ (matrix.os != 'macos-13' || matrix['python-version'] != '3.11') && (matrix.os != 'macos-13' || matrix['python-version'] != '3.12') }} - run: | - make build - python -c " - from pathlib import Path - for whl_file in Path('./dist').glob('*.whl'): - if 'universal2' in whl_file.stem: - new_name = whl_file.name.replace('universal2', 'x86_64') - new_whl_file = whl_file.with_name(new_name) - whl_file.rename(new_whl_file) - print(f'Renamed: {whl_file} -> {new_whl_file}') - " - - name: Build the project - if: ${{ (matrix.os != 'macos-13' || matrix['python-version'] != '3.11') && (matrix.os != 'macos-13' || matrix['python-version'] != '3.12') }} - run: | - make build - - name: Build and publish - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.TESTPYPI_TOKEN }} - run: | - twine check dist/*.whl - twine upload --repository-url https://test.pypi.org/legacy/ dist/*.whl --verbose + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} # deploy_with_manylinux: # runs-on: ubuntu-latest diff --git a/.github/workflows/test_qlib_from_pip.yml b/.github/workflows/test_qlib_from_pip.yml deleted file mode 100644 index 45c8113d7d..0000000000 --- a/.github/workflows/test_qlib_from_pip.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: Test qlib from pip - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - timeout-minutes: 120 - - runs-on: ${{ matrix.os }} - strategy: - matrix: - # Since macos-latest changed from 12.7.4 to 14.4.1, - # the minimum python version that matches a 14.4.1 version of macos is 3.10, - # If you want to use python 3.7 in github action, then the latest macos system version is macos-13, - # after macos-13 python 3.7 is no longer supported. - # so we limit the macos version to macos-13. - os: [macos-13, macos-latest] - # not supporting 3.6 due to annotations is not supported https://stackoverflow.com/a/52890129 - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] - - steps: - - name: Test qlib from pip - uses: actions/checkout@v3 - - - name: Update pip to the latest version - run: | - python -m pip install --upgrade pip - - - name: Qlib installation test - run: | - python -m pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ pyqlib==0.9.5.88 - - - name: Install Lightgbm for MacOS - if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-latest' }} - run: | - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Microsoft/qlib/main/.github/brew_install.sh)" - HOMEBREW_NO_AUTO_UPDATE=1 brew install lightgbm - # FIX MacOS error: Segmentation fault - # reference: https://github.com/microsoft/LightGBM/issues/4229 - wget https://raw.githubusercontent.com/Homebrew/homebrew-core/fb8323f2b170bd4ae97e1bac9bf3e2983af3fdb0/Formula/libomp.rb - brew unlink libomp - brew install libomp.rb - - - name: Downloads dependencies data - run: | - cd .. - python -m qlib.run.get_data qlib_data --target_dir ~/.qlib/qlib_data/cn_data --region cn - cd qlib - - - name: Test workflow by config - run: | - qrun examples/benchmarks/LightGBM/workflow_config_lightgbm_Alpha158.yaml diff --git a/qlib/__init__.py b/qlib/__init__.py index 349bd3f56c..0a0579565a 100644 --- a/qlib/__init__.py +++ b/qlib/__init__.py @@ -2,7 +2,7 @@ # Licensed under the MIT License. from pathlib import Path -__version__ = "0.9.5.88" +__version__ = "0.9.5.87" __version__bak = __version__ # This version is backup for QlibConfig.reset_qlib_version import os from typing import Union