Testing: Change config and installation to run the new tests

spyder-ide · Sep 14, 2018 · 7cc9345 · 7cc9345
1 parent faabaf9
commit 7cc9345
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,30 +1,32 @@
 version: 2
 
-jobs:
-  python2.7:
+main: &main
     machine: true
-    environment:
-      - PYTHON_VERSION: "2.7"
     steps:
       - checkout
       - run:
-          command: docker pull continuumio/miniconda3:latest
+          command: docker pull dorowu/ubuntu-desktop-lxde-vnc:trusty
+      - run:
+          name: Install system packages
+          command: |
+            sudo apt-get -qq update
+            sudo apt-get install libegl1-mesa
       - run:
           command: ./.circleci/install.sh
       - run:
           command: ./.circleci/run_tests.sh
+
+jobs:
+  python2.7:
+    python2.7:
+    <<: *main
+    environment:
+      - PYTHON_VERSION: "2.7"
+
   python3.6:
-    machine: true
+    <<: *main
     environment:
       - PYTHON_VERSION: "3.6"
-    steps:
-      - checkout
-      - run:
-          command: docker pull continuumio/miniconda3:latest
-      - run:
-          command: ./.circleci/install.sh
-      - run:
-          command: ./.circleci/run_tests.sh
 
 workflows:
   version: 2

diff --git a/.circleci/install.sh b/.circleci/install.sh
@@ -2,8 +2,9 @@
 
 export TRAVIS_OS_NAME="linux"
 export CONDA_DEPENDENCIES_FLAGS="--quiet"
-export CONDA_DEPENDENCIES="ipykernel cloudpickle nomkl numpy pandas scipy pytest pytest-cov metakernel matplotlib"
-export PIP_DEPENDENCIES="codecov"
+export CONDA_DEPENDENCIES="ipykernel cloudpickle nomkl numpy pandas scipy \
+                           metakernel matplotlib qtconsole pytest pytest-cov"
+export PIP_DEPENDENCIES="codecov pytest-qt"
 
 echo -e "PYTHON = $PYTHON_VERSION \n============"
 git clone git://github.com/astropy/ci-helpers.git > /dev/null

diff --git a/.circleci/run_tests.sh b/.circleci/run_tests.sh
@@ -3,7 +3,12 @@
 export PATH="$HOME/miniconda/bin:$PATH"
 source activate test
 
-pytest -x -vv --cov=spyder_kernels --cov-report=term-missing spyder_kernels
+# Install ipdb_kernel spec
+pip install -e .
+python spyder_kernels/ipdb install --user
+
+# Run tests
+pytest -x -vv --cov=spyder_kernels spyder_kernels
 
 if [ $? -ne 0 ]; then
     exit 1