Skip to content

Commit

Permalink
Merge pull request #3273 from ccordoba12/tst-no-tags
Browse files Browse the repository at this point in the history
Testing: Don't use particular tags when installing local conda packages
  • Loading branch information
ccordoba12 authored Jul 1, 2016
2 parents d1adadf + 9685505 commit 48c9672
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 10 deletions.
7 changes: 0 additions & 7 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/appveyor/run_test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/conda-recipes/spyder/meta.yaml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
22 changes: 22 additions & 0 deletions continuous_integration/travis/modules_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/travis/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 48c9672

Please sign in to comment.