Skip to content

Commit a97763a

Browse files
author
Nico Cernek
committed
accept both whatsnew updates
2 parents 8e8b8d1 + f08a1e6 commit a97763a

File tree

258 files changed

+5308
-11190
lines changed

Some content is hidden

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

258 files changed

+5308
-11190
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ dist
5757
# wheel files
5858
*.whl
5959
**/wheelhouse/*
60+
pip-wheel-metadata
6061
# coverage
6162
.coverage
6263
coverage.xml

.pre-commit-config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ repos:
1515
hooks:
1616
- id: isort
1717
language: python_venv
18+
exclude: ^pandas/__init__\.py$|^pandas/core/api\.py$

MANIFEST.in

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include LICENSE
33
include RELEASE.md
44
include README.md
55
include setup.py
6+
include pyproject.toml
67

78
graft doc
89
prune doc/build
@@ -14,6 +15,7 @@ graft pandas
1415
global-exclude *.bz2
1516
global-exclude *.csv
1617
global-exclude *.dta
18+
global-exclude *.feather
1719
global-exclude *.gz
1820
global-exclude *.h5
1921
global-exclude *.html
@@ -23,7 +25,10 @@ global-exclude *.pickle
2325
global-exclude *.png
2426
global-exclude *.pyc
2527
global-exclude *.pyd
28+
global-exclude *.ods
29+
global-exclude *.odt
2630
global-exclude *.sas7bdat
31+
global-exclude *.sav
2732
global-exclude *.so
2833
global-exclude *.xls
2934
global-exclude *.xlsm

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ black:
1818
black . --exclude '(asv_bench/env|\.egg|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|_build|buck-out|build|dist|setup.py)'
1919

2020
develop: build
21-
python setup.py develop
21+
python -m pip install --no-build-isolation -e .
2222

2323
doc:
2424
-rm -rf doc/build doc/source/generated

README.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -188,16 +188,17 @@ python setup.py install
188188

189189
or for installing in [development mode](https://pip.pypa.io/en/latest/reference/pip_install.html#editable-installs):
190190

191+
191192
```sh
192-
python setup.py develop
193+
python -m pip install --no-build-isolation -e .
193194
```
194195

195-
Alternatively, you can use `pip` if you want all the dependencies pulled
196-
in automatically (the `-e` option is for installing it in [development
197-
mode](https://pip.pypa.io/en/latest/reference/pip_install.html#editable-installs)):
196+
If you have `make`, you can also use `make develop` to run the same command.
197+
198+
or alternatively
198199

199200
```sh
200-
pip install -e .
201+
python setup.py develop
201202
```
202203

203204
See the full instructions for [installing from source](https://pandas.pydata.org/pandas-docs/stable/install.html#installing-from-source).
@@ -224,7 +225,7 @@ Most development discussion is taking place on github in this repo. Further, the
224225

225226
All contributions, bug reports, bug fixes, documentation improvements, enhancements and ideas are welcome.
226227

227-
A detailed overview on how to contribute can be found in the **[contributing guide](https://dev.pandas.io/contributing.html)**. There is also an [overview](.github/CONTRIBUTING.md) on GitHub.
228+
A detailed overview on how to contribute can be found in the **[contributing guide](https://dev.pandas.io/docs/contributing.html)**. There is also an [overview](.github/CONTRIBUTING.md) on GitHub.
228229

229230
If you are simply looking to start working with the pandas codebase, navigate to the [GitHub "issues" tab](https://github.com/pandas-dev/pandas/issues) and start looking through interesting issues. There are a number of issues listed under [Docs](https://github.com/pandas-dev/pandas/issues?labels=Docs&sort=updated&state=open) and [good first issue](https://github.com/pandas-dev/pandas/issues?labels=good+first+issue&sort=updated&state=open) where you could start out.
230231

asv_bench/benchmarks/frame_methods.py

+11
Original file line numberDiff line numberDiff line change
@@ -609,4 +609,15 @@ def time_dataframe_describe(self):
609609
self.df.describe()
610610

611611

612+
class SelectDtypes:
613+
params = [100, 1000]
614+
param_names = ["n"]
615+
616+
def setup(self, n):
617+
self.df = DataFrame(np.random.randn(10, n))
618+
619+
def time_select_dtypes(self, n):
620+
self.df.select_dtypes(include="int")
621+
622+
612623
from .pandas_vb_common import setup # noqa: F401 isort:skip

azure-pipelines.yml

+17-6
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
displayName: 'Running benchmarks'
105105
condition: true
106106
107-
- job: 'Docs'
107+
- job: 'Web_and_Docs'
108108
pool:
109109
vmImage: ubuntu-16.04
110110
timeoutInMinutes: 90
@@ -119,6 +119,11 @@ jobs:
119119
ci/setup_env.sh
120120
displayName: 'Setup environment and build pandas'
121121
122+
- script: |
123+
source activate pandas-dev
124+
python web/pandas_web.py web/pandas --target-path=web/build
125+
displayName: 'Build website'
126+
122127
- script: |
123128
source activate pandas-dev
124129
# Next we should simply have `doc/make.py --warnings-are-errors`, everything else is required because the ipython directive doesn't fail the build on errors (https://github.com/ipython/ipython/issues/11547)
@@ -128,15 +133,21 @@ jobs:
128133
displayName: 'Build documentation'
129134
130135
- script: |
131-
cd doc/build/html
136+
mkdir -p to_deploy/docs
137+
cp -r web/build/* to_deploy/
138+
cp -r doc/build/html/* to_deploy/docs/
139+
displayName: 'Merge website and docs'
140+
141+
- script: |
142+
cd to_deploy
132143
git init
133144
touch .nojekyll
134145
echo "dev.pandas.io" > CNAME
135146
printf "User-agent: *\nDisallow: /" > robots.txt
136147
git add --all .
137148
git config user.email "[email protected]"
138-
git config user.name "pandas-docs-bot"
139-
git commit -m "pandas documentation in master"
149+
git config user.name "pandas-bot"
150+
git commit -m "pandas web and documentation in master"
140151
displayName: 'Create git repo for docs build'
141152
condition : |
142153
and(not(eq(variables['Build.Reason'], 'PullRequest')),
@@ -160,10 +171,10 @@ jobs:
160171
eq(variables['Build.SourceBranch'], 'refs/heads/master'))
161172
162173
- script: |
163-
cd doc/build/html
174+
cd to_deploy
164175
git remote add origin [email protected]:pandas-dev/pandas-dev.github.io.git
165176
git push -f origin master
166-
displayName: 'Publish docs to GitHub pages'
177+
displayName: 'Publish web and docs to GitHub pages'
167178
condition : |
168179
and(not(eq(variables['Build.Reason'], 'PullRequest')),
169180
eq(variables['Build.SourceBranch'], 'refs/heads/master'))

ci/azure/posix.yml

+7
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,21 @@ jobs:
6060
echo "Creating Environment"
6161
ci/setup_env.sh
6262
displayName: 'Setup environment and build pandas'
63+
6364
- script: |
6465
source activate pandas-dev
6566
ci/run_tests.sh
6667
displayName: 'Test'
68+
6769
- script: source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
70+
displayName: 'Build versions'
71+
6872
- task: PublishTestResults@2
6973
inputs:
7074
testResultsFiles: 'test-data-*.xml'
7175
testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }}
76+
displayName: 'Publish test results'
77+
7278
- powershell: |
7379
$junitXml = "test-data-single.xml"
7480
$(Get-Content $junitXml | Out-String) -match 'failures="(.*?)"'
@@ -94,6 +100,7 @@ jobs:
94100
Write-Error "$($matches[1]) tests failed"
95101
}
96102
displayName: 'Check for test failures'
103+
97104
- script: |
98105
source activate pandas-dev
99106
python ci/print_skipped.py

ci/code_checks.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then
188188
set -o pipefail
189189
if [[ "$AZURE" == "true" ]]; then
190190
# we exclude all c/cpp files as the c/cpp files of pandas code base are tested when Linting .c and .h files
191-
! grep -n '--exclude=*.'{svg,c,cpp,html} --exclude-dir=env -RI "\s$" * | awk -F ":" '{print "##vso[task.logissue type=error;sourcepath=" $1 ";linenumber=" $2 ";] Tailing whitespaces found: " $3}'
191+
! grep -n '--exclude=*.'{svg,c,cpp,html,js} --exclude-dir=env -RI "\s$" * | awk -F ":" '{print "##vso[task.logissue type=error;sourcepath=" $1 ";linenumber=" $2 ";] Tailing whitespaces found: " $3}'
192192
else
193-
! grep -n '--exclude=*.'{svg,c,cpp,html} --exclude-dir=env -RI "\s$" * | awk -F ":" '{print $1 ":" $2 ":Tailing whitespaces found: " $3}'
193+
! grep -n '--exclude=*.'{svg,c,cpp,html,js} --exclude-dir=env -RI "\s$" * | awk -F ":" '{print $1 ":" $2 ":Tailing whitespaces found: " $3}'
194194
fi
195195
RET=$(($RET + $?)) ; echo $MSG "DONE"
196196
fi

ci/deps/azure-35-compat.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ dependencies:
1818
- xlsxwriter=0.9.8
1919
- xlwt=1.2.0
2020
# universal
21-
- cython=0.28.2
2221
- hypothesis>=3.58.0
2322
- pytest-xdist
2423
- pytest-mock
2524
- pytest-azurepipelines
2625
- pip
2726
- pip:
28-
# for python 3.5, pytest>=4.0.2 is not available in conda
27+
# for python 3.5, pytest>=4.0.2, cython>=0.29.13 is not available in conda
28+
- cython>=0.29.13
2929
- pytest==4.5.0
3030
- html5lib==1.0b2

ci/deps/azure-36-32bit.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ dependencies:
66
- gcc_linux-32
77
- gcc_linux-32
88
- gxx_linux-32
9-
- cython=0.28.2
109
- numpy=1.14.*
1110
- python-dateutil
1211
- python=3.6.*
@@ -18,3 +17,6 @@ dependencies:
1817
- pytest-azurepipelines
1918
- hypothesis>=3.58.0
2019
- pip
20+
- pip:
21+
# Anaconda doesn't build a new enough Cython
22+
- cython>=0.29.13

ci/deps/azure-36-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ channels:
55
dependencies:
66
- beautifulsoup4==4.6.0
77
- bottleneck=1.2.*
8-
- cython=0.28.2
8+
- cython=0.29.13
99
- lxml
1010
- matplotlib=2.2.2
1111
- numpy=1.14.*

ci/deps/azure-36-locale_slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- conda-forge
55
dependencies:
66
- beautifulsoup4
7-
- cython>=0.28.2
7+
- cython>=0.29.13
88
- gcsfs
99
- html5lib
1010
- ipython

ci/deps/azure-37-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- conda-forge
55
dependencies:
66
- beautifulsoup4
7-
- cython>=0.28.2
7+
- cython>=0.29.13
88
- html5lib
99
- ipython
1010
- jinja2

ci/deps/azure-37-numpydev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
dependencies:
55
- python=3.7.*
66
- pytz
7-
- Cython>=0.28.2
7+
- Cython>=0.29.13
88
# universal
99
# pytest < 5 until defaults has pytest-xdist>=1.29.0
1010
- pytest>=4.0.2,<5.0

ci/deps/azure-macos-35.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ channels:
44
dependencies:
55
- beautifulsoup4
66
- bottleneck
7-
- cython>=0.28.2
87
- html5lib
98
- jinja2
109
- lxml
@@ -24,6 +23,8 @@ dependencies:
2423
- xlwt
2524
- pip
2625
- pip:
26+
# Anaconda / conda-forge don't build for 3.5
27+
- cython>=0.29.13
2728
- pyreadstat
2829
# universal
2930
- pytest>=5.0.1
@@ -32,4 +33,3 @@ dependencies:
3233
- hypothesis>=3.58.0
3334
# https://github.com/pandas-dev/pandas/issues/27421
3435
- pytest-azurepipelines<1.0.0
35-

ci/deps/azure-windows-36.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
name: pandas-dev
22
channels:
3-
- defaults
43
- conda-forge
4+
- defaults
55
dependencies:
66
- blosc
77
- bottleneck
8-
- boost-cpp<1.67
98
- fastparquet>=0.2.1
109
- matplotlib=3.0.2
1110
- numexpr
1211
- numpy=1.15.*
1312
- openpyxl
14-
- parquet-cpp
1513
- pyarrow
1614
- pytables
1715
- python-dateutil
@@ -22,7 +20,7 @@ dependencies:
2220
- xlsxwriter
2321
- xlwt
2422
# universal
25-
- cython>=0.28.2
23+
- cython>=0.29.13
2624
- pytest>=5.0.1
2725
- pytest-xdist>=1.29.0
2826
- pytest-mock

ci/deps/azure-windows-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies:
2525
- xlsxwriter
2626
- xlwt
2727
# universal
28-
- cython>=0.28.2
28+
- cython>=0.29.13
2929
- pytest>=5.0.0
3030
- pytest-xdist>=1.29.0
3131
- pytest-mock

ci/deps/travis-36-cov.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ channels:
55
dependencies:
66
- beautifulsoup4
77
- botocore>=1.11
8-
- cython>=0.28.2
8+
- cython>=0.29.13
99
- dask
1010
- fastparquet>=0.2.1
1111
- gcsfs

ci/deps/travis-36-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- beautifulsoup4
77
- blosc=1.14.3
88
- python-blosc
9-
- cython>=0.28.2
9+
- cython>=0.29.13
1010
- fastparquet=0.2.1
1111
- gcsfs=0.2.2
1212
- html5lib

ci/deps/travis-36-slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- conda-forge
55
dependencies:
66
- beautifulsoup4
7-
- cython>=0.28.2
7+
- cython>=0.29.13
88
- html5lib
99
- lxml
1010
- matplotlib

ci/deps/travis-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ channels:
66
dependencies:
77
- python=3.7.*
88
- botocore>=1.11
9-
- cython>=0.28.2
9+
- cython>=0.29.13
1010
- numpy
1111
- python-dateutil
1212
- nomkl

ci/incremental/build.cmd

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@rem https://github.com/numba/numba/blob/master/buildscripts/incremental/build.cmd
22

3-
@rem Build numba extensions without silencing compile errors
4-
python setup.py build_ext -q --inplace
3+
@rem Build extensions
4+
python setup.py build_ext -q -i
55

6-
@rem Install pandas locally
7-
python -m pip install -e .
6+
@rem Install pandas
7+
python -m pip install --no-build-isolation -e .
88

99
if %errorlevel% neq 0 exit /b %errorlevel%

0 commit comments

Comments
 (0)