Skip to content

Commit 5d903a0

Browse files
authored
Merge branch 'master' into tz-localize-categories
2 parents e4bb4c6 + 069e124 commit 5d903a0

File tree

120 files changed

+3368
-2462
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

+3368
-2462
lines changed

ci/code_checks.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then
125125
# invgrep -R --include="*.py*" -E "from numpy import nan " pandas # GH#24822 not yet implemented since the offending imports have not all been removed
126126
RET=$(($RET + $?)) ; echo $MSG "DONE"
127127

128+
MSG='Check for use of exec' ; echo $MSG
129+
invgrep -R --include="*.py*" -E "[^a-zA-Z0-9_]exec\(" pandas
130+
RET=$(($RET + $?)) ; echo $MSG "DONE"
131+
128132
MSG='Check for pytest warns' ; echo $MSG
129133
invgrep -r -E --include '*.py' 'pytest\.warns' pandas/tests/
130134
RET=$(($RET + $?)) ; echo $MSG "DONE"
@@ -184,7 +188,7 @@ if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then
184188
invgrep -R --include="*.rst" ".. ipython ::" doc/source
185189
RET=$(($RET + $?)) ; echo $MSG "DONE"
186190

187-
MSG='Check that no file in the repo contains tailing whitespaces' ; echo $MSG
191+
MSG='Check that no file in the repo contains trailing whitespaces' ; echo $MSG
188192
set -o pipefail
189193
if [[ "$AZURE" == "true" ]]; then
190194
# we exclude all c/cpp files as the c/cpp files of pandas code base are tested when Linting .c and .h files

ci/deps/travis-36-cov.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies:
2929
- python-snappy
3030
- python=3.6.*
3131
- pytz
32-
- s3fs
32+
- s3fs<0.3
3333
- scikit-learn
3434
- scipy
3535
- sqlalchemy

ci/deps/travis-36-slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
- python-dateutil
1919
- python=3.6.*
2020
- pytz
21-
- s3fs
21+
- s3fs<0.3
2222
- scipy
2323
- sqlalchemy
2424
- xlrd

ci/deps/travis-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
- pytest-xdist>=1.29.0
1818
- pytest-mock
1919
- hypothesis>=3.58.0
20-
- s3fs
20+
- s3fs<0.3
2121
- pip
2222
- pyreadstat
2323
- pip:

ci/run_tests.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ do
4343
# if no tests are found (the case of "single and slow"), pytest exits with code 5, and would make the script fail, if not for the below code
4444
sh -c "$PYTEST_CMD; ret=\$?; [ \$ret = 5 ] && exit 0 || exit \$ret"
4545

46-
# 2019-08-21 disabling because this is hitting HTTP 400 errors GH#27602
47-
# if [[ "$COVERAGE" && $? == 0 && "$TRAVIS_BRANCH" == "master" ]]; then
48-
# echo "uploading coverage for $TYPE tests"
49-
# echo "bash <(curl -s https://codecov.io/bash) -Z -c -F $TYPE -f $COVERAGE_FNAME"
50-
# bash <(curl -s https://codecov.io/bash) -Z -c -F $TYPE -f $COVERAGE_FNAME
51-
# fi
46+
if [[ "$COVERAGE" && $? == 0 && "$TRAVIS_BRANCH" == "master" ]]; then
47+
echo "uploading coverage for $TYPE tests"
48+
echo "bash <(curl -s https://codecov.io/bash) -Z -c -F $TYPE -f $COVERAGE_FNAME"
49+
bash <(curl -s https://codecov.io/bash) -Z -c -F $TYPE -f $COVERAGE_FNAME
50+
fi
5251
done

doc/.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
data/
2+
timeseries.csv
3+
timeseries.parquet
4+
timeseries_wide.parquet

doc/redirects.csv

+3
Original file line numberDiff line numberDiff line change
@@ -1577,3 +1577,6 @@ generated/pandas.unique,../reference/api/pandas.unique
15771577
generated/pandas.util.hash_array,../reference/api/pandas.util.hash_array
15781578
generated/pandas.util.hash_pandas_object,../reference/api/pandas.util.hash_pandas_object
15791579
generated/pandas.wide_to_long,../reference/api/pandas.wide_to_long
1580+
1581+
# Cached searches
1582+
reference/api/pandas.DataFrame.from_csv,pandas.read_csv

doc/source/development/contributing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ the expected correct result::
952952
Transitioning to ``pytest``
953953
~~~~~~~~~~~~~~~~~~~~~~~~~~~
954954

955-
*pandas* existing test structure is *mostly* classed based, meaning that you will typically find tests wrapped in a class.
955+
*pandas* existing test structure is *mostly* class-based, meaning that you will typically find tests wrapped in a class.
956956

957957
.. code-block:: python
958958

doc/source/index.rst.template

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ See the :ref:`overview` for more detail about what's in the library.
8383
* :doc:`user_guide/style`
8484
* :doc:`user_guide/options`
8585
* :doc:`user_guide/enhancingperf`
86+
* :doc:`user_guide/scale`
8687
* :doc:`user_guide/sparse`
8788
* :doc:`user_guide/gotchas`
8889
* :doc:`user_guide/cookbook`

doc/source/reference/indexing.rst

-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ Selecting
166166
Index.get_slice_bound
167167
Index.get_value
168168
Index.get_values
169-
Index.set_value
170169
Index.isin
171170
Index.slice_indexer
172171
Index.slice_locs

doc/source/user_guide/index.rst

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Further information on any specific method can be obtained in the
3838
style
3939
options
4040
enhancingperf
41+
scale
4142
sparse
4243
gotchas
4344
cookbook

0 commit comments

Comments
 (0)