Skip to content

Commit

Permalink
Merge from 5.x: PR #18413
Browse files Browse the repository at this point in the history
Fixes #18407
  • Loading branch information
dalthviz committed Jun 23, 2022
2 parents 34fb03e + 5f271fc commit 8d8eb36
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
10 changes: 10 additions & 0 deletions .github/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ if [ "$USE_CONDA" = "true" ]; then

# To check our manifest and coverage
mamba install check-manifest codecov -c conda-forge -q -y

# Numpy 1.23 is not giving completions on the editor and the console
if [ "$OS" = "win" ]; then
mamba install numpy=1.22
else
mamba install 'numpy<1.23'
fi
else
# Update pip and setuptools
python -m pip install -U pip setuptools wheel build
Expand All @@ -37,6 +44,9 @@ else
# To check our manifest and coverage
pip install -q check-manifest codecov

# Numpy 1.23 is not giving completions on the editor and the console
pip install 'numpy<1.23'

# This allows the test suite to run more reliably on Linux
if [ "$OS" = "linux" ]; then
pip uninstall pyqt5 pyqt5-qt5 pyqt5-sip pyqtwebengine pyqtwebengine-qt5 -q -y
Expand Down
2 changes: 1 addition & 1 deletion installers/Windows/req-extras-pull-request.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ rope
yapf

# Scientific packages (for Same as Spyder)
numpy
numpy<1.23
scipy
pandas
openpyxl # pandas optional dependency to handle Excel files
Expand Down
2 changes: 1 addition & 1 deletion installers/Windows/req-extras-release.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ rope
yapf

# Scientific packages (for Same as Spyder)
numpy
numpy<1.23
scipy
pandas
openpyxl # pandas optional dependency to handle Excel files
Expand Down
2 changes: 1 addition & 1 deletion installers/macOS/req-scientific.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Scientific packages (for Same as Spyder)
cython
matplotlib
numpy
numpy<1.23
openpyxl
pandas
scipy
Expand Down

0 comments on commit 8d8eb36

Please sign in to comment.