-
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36 from jitseniesen/spy4
PR: Compatibility changes for Spyder 4
- Loading branch information
Showing
12 changed files
with
79 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# https://travis-ci.org/spyder-ide/spyder-line-profiler | ||
|
||
language: generic | ||
dist: xenial | ||
services: | ||
- xvfb | ||
|
||
matrix: | ||
fast_finish: true | ||
include: | ||
- env: PYTHON_VERSION=2.7 USE_CONDA=yes | ||
- env: PYTHON_VERSION=3.6 USE_CONDA=yes | ||
- env: PYTHON_VERSION=3.7 USE_CONDA=yes | ||
|
||
before_install: | ||
# Avoid annoying focus problems when running tests | ||
# See discussion in e.g. https://github.com/spyder-ide/spyder/pull/6132 | ||
- sudo apt-get -qq update | ||
- sudo apt-get install -y matchbox-window-manager xterm libxkbcommon-x11-0 | ||
- matchbox-window-manager& | ||
- sleep 5 | ||
|
||
install: | ||
- ./continuous_integration/circle/install.sh | ||
|
||
script: | ||
- ./continuous_integration/circle/run_tests.sh | ||
|
||
after_success: | ||
- ./continuous_integration/circle/coverage.sh |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
#!/bin/bash -ex | ||
|
||
# -- Install Miniconda | ||
MINICONDA=Miniconda3-latest-Linux-x86_64.sh | ||
wget https://repo.continuum.io/miniconda/$MINICONDA -O miniconda.sh | ||
bash miniconda.sh -b -p $HOME/miniconda | ||
source $HOME/miniconda/etc/profile.d/conda.sh | ||
|
||
|
||
# -- Make new conda environment with required Python version | ||
conda create -y -n test python=$PYTHON_VERSION | ||
conda activate test | ||
|
||
|
||
# -- Install dependencies | ||
|
||
# Avoid problems with invalid SSL certificates | ||
if [ "$PYTHON_VERSION" = "2.7" ]; then | ||
conda install -q -y python=2.7.16=h9bab390_0 | ||
fi | ||
|
||
# Install nomkl to avoid installing Intel MKL libraries | ||
conda install -q -y nomkl | ||
|
||
# Install main dependencies | ||
conda install -q -y -c spyder-ide --file requirements/conda.txt | ||
|
||
# Install test ones | ||
conda install -q -y -c spyder-ide --file requirements/tests.txt |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
line_profiler | ||
spyder >=4.0.0b5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
coveralls | ||
mock | ||
pytest | ||
pytest-cov | ||
pytest-qt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters