Skip to content

Commit

Permalink
Merge pull request #3 from radarhere/add-cygwin-to-ci
Browse files Browse the repository at this point in the history
Do not install NumPy on Python 3.11

So that's how I was supposed to resolve that merge conflict.  Thank you.
  • Loading branch information
DWesl committed Apr 30, 2022
2 parents 08e0d0b + 2d25e66 commit 3453b0e
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions .ci/install.sh
Expand Up @@ -35,12 +35,11 @@ python3 -m pip install -U pytest-cov
python3 -m pip install -U pytest-timeout
python3 -m pip install pyroma
python3 -m pip install test-image-results
# TODO Remove condition when NumPy supports 3.11
if ! [ "$GHA_PYTHON_VERSION" == "3.11-dev" ]; then python3 -m pip install numpy ; fi

if [[ $(uname) != CYGWIN* ]]; then
PYTHONOPTIMIZE=0 python3 -m pip install cffi
python3 -m pip install numpy
# TODO Remove condition when NumPy supports 3.11
if ! [ "$GHA_PYTHON_VERSION" == "3.11-dev" ]; then python3 -m pip install numpy ; fi

# PyQt6 doesn't support PyPy3
if [[ $GHA_PYTHON_VERSION == 3.* ]]; then
Expand Down

0 comments on commit 3453b0e

Please sign in to comment.