diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d61678b46..6b7d7cc29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: - name: pip cache (linux) uses: actions/cache@v2 - if: startsWith(matrix.os, 'ubuntu') + if: runner.os == 'Linux' with: path: ~/.cache/pip key: test-${{ matrix.os }}-${{ matrix.python-version }}-pip @@ -49,8 +49,9 @@ jobs: cd build_helpers && ./install_ta-lib.sh ${HOME}/dependencies/; cd .. - name: Installation - *nix + if: runner.os == 'Linux' run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip wheel export LD_LIBRARY_PATH=${HOME}/dependencies/lib:$LD_LIBRARY_PATH export TA_LIBRARY_PATH=${HOME}/dependencies/lib export TA_INCLUDE_PATH=${HOME}/dependencies/include @@ -68,7 +69,7 @@ jobs: if: matrix.python-version == '3.9' - name: Coveralls - if: (startsWith(matrix.os, 'ubuntu-20') && matrix.python-version == '3.8') + if: (runner.os == 'Linux' && matrix.python-version == '3.8') env: # Coveralls token. Not used as secret due to github not providing secrets to forked repositories COVERALLS_REPO_TOKEN: 6D1m0xupS3FgutfuGao8keFf9Hc0FpIXu @@ -132,7 +133,7 @@ jobs: - name: pip cache (macOS) uses: actions/cache@v2 - if: startsWith(matrix.os, 'macOS') + if: runner.os == 'macOS' with: path: ~/Library/Caches/pip key: test-${{ matrix.os }}-${{ matrix.python-version }}-pip @@ -143,10 +144,11 @@ jobs: cd build_helpers && ./install_ta-lib.sh ${HOME}/dependencies/; cd .. - name: Installation - macOS + if: runner.os == 'macOS' run: | brew update brew install hdf5 c-blosc - python -m pip install --upgrade pip + python -m pip install --upgrade pip wheel export LD_LIBRARY_PATH=${HOME}/dependencies/lib:$LD_LIBRARY_PATH export TA_LIBRARY_PATH=${HOME}/dependencies/lib export TA_INCLUDE_PATH=${HOME}/dependencies/include @@ -158,7 +160,7 @@ jobs: pytest --random-order --cov=freqtrade --cov-config=.coveragerc - name: Coveralls - if: (startsWith(matrix.os, 'ubuntu-20') && matrix.python-version == '3.8') + if: (runner.os == 'Linux' && matrix.python-version == '3.8') env: # Coveralls token. Not used as secret due to github not providing secrets to forked repositories COVERALLS_REPO_TOKEN: 6D1m0xupS3FgutfuGao8keFf9Hc0FpIXu @@ -216,7 +218,6 @@ jobs: - name: Pip cache (Windows) uses: actions/cache@preview - if: startsWith(runner.os, 'Windows') with: path: ~\AppData\Local\pip\Cache key: ${{ matrix.os }}-${{ matrix.python-version }}-pip diff --git a/build_helpers/install_windows.ps1 b/build_helpers/install_windows.ps1 index 6247a344f..f04869780 100644 --- a/build_helpers/install_windows.ps1 +++ b/build_helpers/install_windows.ps1 @@ -1,7 +1,7 @@ # Downloads don't work automatically, since the URL is regenerated via javascript. # Downloaded from https://www.lfd.uci.edu/~gohlke/pythonlibs/#ta-lib -python -m pip install --upgrade pip +python -m pip install --upgrade pip wheel $pyv = python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')" diff --git a/requirements.txt b/requirements.txt index 0bd6ca240..8a2a7c258 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ -numpy==1.22.0 +numpy==1.21.5; python_version <= '3.7' +numpy==1.22.0; python_version > '3.7' pandas==1.3.5 pandas-ta==0.3.14b