Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaa11a84

Browse files
committed
Stop installing nose in CI.
1 parent67ed3c8 commitaa11a84

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

‎.travis.yml‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ env:
4444
-PANDAS=
4545
-NPROC=2
4646
-TEST_ARGS=--no-pep8
47-
-NOSE_ARGS="-j $NPROC"
4847
-PYTEST_ARGS="-ra --maxfail=1 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
4948
-PYTHON_ARGS=
5049
-DELETE_FONT_CACHE=
@@ -57,7 +56,7 @@ matrix:
5756
-python:3.4
5857
env:PYTHON_ARGS=-OO
5958
-python:3.5
60-
env:PANDAS=pandasNOSE_ARGS=--with-coverageDELETE_FONT_CACHE=1
59+
env:PANDAS=pandas DELETE_FONT_CACHE=1
6160
-python:3.5
6261
env:BUILD_DOCS=true
6362
-python:3.5
@@ -69,7 +68,7 @@ matrix:
6968
-os:osx
7069
osx_image:xcode7.3
7170
language:generic# https://github.com/travis-ci/travis-ci/issues/2312
72-
env:MOCK=mock NOSE_ARGS=
71+
env:MOCK=mock
7372
cache:
7473
# As for now travis caches only "$HOME/.cache/pip"
7574
# https://docs.travis-ci.com/user/caching/#pip-cache
@@ -116,9 +115,6 @@ install:
116115
pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.6 $PANDAS pep8 cycler coveralls coverage $MOCK
117116
pip install $PRE -r doc-requirements.txt
118117
119-
# Install nose from a build which has partial
120-
# support for python36 and suport for coverage output suppressing
121-
pip install git+https://github.com/jenshnielsen/nose.git@matplotlibnose
122118
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
123119
pip install $PRE pytest 'pytest-cov>=2.3.1' pytest-timeout pytest-xdist pytest-faulthandler
124120
@@ -155,20 +151,20 @@ script:
155151
rm -rf ~/.cache/matplotlib
156152
fi
157153
export MPL_REPO_DIR=$PWD # needed for pep8-conformance test of the examples
154+
# Workaround for pytest-xdist flaky colletion order
155+
# https://github.com/pytest-dev/pytest/issues/920
156+
# https://github.com/pytest-dev/pytest/issues/1075
157+
export PYTHONHASHSEED=$(shuf -i 1-4294967295 -n 1)
158+
echo PYTHONHASHSEED=$PYTHONHASHSEED
159+
158160
if [[ $USE_PYTEST == false ]]; then
159-
echo The following args are passed tonose $NOSE_ARGS
161+
echo The following args are passed topytest $PYTEST_ARGS
160162
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
161-
python tests.py $NOSE_ARGS $TEST_ARGS
163+
python tests.py $PYTEST_ARGS $TEST_ARGS
162164
else
163-
gdb -return-child-result -batch -ex r -ex bt --args python $PYTHON_ARGS tests.py $NOSE_ARGS $TEST_ARGS
165+
gdb -return-child-result -batch -ex r -ex bt --args python $PYTHON_ARGS tests.py $PYTEST_ARGS $TEST_ARGS
164166
fi
165167
else
166-
# Workaround for pytest-xdist flaky colletion order
167-
# https://github.com/pytest-dev/pytest/issues/920
168-
# https://github.com/pytest-dev/pytest/issues/1075
169-
export PYTHONHASHSEED=$(shuf -i 1-4294967295 -n 1)
170-
echo PYTHONHASHSEED=$PYTHONHASHSEED
171-
172168
echo The following args are passed to pytest $PYTEST_ARGS
173169
py.test $PYTEST_ARGS $TEST_ARGS
174170
fi
@@ -225,7 +221,7 @@ after_success:
225221
else
226222
echo "Will only deploy docs build from matplotlib master branch"
227223
fi
228-
if [[ $NOSE_ARGS =~ "--with-coverage" || $USE_PYTEST == true ]]; then
224+
if [[ $USE_PYTEST == true ]]; then
229225
coveralls
230226
bash <(curl -s https://codecov.io/bash)
231227
fi

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ install:
9292
-conda create -q -n test-environment python=%PYTHON_VERSION%
9393
pip setuptools numpy python-dateutil freetype=2.6 msinttypes "tk=8.5"
9494
pyparsing pytz tornado "libpng>=1.6.21,<1.7" "zlib=1.2" "cycler>=0.10"
95-
nosemock sphinx
95+
mock sphinx
9696
-activate test-environment
9797
-cmd:echo %PYTHON_VERSION% %TARGET_ARCH%
9898
-cmd:IF %PYTHON_VERSION% == 2.7 conda install -q functools32
9999
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
100-
-if x%USE_PYTEST% == xyesconda install -q pytest "pytest-cov>=2.3.1" pytest-timeout#pytest-xdist
100+
-conda install -q pytest "pytest-cov>=2.3.1" pytest-timeout#pytest-xdist
101101

102102
# Let the install prefer the static builds of the libs
103103
-set LIBRARY_LIB=%CONDA_PREFIX%\Library\lib

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp