From b7bcd443d8cb672b9adb6ae9a8ce384dfb882b07 Mon Sep 17 00:00:00 2001 From: Wangwuyi123 <51237097+Wangwuyi123@users.noreply.github.com> Date: Wed, 25 Aug 2021 08:51:39 +0800 Subject: [PATCH] Fix CI Bug (#575) Co-authored-by: yuxwang --- .github/workflows/test.yml | 72 ++++++++++++++++---------------- .github/workflows/test_macos.yml | 42 ++++++++----------- 2 files changed, 52 insertions(+), 62 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7a78d2d9ae..737966168a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Test +name: Test on: push: @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-16.04, ubuntu-18.04, ubuntu-20.04] - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.6, 3.7, 3.8] steps: - uses: actions/checkout@v2 @@ -25,90 +25,88 @@ jobs: - name: Lint with Black run: | - cd .. if [ "$RUNNER_OS" == "Windows" ]; then - $CONDA\\python.exe -m pip install black - $CONDA\\python.exe -m black qlib -l 120 --check --diff + python.exe -m pip install black + python.exe -m black qlib -l 120 --check --diff else - sudo $CONDA/bin/python -m pip install black - $CONDA/bin/python -m black qlib -l 120 --check --diff + python -m pip install black + python -m black qlib -l 120 --check --diff fi shell: bash - # Test Qlib installed with pip - name: Install Qlib with pip run: | if [ "$RUNNER_OS" == "Windows" ]; then - $CONDA\\python.exe -m pip install numpy==1.19.5 - $CONDA\\python.exe -m pip install pyqlib --ignore-installed ruamel.yaml numpy --user + python.exe -m pip install numpy==1.19.5 + python.exe -m pip install pyqlib --ignore-installed ruamel.yaml numpy --user else - sudo $CONDA/bin/python -m pip install numpy==1.19.5 - sudo $CONDA/bin/python -m pip install pyqlib --ignore-installed ruamel.yaml numpy + python -m pip install numpy==1.19.5 + python -m pip install pyqlib --ignore-installed ruamel.yaml numpy fi shell: bash - name: Test data downloads run: | if [ "$RUNNER_OS" == "Windows" ]; then - $CONDA\\python.exe scripts/get_data.py qlib_data --target_dir ~/.qlib/qlib_data/cn_data --interval 1d --region cn + python.exe scripts/get_data.py qlib_data --target_dir ~/.qlib/qlib_data/cn_data --interval 1d --region cn else - $CONDA/bin/python scripts/get_data.py qlib_data --target_dir ~/.qlib/qlib_data/cn_data --interval 1d --region cn + python scripts/get_data.py qlib_data --target_dir ~/.qlib/qlib_data/cn_data --interval 1d --region cn fi shell: bash - name: Test workflow by config (install from pip) run: | if [ "$RUNNER_OS" == "Windows" ]; then - $CONDA\\python.exe qlib\\workflow\\cli.py examples\\benchmarks\\LightGBM\\workflow_config_lightgbm_Alpha158.yaml - $CONDA\\python.exe -m pip uninstall -y pyqlib + python.exe qlib\\workflow\\cli.py examples\\benchmarks\\LightGBM\\workflow_config_lightgbm_Alpha158.yaml + python.exe -m pip uninstall -y pyqlib else - $CONDA/bin/python qlib/workflow/cli.py examples/benchmarks/LightGBM/workflow_config_lightgbm_Alpha158.yaml - sudo $CONDA/bin/python -m pip uninstall -y pyqlib + python qlib/workflow/cli.py examples/benchmarks/LightGBM/workflow_config_lightgbm_Alpha158.yaml + python -m pip uninstall -y pyqlib fi shell: bash - - # Test Qlib installed from source + + # Test Qlib installed from source - name: Install Qlib from source run: | if [ "$RUNNER_OS" == "Windows" ]; then - $CONDA\\python.exe -m pip install --upgrade cython - $CONDA\\python.exe -m pip install numpy jupyter jupyter_contrib_nbextensions - $CONDA\\python.exe -m pip install -U scipy scikit-learn # installing without this line will cause errors on GitHub Actions, while instsalling locally won't - $CONDA\\python.exe setup.py install + python.exe -m pip install --upgrade cython + python.exe -m pip install numpy jupyter jupyter_contrib_nbextensions + python.exe -m pip install -U scipy scikit-learn # installing without this line will cause errors on GitHub Actions, while instsalling locally won't + python.exe setup.py install else - sudo $CONDA/bin/python -m pip install --upgrade cython - sudo $CONDA/bin/python -m pip install numpy jupyter jupyter_contrib_nbextensions - sudo $CONDA/bin/python -m pip install -U scipy scikit-learn # installing without this line will cause errors on GitHub Actions, while instsalling locally won't - sudo $CONDA/bin/python setup.py install + python -m pip install --upgrade cython + python -m pip install numpy jupyter jupyter_contrib_nbextensions + python -m pip install -U scipy scikit-learn # installing without this line will cause errors on GitHub Actions, while instsalling locally won't + python setup.py install fi shell: bash - name: Install test dependencies run: | if [ "$RUNNER_OS" == "Windows" ]; then - $CONDA\\python.exe -m pip install --upgrade pip - $CONDA\\python.exe -m pip install black pytest + python.exe -m pip install --upgrade pip + python.exe -m pip install black pytest else - sudo $CONDA/bin/python -m pip install --upgrade pip - sudo $CONDA/bin/python -m pip install black pytest + python -m pip install --upgrade pip + python -m pip install black pytest fi - shell: bash + shell: bash - name: Unit tests with Pytest run: | cd tests if [ "$RUNNER_OS" == "Windows" ]; then - $CONDA\\python.exe -m pytest . --durations=0 + python.exe -m pytest . --durations=0 else - $CONDA/bin/python -m pytest . --durations=0 + python -m pytest . --durations=0 fi shell: bash - name: Test workflow by config (install from source) run: | if [ "$RUNNER_OS" == "Windows" ]; then - $CONDA\\python.exe qlib\\workflow\\cli.py examples\\benchmarks\\LightGBM\\workflow_config_lightgbm_Alpha158.yaml + python.exe qlib\\workflow\\cli.py examples\\benchmarks\\LightGBM\\workflow_config_lightgbm_Alpha158.yaml else - $CONDA/bin/python qlib/workflow/cli.py examples/benchmarks/LightGBM/workflow_config_lightgbm_Alpha158.yaml + python qlib/workflow/cli.py examples/benchmarks/LightGBM/workflow_config_lightgbm_Alpha158.yaml fi shell: bash \ No newline at end of file diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml index 57aa87dedf..4511c2afe7 100644 --- a/.github/workflows/test_macos.yml +++ b/.github/workflows/test_macos.yml @@ -13,7 +13,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.6, 3.7, 3.8] steps: - uses: actions/checkout@v2 @@ -26,48 +26,40 @@ jobs: - name: Lint with Black run: | cd .. - sudo $CONDA/bin/python -m pip install black - $CONDA/bin/python -m black qlib -l 120 --check --diff - + python -m pip install black + python -m black qlib -l 120 --check --diff # Test Qlib installed with pip - name: Install Qlib with pip run: | - sudo $CONDA/bin/python -m pip install numpy==1.19.5 - sudo $CONDA/bin/python -m pip install pyqlib --ignore-installed ruamel.yaml numpy - + python -m pip install numpy==1.19.5 + python -m pip install pyqlib --ignore-installed ruamel.yaml numpy - name: Install Lightgbm for MacOS 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 - - name: Test data downloads run: | - $CONDA/bin/python scripts/get_data.py qlib_data --target_dir ~/.qlib/qlib_data/cn_data --interval 1d --region cn - + python scripts/get_data.py qlib_data --target_dir ~/.qlib/qlib_data/cn_data --interval 1d --region cn - name: Test workflow by config (install from pip) run: | - $CONDA/bin/python qlib/workflow/cli.py examples/benchmarks/LightGBM/workflow_config_lightgbm_Alpha158.yaml - sudo $CONDA/bin/python -m pip uninstall -y pyqlib - + python qlib/workflow/cli.py examples/benchmarks/LightGBM/workflow_config_lightgbm_Alpha158.yaml + python -m pip uninstall -y pyqlib # Test Qlib installed from source - name: Install Qlib from source run: | - sudo $CONDA/bin/python -m pip install --upgrade cython - sudo $CONDA/bin/python -m pip install numpy jupyter jupyter_contrib_nbextensions - sudo $CONDA/bin/python -m pip install -U scipy scikit-learn # installing without this line will cause errors on GitHub Actions, while instsalling locally won't - sudo $CONDA/bin/python setup.py install - + python -m pip install --upgrade cython + python -m pip install numpy jupyter jupyter_contrib_nbextensions + python -m pip install -U scipy scikit-learn # installing without this line will cause errors on GitHub Actions, while instsalling locally won't + python setup.py install - name: Install test dependencies run: | - sudo $CONDA/bin/python -m pip install --upgrade pip - sudo $CONDA/bin/python -m pip install -U pyopenssl idna - sudo $CONDA/bin/python -m pip install black pytest - + python -m pip install --upgrade pip + python -m pip install -U pyopenssl idna + python -m pip install black pytest - name: Unit tests with Pytest run: | cd tests - $CONDA/bin/python -m pytest . --durations=0 - + python -m pytest . --durations=0 - name: Test workflow by config (install from source) run: | - $CONDA/bin/python qlib/workflow/cli.py examples/benchmarks/LightGBM/workflow_config_lightgbm_Alpha158.yaml + python qlib/workflow/cli.py examples/benchmarks/LightGBM/workflow_config_lightgbm_Alpha158.yaml \ No newline at end of file