From 431b9c128175ccd6fc516b00e8e3f9825973d64d Mon Sep 17 00:00:00 2001 From: Linlang Date: Thu, 19 Dec 2024 12:29:15 +0800 Subject: [PATCH] fix macos package name error --- .github/workflows/python-publish.yml | 75 +++++++++++++----------- .github/workflows/test_qlib_from_pip.yml | 56 ------------------ qlib/__init__.py | 2 +- 3 files changed, 42 insertions(+), 91 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 54be619ab..8dbd0ea9b 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -4,21 +4,18 @@ name: Upload Python Package on: - release: - types: [published] + push: + branches: [ main ] + pull_request: + branches: [ main ] jobs: deploy_with_bdist_wheel: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, macos-13, macos-latest] + os: [windows-latest, macos-13, macos-14, macos-latest] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] - exclude: - - os: macos-13 - python-version: "3.11" - - os: macos-13 - python-version: "3.12" steps: - uses: actions/checkout@v3 @@ -29,6 +26,16 @@ jobs: - name: Install dependencies run: | make dev + - name: Set MACOSX_DEPLOYMENT_TARGET + run: | + if [[ ${{ matrix.os }} == "macos-13" ]]; then + export MACOSX_DEPLOYMENT_TARGET=13.0 + elif [[ ${{ matrix.os }} == "macos-14" ]]; then + export MACOSX_DEPLOYMENT_TARGET=14.0 + else + export MACOSX_DEPLOYMENT_TARGET=15.0 # Default for macos-latest + fi + echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" - name: Build wheel on ${{ matrix.os }} run: | make build @@ -41,32 +48,32 @@ 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 + # 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 }} diff --git a/.github/workflows/test_qlib_from_pip.yml b/.github/workflows/test_qlib_from_pip.yml deleted file mode 100644 index 6b386d85a..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, macos-13, macos-14, 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[dev]==0.9.5.92 - - - name: Install Lightgbm for MacOS - if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-14' || 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 a182f1bfd..b2192f206 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.92" +__version__ = "0.9.5.91" __version__bak = __version__ # This version is backup for QlibConfig.reset_qlib_version import os from typing import Union