Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

without_conda #575

Merged
merged 71 commits into from
Aug 25, 2021
Merged
Show file tree
Hide file tree
Changes from 65 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
b568f64
Update test.yml
Wangwuyi123 Aug 10, 2021
451b148
Update test.yml
Wangwuyi123 Aug 10, 2021
bf10711
Update test.yml
Wangwuyi123 Aug 10, 2021
2a12b67
Update test.yml
Wangwuyi123 Aug 10, 2021
f8a5511
Update test.yml
Wangwuyi123 Aug 10, 2021
d961712
Update test.yml
Wangwuyi123 Aug 10, 2021
fcf263f
new_test
Anduinnnnnn Aug 12, 2021
f4b72a8
python version
Anduinnnnnn Aug 12, 2021
23cd61f
python version
Anduinnnnnn Aug 12, 2021
a98ecb4
python version
Anduinnnnnn Aug 13, 2021
8d4506f
python version
Anduinnnnnn Aug 13, 2021
c8b0878
python version
Anduinnnnnn Aug 13, 2021
92cbd4d
python version
Anduinnnnnn Aug 13, 2021
5d0db6d
python version
Anduinnnnnn Aug 13, 2021
b84837d
python version
Anduinnnnnn Aug 13, 2021
194c973
python version
Anduinnnnnn Aug 13, 2021
01fae62
python version
Anduinnnnnn Aug 16, 2021
94f53ba
python version
Anduinnnnnn Aug 16, 2021
d40e368
python version
Anduinnnnnn Aug 16, 2021
b2086d3
python version
Anduinnnnnn Aug 16, 2021
b633ac6
python version
Anduinnnnnn Aug 16, 2021
fae8064
python version
Anduinnnnnn Aug 16, 2021
32b02c7
python version
Anduinnnnnn Aug 16, 2021
db30281
python version
Anduinnnnnn Aug 16, 2021
7f9a199
python version
Anduinnnnnn Aug 16, 2021
61900b5
python version
Anduinnnnnn Aug 16, 2021
ab94b1c
python version
Anduinnnnnn Aug 16, 2021
3a7fb97
python version
Anduinnnnnn Aug 16, 2021
3d38f8b
python version
Anduinnnnnn Aug 16, 2021
d62d210
python version
Anduinnnnnn Aug 16, 2021
0f3e694
python version
Anduinnnnnn Aug 16, 2021
6c6b6da
python version
Anduinnnnnn Aug 16, 2021
eba249c
python version
Anduinnnnnn Aug 16, 2021
ce6595b
python version
Anduinnnnnn Aug 16, 2021
06ddb9c
python version
Anduinnnnnn Aug 16, 2021
d72dc10
python version
Anduinnnnnn Aug 16, 2021
16ddab2
python version
Anduinnnnnn Aug 16, 2021
cfde7ff
python version
Anduinnnnnn Aug 16, 2021
d7c77a2
python version
Anduinnnnnn Aug 16, 2021
d75cd2a
python version
Anduinnnnnn Aug 16, 2021
2b54323
python version
Anduinnnnnn Aug 16, 2021
d1b1006
python version
Anduinnnnnn Aug 16, 2021
c0243f1
python version
Anduinnnnnn Aug 16, 2021
a4c38cb
python version
Anduinnnnnn Aug 16, 2021
7beaf35
python version
Anduinnnnnn Aug 16, 2021
aaa5549
python version
Anduinnnnnn Aug 16, 2021
32fd879
Update test.yml
Wangwuyi123 Aug 16, 2021
13a4f8f
python version
Anduinnnnnn Aug 16, 2021
e0def67
Merge remote-tracking branch 'origin/branch1' into branch1
Anduinnnnnn Aug 16, 2021
55e07be
Update test.yml
Wangwuyi123 Aug 16, 2021
712c9dc
python version
Anduinnnnnn Aug 17, 2021
0be50bf
python version
Anduinnnnnn Aug 17, 2021
86bf5a9
python version
Anduinnnnnn Aug 17, 2021
edb38dc
python version
Anduinnnnnn Aug 17, 2021
c7c99f0
python version
Anduinnnnnn Aug 17, 2021
e8e5d98
python version
Anduinnnnnn Aug 17, 2021
4d19df5
python version
Anduinnnnnn Aug 17, 2021
e0733e5
python version
Anduinnnnnn Aug 17, 2021
c000d12
python version
Anduinnnnnn Aug 17, 2021
8b3e170
Merge remote-tracking branch 'origin/branch1' into branch1
Anduinnnnnn Aug 19, 2021
dd1a9c4
python version
Anduinnnnnn Aug 19, 2021
c9331fc
python version
Anduinnnnnn Aug 19, 2021
cd5fbc3
change test without conda
Anduinnnnnn Aug 23, 2021
629b7b4
change test without conda
Anduinnnnnn Aug 23, 2021
91b2f66
change test without conda
Anduinnnnnn Aug 23, 2021
8ec23c9
change test without conda
Anduinnnnnn Aug 24, 2021
9369149
change test without conda
Anduinnnnnn Aug 24, 2021
c176eb9
change test without conda
Anduinnnnnn Aug 24, 2021
e1119e9
change test without conda
Anduinnnnnn Aug 24, 2021
17bb8fc
change test without conda
Anduinnnnnn Aug 24, 2021
295fd78
change test without conda
Anduinnnnnn Aug 24, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 36 additions & 37 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test
name: Test

on:
push:
Expand All @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [windows-latest, ubuntu-16.04, ubuntu-18.04, ubuntu-20.04]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add macos-latest :
os: [windows-latest, ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-latest]

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some issues (in the downloading data phase) on MacOS when running with other tests. So we split it into an individual config.

python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.6, 3.7, 3.8]

steps:
- uses: actions/checkout@v2
Expand All @@ -25,90 +25,89 @@ jobs:

- name: Lint with Black
run: |
cd ..
python -m pip install --upgrade pip
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
73 changes: 0 additions & 73 deletions .github/workflows/test_macos.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/qlib.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.