Skip to content

Commit 403cc95

Browse files
FHaaseFHaase
committed
Merge remote-tracking branch 'upstream/master' into feature/flake8-rst
# Conflicts: # ci/code_checks.sh
2 parents c01e22d + 047242b commit 403cc95

File tree

120 files changed

+2083
-1125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+2083
-1125
lines changed

‎ci/azure-windows-36.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ dependencies:
77
- bottleneck
88
- boost-cpp<1.67
99
- fastparquet
10-
- feather-format
1110
- matplotlib
1211
- numexpr
1312
- numpy=1.14*

‎ci/azure/windows-py27.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
displayName: 'Build'
3838
- script: |
3939
call activate %CONDA_ENV%
40-
pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict %*
40+
pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
4141
displayName: 'Test'
4242
- task: PublishTestResults@2
4343
inputs:

‎ci/azure/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
displayName: 'Build'
2929
- script: |
3030
call activate %CONDA_ENV%
31-
pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict %*
31+
pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
3232
displayName: 'Test'
3333
- task: PublishTestResults@2
3434
inputs:

‎ci/circle/run_circle.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ export PATH="$MINICONDA_DIR/bin:$PATH"
55

66
source activate pandas
77

8-
echo "pytest --strict --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas"
9-
pytest --strict --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas
8+
echo "pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas"
9+
pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas

‎ci/code_checks.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,16 @@ if [[ -z "$CHECK" || "$CHECK" == "lint" ]]; then
4747
echo "flake8-rst --version"
4848
flake8-rst --version
4949

50-
MSG='Linting code-blocks in .py docstrings' ; echo $MSG
51-
flake8-rst pandas
50+
MSG='Linting code-blocks in .rst documentation' ; echo $MSG
51+
flake8-rst doc/source --filename=*.rst
5252
RET=$(($RET + $?)) ; echo $MSG "DONE"
5353

54-
MSG='Linting code-blocks in .rst documentation' ; echo $MSG
55-
flake8-rst doc --filename=*.rst
54+
# Check that cython casting is of the form `<type>obj` as opposed to `<type> obj`;
55+
# it doesn't make a difference, but we want to be internally consistent.
56+
# Note: this grep pattern is (intended to be) equivalent to the python
57+
# regex r'(?<![ ->])> '
58+
MSG='Linting .pyx code for spacing conventions in casting' ; echo $MSG
59+
! grep -r -E --include '*.pyx' --include '*.pxi.in' '> ' pandas/_libs | grep -v '[ ->]> '
5660
RET=$(($RET + $?)) ; echo $MSG "DONE"
5761

5862
# readability/casting: Warnings about C casting instead of C++ casting

‎ci/requirements-optional-conda.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ beautifulsoup4>=4.2.1
22
blosc
33
bottleneck>=1.2.0
44
fastparquet
5-
feather-format
65
gcsfs
76
html5lib
87
ipython>=5.6.0
@@ -13,7 +12,7 @@ matplotlib>=2.0.0
1312
nbsphinx
1413
numexpr>=2.6.1
1514
openpyxl
16-
pyarrow
15+
pyarrow>=0.4.1
1716
pymysql
1817
pytables>=3.4.2
1918
pytest-cov

‎ci/requirements-optional-pip.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ beautifulsoup4>=4.2.1
44
blosc
55
bottleneck>=1.2.0
66
fastparquet
7-
feather-format
87
gcsfs
98
html5lib
109
ipython>=5.6.0
@@ -15,7 +14,7 @@ matplotlib>=2.0.0
1514
nbsphinx
1615
numexpr>=2.6.1
1716
openpyxl
18-
pyarrow
17+
pyarrow>=0.4.1
1918
pymysql
2019
tables
2120
pytest-cov
@@ -28,4 +27,4 @@ statsmodels
2827
xarray
2928
xlrd
3029
xlsxwriter
31-
xlwt
30+
xlwt

‎ci/script_multi.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ if [ "$DOC" ]; then
2727
echo "We are not running pytest as this is a doc-build"
2828

2929
elif [ "$COVERAGE" ]; then
30-
echo pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas
31-
pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas
30+
echo pytest -s -n 2 -m "not single" --durations=10 --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas
31+
pytest -s -n 2 -m "not single" --durations=10 --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas
3232

3333
elif [ "$SLOW" ]; then
3434
TEST_ARGS="--only-slow --skip-network"
35-
echo pytest -m "not single and slow" -v --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas
36-
pytest -m "not single and slow" -v --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas
35+
echo pytest -m "not single and slow" -v --durations=10 --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas
36+
pytest -m "not single and slow" -v --durations=10 --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas
3737

3838
else
39-
echo pytest -n 2 -m "not single" --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas
40-
pytest -n 2 -m "not single" --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas # TODO: doctest
39+
echo pytest -n 2 -m "not single" --durations=10 --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas
40+
pytest -n 2 -m "not single" --durations=10 --junitxml=test-data-multiple.xml --strict $TEST_ARGS pandas # TODO: doctest
4141

4242
fi
4343

‎ci/script_single.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ if [ "$DOC" ]; then
2626
echo "We are not running pytest as this is a doc-build"
2727

2828
elif [ "$COVERAGE" ]; then
29-
echo pytest -s -m "single" --strict --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=test-data-single.xml $TEST_ARGS pandas
30-
pytest -s -m "single" --strict --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=test-data-single.xml $TEST_ARGS pandas
29+
echo pytest -s -m "single" --durations=10 --strict --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=test-data-single.xml $TEST_ARGS pandas
30+
pytest -s -m "single" --durations=10 --strict --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=test-data-single.xml $TEST_ARGS pandas
3131
echo pytest -s --strict scripts
3232
pytest -s --strict scripts
3333
else
34-
echo pytest -m "single" --junitxml=test-data-single.xml --strict $TEST_ARGS pandas
35-
pytest -m "single" --junitxml=test-data-single.xml --strict $TEST_ARGS pandas
34+
echo pytest -m "single" --durations=10 --junitxml=test-data-single.xml --strict $TEST_ARGS pandas
35+
pytest -m "single" --durations=10 --junitxml=test-data-single.xml --strict $TEST_ARGS pandas
3636

3737
fi
3838

‎ci/travis-27.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ dependencies:
77
- bottleneck
88
- cython=0.28.2
99
- fastparquet
10-
- feather-format
1110
- gcsfs
1211
- html5lib
1312
- ipython

0 commit comments

Comments
 (0)