8000 Merge remote-tracking branch 'upstream/master' into deprecate-nonkeyw… · pandas-dev/pandas@d9b3712 · GitHub
[go: up one dir, main page]
Skip to content

Commit d9b3712

Browse files
simonjayhawkinssimonjayhawkins
committed
Merge remote-tracking branch 'upstream/master' into deprecate-nonkeyword-args-concat
2 parents 1ee4805 + b1e62a1 commit d9b3712

File tree

87 files changed

+930
-768
lines changed

Some content is hidden

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

87 files changed

+930
-768
lines changed

‎.travis.yml

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

‎ci/check_git_tags.sh

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

‎ci/deps/travis-37-arm64.yaml renamed to ‎ci/deps/circle-37-arm64.yaml

File renamed without changes.

‎ci/prep_cython_cache.sh

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

‎ci/setup_env.sh

Lines changed: 12 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,41 +12,30 @@ if [[ "$(uname)" == "Linux" && -n "$LC_ALL" ]]; then
1212
echo
1313
fi
1414

15-
MINICONDA_DIR="$HOME/miniconda3"
16-
17-
18-
if [ -d "$MINICONDA_DIR" ]; then
19-
echo
20-
echo "rm -rf "$MINICONDA_DIR""
21-
rm -rf "$MINICONDA_DIR"
22-
fi
2315

2416
echo "Install Miniconda"
25-
UNAME_OS=$(uname)
26-
if [[ "$UNAME_OS" == 'Linux' ]]; then
17+
DEFAULT_CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest"
18+
if [[ "$(uname -m)" == 'aarch64' ]]; then
19+
CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.10.1-4/Miniforge3-4.10.1-4-Linux-aarch64.sh"
20+
elif [[ "$(uname)" == 'Linux' ]]; then
2721
if [[ "$BITS32" == "yes" ]]; then
28-
CONDA_OS="Linux-x86"
22+
CONDA_URL="$DEFAULT_CONDA_URL-Linux-x86.sh"
2923
else
30-
CONDA_OS="Linux-x86_64"
24+
CONDA_URL="$DEFAULT_CONDA_URL-Linux-x86_64.sh"
3125
fi
32-
elif [[ "$UNAME_OS" == 'Darwin' ]]; then
33-
CONDA_OS="MacOSX-x86_64"
26+
elif [[ "$(uname)" == 'Darwin' ]]; then
27+
CONDA_URL="$DEFAULT_CONDA_URL-MacOSX-x86_64.sh"
3428
else
35-
echo "OS $UNAME_OS not supported"
29+
echo "OS $(uname) not supported"
3630
exit 1
3731
fi
38-
39-
if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
40-
CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.5-1/Miniforge3-4.8.5-1-Linux-aarch64.sh"
41-
else
42-
CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh"
43-
fi
32+
echo "Downloading $CONDA_URL"
4433
wget -q $CONDA_URL -O miniconda.sh
4534
chmod +x miniconda.sh
4635

47-
# Installation path is required for ARM64 platform as miniforge script installs in path $HOME/miniforge3.
36+
MINICONDA_DIR="$HOME/miniconda3"
37+
rm -rf $MINICONDA_DIR
4838
./miniconda.sh -b -p $MINICONDA_DIR
49-
5039
export PATH=$MINICONDA_DIR/bin:$PATH
5140

5241
echo
@@ -63,29 +52,6 @@ conda update -n base conda
6352
echo "conda info -a"
6453
conda info -a
6554

66-
echo
67-
echo "set the compiler cache to work"
68-
if [ -z "$NOCACHE" ] && [ "${TRAVIS_OS_NAME}" == "linux" ]; then
69-
echo "Using ccache"
70-
export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
71-
GCC=$(which gcc)
72-
echo "gcc: $GCC"
73-
CCACHE=$(which ccache)
74-
echo "ccache: $CCACHE"
75-
export CC='ccache gcc'
76-
elif [ -z "$NOCACHE" ] && [ "${TRAVIS_OS_NAME}" == "osx" ]; then
77-
echo "Install ccache"
78-
brew install ccache > /dev/null 2>&1
79-
echo "Using ccache"
80-
export PATH=/usr/local/opt/ccache/libexec:$PATH
81-
gcc=$(which gcc)
82-
echo "gcc: $gcc"
83-
CCACHE=$(which ccache)
84-
echo "ccache: $CCACHE"
85-
else
86-
echo "Not using ccache"
87-
fi
88-
8955
echo "source deactivate"
9056
source deactivate
9157

‎ci/submit_cython_cache.sh

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

‎ci/travis_encrypt_gbq.sh

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

‎ci/travis_gbq.json.enc

-2.3 KB
Binary file not shown.

‎ci/travis_gbq_config.txt

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

‎ci/travis_process_gbq_encryption.sh

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

‎doc/README.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎doc/source/whatsnew/v1.2.5.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ including other versions of pandas.
1515
Fixed regressions
1616
~~~~~~~~~~~~~~~~~
1717
- Regression in :func:`concat` between two :class:`DataFrames` where one has an :class:`Index` that is all-None and the other is :class:`DatetimeIndex` incorrectly raising (:issue:`40841`)
18+
- Fixed regression in :meth:`DataFrame.sum` and :meth:`DataFrame.prod` when ``min_count`` and ``numeric_only`` are both given (:issue:`41074`)
1819
- Regression in :func:`read_csv` when using ``memory_map=True`` with an non-UTF8 encoding (:issue:`40986`)
19-
-
20+
- Regression in :meth:`DataFrame.replace` and :meth:`Series.replace` when the values to replace is a NumPy float array (:issue:`40371`)
2021

2122
.. ---------------------------------------------------------------------------
2223

0 commit comments

Comments
 (0)
0