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

Commit48e5f54

Browse files
committed
Switch to pytest-pep8.
1 parent6d3610b commit48e5f54

File tree

4 files changed

+146
-301
lines changed

4 files changed

+146
-301
lines changed

‎.travis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ env:
4343
-OPENBLAS_NUM_THREADS=1
4444
-PANDAS=
4545
-NPROC=2
46-
-TEST_ARGS=--no-pep8
46+
-INSTALL_PEP8=
47+
-RUN_PEP8=
4748
-NOSE_ARGS="-j $NPROC"
4849
-PYTEST_ARGS="-ra --maxfail=1 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
4950
-PYTHON_ARGS=
@@ -61,9 +62,9 @@ matrix:
6162
-python:3.5
6263
env:BUILD_DOCS=true
6364
-python:3.5
64-
env:USE_PYTEST=true PANDAS=pandas DELETE_FONT_CACHE=1 TEST_ARGS=
65+
env:USE_PYTEST=true PANDAS=pandas DELETE_FONT_CACHE=1
6566
-python:3.6
66-
env:USE_PYTEST=true DELETE_FONT_CACHE=1TEST_ARGS=
67+
env:USE_PYTEST=true DELETE_FONT_CACHE=1INSTALL_PEP8=pytest-pep8 RUN_PEP8=--pep8
6768
-python:"nightly"
6869
env:PRE=--pre
6970
-os:osx
@@ -113,14 +114,14 @@ install:
113114
pip install --upgrade setuptools
114115
-|
115116
# Install dependencies from pypi
116-
pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.6 $PANDASpep8cycler coveralls coverage $MOCK
117+
pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.6 $PANDAS cycler coveralls coverage $MOCK
117118
pip install $PRE -r doc-requirements.txt
118119
119120
# Install nose from a build which has partial
120121
# support for python36 and suport for coverage output suppressing
121122
pip install git+https://github.com/jenshnielsen/nose.git@matplotlibnose
122123
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
123-
pip install $PRE pytest 'pytest-cov>=2.3.1' pytest-timeout pytest-xdist pytest-faulthandler
124+
pip install $PRE pytest 'pytest-cov>=2.3.1' pytest-timeout pytest-xdist pytest-faulthandler $INSTALL_PEP8
124125
125126
# We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
126127
# availible in the Ubuntu version used by Travis but we can manually install the deb from a later
@@ -154,13 +155,12 @@ script:
154155
if [[ $DELETE_FONT_CACHE == 1 ]]; then
155156
rm -rf ~/.cache/matplotlib
156157
fi
157-
export MPL_REPO_DIR=$PWD # needed for pep8-conformance test of the examples
158158
if [[ $USE_PYTEST == false ]]; then
159-
echo The following args are passed to nose $NOSE_ARGS
159+
echo The following args are passed to nose $NOSE_ARGS $RUN_PEP8
160160
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
161-
python tests.py $NOSE_ARGS $TEST_ARGS
161+
python tests.py $NOSE_ARGS $RUN_PEP8
162162
else
163-
gdb -return-child-result -batch -ex r -ex bt --args python $PYTHON_ARGS tests.py $NOSE_ARGS $TEST_ARGS
163+
gdb -return-child-result -batch -ex r -ex bt --args python $PYTHON_ARGS tests.py $NOSE_ARGS $RUN_PEP8
164164
fi
165165
else
166166
# Workaround for pytest-xdist flaky colletion order
@@ -169,8 +169,8 @@ script:
169169
export PYTHONHASHSEED=$(shuf -i 1-4294967295 -n 1)
170170
echo PYTHONHASHSEED=$PYTHONHASHSEED
171171
172-
echo The following args are passed to pytest $PYTEST_ARGS
173-
py.test $PYTEST_ARGS $TEST_ARGS
172+
echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8
173+
py.test $PYTEST_ARGS $RUN_PEP8
174174
fi
175175
else
176176
cd doc

‎appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ environment:
1414
CMD_IN_ENV:"cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd"
1515
# Workaround for https://github.com/conda/conda-build/issues/636
1616
PYTHONIOENCODING:"UTF-8"
17-
TEST_ARGS:--no-pep8
1817
PYTEST_ARGS:-ra --timeout=300 --durations=25#--cov-report= --cov=lib #-n %NUMBER_OF_PROCESSORS%
1918
USE_PYTEST:no
2019
#PYTHONHASHSEED: 0 # Workaround for pytest-xdist flaky colletion order
@@ -137,8 +136,8 @@ test_script:
137136
-python -c "import matplotlib as m; m.use('tkagg'); import matplotlib.pyplot as plt; print(plt.get_backend())"
138137
# tests
139138
-if x%USE_PYTEST% == xyes echo The following args are passed to pytest %PYTEST_ARGS%
140-
-if x%USE_PYTEST% == xyes py.test %PYTEST_ARGS% %TEST_ARGS%
141-
-if x%USE_PYTEST% == xno python tests.py %TEST_ARGS%
139+
-if x%USE_PYTEST% == xyes py.test %PYTEST_ARGS%
140+
-if x%USE_PYTEST% == xno python tests.py
142141
# Generate a html for visual tests
143142
-python visual_tests.py
144143

‎lib/matplotlib/tests/test_coding_standards.py

Lines changed: 0 additions & 287 deletions
This file was deleted.

0 commit comments

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