diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index ae022689a..093c98d5b 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, macos-13, macos-latest] + os: [macos-13, macos-latest] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: @@ -33,14 +33,32 @@ jobs: - name: Build wheel on ${{ matrix.os }} run: | make build - - name: Rename macos filename - if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-14' || matrix.os == 'macos-latest' }} + - 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) @@ -48,6 +66,32 @@ jobs: 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: | @@ -60,69 +104,29 @@ jobs: twine check dist/*.whl twine upload --repository-url https://test.pypi.org/legacy/ dist/*.whl --verbose - deploy_with_manylinux: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Build wheel on Linux - uses: RalfG/python-wheels-manylinux-build@v0.7.1-manylinux2014_x86_64 - with: - # not supporting 3.6 due to annotations is not supported https://stackoverflow.com/a/52890129 - python-versions: 'cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312' - build-requirements: 'numpy cython' - - name: Install dependencies - run: | - python -m pip install twine - python -m pip list - - name: Build and publish - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.TESTPYPI_TOKEN }} - run: | - ls dist - twine check dist/*.whl - twine upload --repository-url https://test.pypi.org/legacy/ dist/pyqlib-*-manylinux*.whl --verbose - - # build_wheels: - # runs-on: ${{ matrix.os }} - # strategy: - # matrix: - # os: [windows-latest, ubuntu-latest, macos-13, macos-latest] - + # deploy_with_manylinux: + # runs-on: ubuntu-latest # steps: - # - name: Checkout repo - # uses: actions/checkout@v4 - - # # - name: Set up Python ${{ matrix.python-version }} - # # uses: actions/setup-python@v5 - # # with: - # # python-version: ${{ matrix.python-version }} - - # # - name: Install cibuildwheel - # # run: | - # # python -m pip install --upgrade pip - # # python -m pip install cibuildwheel - - # # - name: Build wheel - # # run: | - # # python -m cibuildwheel --output-dir dist - - # - name: Build wheel - # uses: pypa/cibuildwheel@v2.22.0 + # - uses: actions/checkout@v3 + # - name: Set up Python ${{ matrix.python-version }} + # uses: actions/setup-python@v4 # with: - # package-dir: . - # output-dir: dist - # config-file: "pyproject.toml" - - # - name: Upload wheel + # python-version: ${{ matrix.python-version }} + # - name: Build wheel on Linux + # uses: RalfG/python-wheels-manylinux-build@v0.7.1-manylinux2014_x86_64 + # with: + # # not supporting 3.6 due to annotations is not supported https://stackoverflow.com/a/52890129 + # python-versions: 'cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312' + # build-requirements: 'numpy cython' + # - name: Install dependencies + # run: | + # python -m pip install twine + # python -m pip list + # - name: Build and publish # env: # TWINE_USERNAME: __token__ # TWINE_PASSWORD: ${{ secrets.TESTPYPI_TOKEN }} # run: | # ls dist # twine check dist/*.whl - # twine upload --repository-url https://test.pypi.org/legacy/ dist/*.whl + # twine upload --repository-url https://test.pypi.org/legacy/ dist/pyqlib-*-manylinux*.whl --verbose diff --git a/.github/workflows/test_qlib_from_pip.yml b/.github/workflows/test_qlib_from_pip.yml deleted file mode 100644 index 30ada6ea6..000000000 --- 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: [windows-latest, ubuntu-20.04, ubuntu-22.04] - # 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.89 - - - 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 5737e40de..349bd3f56 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.89" +__version__ = "0.9.5.88" __version__bak = __version__ # This version is backup for QlibConfig.reset_qlib_version import os from typing import Union