From 6055312fec27886979cb4ad10650c627af25eac8 Mon Sep 17 00:00:00 2001 From: Damien Nguyen Date: Tue, 15 Jun 2021 16:33:32 +0200 Subject: [PATCH] Fix CI build issues on Windows and increase minimum to numpy >= 1.17 --- .github/workflows/ci.yml | 21 +++++++++++++++++---- setup.cfg | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 450f4bb6c..4c8a6f00e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,13 +27,24 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Get history and tags for SCM versioning to work + - name: Get history and tags for SCM versioning to work (Unix) + if: runner.os != 'Windows' run: | if [ $(git rev-parse --is-shallow-repository) == "true" ]; then git fetch --prune --unshallow git fetch --depth=1 origin +refs/tags/*:refs/tags/* fi + - name: Get history and tags for SCM versioning to work (Windows) + if: runner.os == 'Windows' + run: | + $value = git rev-parse --is-shallow-repository + if ( $value -eq "true" ) + { + git fetch --prune --unshallow + git fetch --depth=1 origin +refs/tags/*:refs/tags/* + } + - name: Setup Python ${{ matrix.python }} uses: actions/setup-python@v2 with: @@ -333,12 +344,14 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Get history and tags for SCM versioning to work + - name: Get history and tags for SCM versioning to work (Windows) run: | - if [ $(git rev-parse --is-shallow-repository) == "true" ]; then + $value = git rev-parse --is-shallow-repository + if ( $value -eq "true" ) + { git fetch --prune --unshallow git fetch --depth=1 origin +refs/tags/*:refs/tags/* - fi + } - name: Get pip cache dir id: pip-cache diff --git a/setup.cfg b/setup.cfg index c81e99ae7..875789313 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,7 +33,7 @@ python_requires = >= 3 install_requires = matplotlib >= 2.2.3 networkx >= 2 - numpy + numpy >= 1.17 # mainly for Qiskit requests scipy