From 65cbc327a75c510496167a3fce000131c0fe2afd Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Fri, 1 Jul 2016 00:02:15 -0500
Subject: [PATCH 1/2] Testing: Don't use particular tags when installing local
 conda packages

---
 RELEASE.md                                            | 7 -------
 continuous_integration/appveyor/run_test.bat          | 2 +-
 continuous_integration/conda-recipes/spyder/meta.yaml | 2 +-
 continuous_integration/travis/run_test.sh             | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 62f6a8d7bff..178ca671434 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -26,13 +26,6 @@ To release a new version of Spyder you need to follow these steps:
 
 * git push upstream --tags
 
-* Update to latest tag in
-    - continuous_integration/conda-recipes/spyder/meta.yaml
-    - continuous_integration/travis/run_test.sh
-    - continuous_integration/appveyor/run_test.bat
-
-* git add and git commit with [ci skip]
-
 * Optional: Create conda packages
     - conda build conda.recipe
     - anaconda upload spyder-*.tar.bz2 -u spyder-ide
diff --git a/continuous_integration/appveyor/run_test.bat b/continuous_integration/appveyor/run_test.bat
index 1732be54ec0..6ca7357780c 100644
--- a/continuous_integration/appveyor/run_test.bat
+++ b/continuous_integration/appveyor/run_test.bat
@@ -13,7 +13,7 @@ mkdir C:\projects\tmp
 cd C:\projects\tmp
 
 :: Install the package we created
-conda install -q -y --use-local spyder==3.0.0b4
+conda install -q -y --use-local spyder
 
 :: Install extra packages
 conda install -q -y %EXTRA_PACKAGES%
diff --git a/continuous_integration/conda-recipes/spyder/meta.yaml b/continuous_integration/conda-recipes/spyder/meta.yaml
index 7e5477dbc00..10e34baf0ca 100644
--- a/continuous_integration/conda-recipes/spyder/meta.yaml
+++ b/continuous_integration/conda-recipes/spyder/meta.yaml
@@ -1,7 +1,7 @@
 package:
   name: spyder
   version: {{ environ.get('GIT_DESCRIBE_TAG', '').replace('v', '') }}  # [unix]
-  version: 3.0.0b4  # [win]
+  version: 3.99.0  # [win]
 
 build:
   number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}  # [unix]
diff --git a/continuous_integration/travis/run_test.sh b/continuous_integration/travis/run_test.sh
index 9c56e82907a..f4507c66a2b 100755
--- a/continuous_integration/travis/run_test.sh
+++ b/continuous_integration/travis/run_test.sh
@@ -26,7 +26,7 @@ if [ "$USE_CONDA" = true ] ; then
     cd ~/tmp
 
     # Install and run the package
-    conda install --use-local spyder==3.0.0b4
+    conda install --use-local spyder
 
     # Install extra packages
     conda install -q $EXTRA_PACKAGES

From 96855052c21bbf1fd9ce6730ff627785a1c23b76 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Fri, 1 Jul 2016 00:47:05 -0500
Subject: [PATCH 2/2] Testing: Skip py.tests from modules_test.sh

---
 continuous_integration/travis/modules_test.sh | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/continuous_integration/travis/modules_test.sh b/continuous_integration/travis/modules_test.sh
index c0766665888..52dcad9b007 100755
--- a/continuous_integration/travis/modules_test.sh
+++ b/continuous_integration/travis/modules_test.sh
@@ -16,6 +16,9 @@ fi
 
 # Depth 1
 for f in spyderlib/*.py; do
+    if [[ $f == *tests/test_* ]]; then
+        continue
+    fi
     if [[ $f == spyderlib/pyplot.py ]]; then
         continue
     fi
@@ -28,6 +31,9 @@ done
 
 # Depth 2
 for f in spyderlib/*/*.py; do
+    if [[ $f == *tests/test_* ]]; then
+        continue
+    fi
     if [[ $f == spyderlib/app/*.py ]]; then
         continue
     fi
@@ -56,6 +62,9 @@ done
 
 # Depth 3
 for f in spyderlib/*/*/*.py; do
+    if [[ $f == *tests/test_* ]]; then
+        continue
+    fi
     if [[ $f == spyderlib/external/*/*.py ]]; then
         continue
     fi
@@ -86,6 +95,19 @@ for f in spyderlib/*/*/*.py; do
     fi
 done
 
+
+# Depth 4
+for f in spyderlib/*/*/*/*.py; do
+    if [[ $f == *tests/test_* ]]; then
+        continue
+    fi
+    python "$f"
+    if [ $? -ne 0 ]; then
+        exit 1
+    fi
+done
+
+
 # Spyderplugins
 for f in spyder_*/widgets/*.py; do
     python "$f"