Skip to content

Commit

Permalink
accept both whatsnew updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Nico Cernek committed Sep 21, 2019
2 parents 8e8b8d1 + f08a1e6 commit a97763a
Show file tree
Hide file tree
Showing 258 changed files with 5,308 additions and 11,190 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ dist
# wheel files
*.whl
**/wheelhouse/*
pip-wheel-metadata
# coverage
.coverage
coverage.xml
Expand Down
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ repos:
hooks:
- id: isort
language: python_venv
exclude: ^pandas/__init__\.py$|^pandas/core/api\.py$
5 changes: 5 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ include LICENSE
include RELEASE.md
include README.md
include setup.py
include pyproject.toml

graft doc
prune doc/build
Expand All @@ -14,6 +15,7 @@ graft pandas
global-exclude *.bz2
global-exclude *.csv
global-exclude *.dta
global-exclude *.feather
global-exclude *.gz
global-exclude *.h5
global-exclude *.html
Expand All @@ -23,7 +25,10 @@ global-exclude *.pickle
global-exclude *.png
global-exclude *.pyc
global-exclude *.pyd
global-exclude *.ods
global-exclude *.odt
global-exclude *.sas7bdat
global-exclude *.sav
global-exclude *.so
global-exclude *.xls
global-exclude *.xlsm
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ black:
black . --exclude '(asv_bench/env|\.egg|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|_build|buck-out|build|dist|setup.py)'

develop: build
python setup.py develop
python -m pip install --no-build-isolation -e .

doc:
-rm -rf doc/build doc/source/generated
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,16 +188,17 @@ python setup.py install

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


```sh
python setup.py develop
python -m pip install --no-build-isolation -e .
```

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

or alternatively

```sh
pip install -e .
python setup.py develop
```

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

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

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.
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.

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.

Expand Down
11 changes: 11 additions & 0 deletions asv_bench/benchmarks/frame_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -609,4 +609,15 @@ def time_dataframe_describe(self):
self.df.describe()


class SelectDtypes:
params = [100, 1000]
param_names = ["n"]

def setup(self, n):
self.df = DataFrame(np.random.randn(10, n))

def time_select_dtypes(self, n):
self.df.select_dtypes(include="int")


from .pandas_vb_common import setup # noqa: F401 isort:skip
23 changes: 17 additions & 6 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
displayName: 'Running benchmarks'
condition: true
- job: 'Docs'
- job: 'Web_and_Docs'
pool:
vmImage: ubuntu-16.04
timeoutInMinutes: 90
Expand All @@ -119,6 +119,11 @@ jobs:
ci/setup_env.sh
displayName: 'Setup environment and build pandas'
- script: |
source activate pandas-dev
python web/pandas_web.py web/pandas --target-path=web/build
displayName: 'Build website'
- script: |
source activate pandas-dev
# 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)
Expand All @@ -128,15 +133,21 @@ jobs:
displayName: 'Build documentation'
- script: |
cd doc/build/html
mkdir -p to_deploy/docs
cp -r web/build/* to_deploy/
cp -r doc/build/html/* to_deploy/docs/
displayName: 'Merge website and docs'
- script: |
cd to_deploy
git init
touch .nojekyll
echo "dev.pandas.io" > CNAME
printf "User-agent: *\nDisallow: /" > robots.txt
git add --all .
git config user.email "[email protected]"
git config user.name "pandas-docs-bot"
git commit -m "pandas documentation in master"
git config user.name "pandas-bot"
git commit -m "pandas web and documentation in master"
displayName: 'Create git repo for docs build'
condition : |
and(not(eq(variables['Build.Reason'], 'PullRequest')),
Expand All @@ -160,10 +171,10 @@ jobs:
eq(variables['Build.SourceBranch'], 'refs/heads/master'))
- script: |
cd doc/build/html
cd to_deploy
git remote add origin [email protected]:pandas-dev/pandas-dev.github.io.git
git push -f origin master
displayName: 'Publish docs to GitHub pages'
displayName: 'Publish web and docs to GitHub pages'
condition : |
and(not(eq(variables['Build.Reason'], 'PullRequest')),
eq(variables['Build.SourceBranch'], 'refs/heads/master'))
7 changes: 7 additions & 0 deletions ci/azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,21 @@ jobs:
echo "Creating Environment"
ci/setup_env.sh
displayName: 'Setup environment and build pandas'
- script: |
source activate pandas-dev
ci/run_tests.sh
displayName: 'Test'
- script: source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
displayName: 'Build versions'

- task: PublishTestResults@2
inputs:
testResultsFiles: 'test-data-*.xml'
testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }}
displayName: 'Publish test results'

- powershell: |
$junitXml = "test-data-single.xml"
$(Get-Content $junitXml | Out-String) -match 'failures="(.*?)"'
Expand All @@ -94,6 +100,7 @@ jobs:
Write-Error "$($matches[1]) tests failed"
}
displayName: 'Check for test failures'
- script: |
source activate pandas-dev
python ci/print_skipped.py
Expand Down
4 changes: 2 additions & 2 deletions ci/code_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,9 @@ if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then
set -o pipefail
if [[ "$AZURE" == "true" ]]; then
# we exclude all c/cpp files as the c/cpp files of pandas code base are tested when Linting .c and .h files
! 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}'
! 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}'
else
! grep -n '--exclude=*.'{svg,c,cpp,html} --exclude-dir=env -RI "\s$" * | awk -F ":" '{print $1 ":" $2 ":Tailing whitespaces found: " $3}'
! grep -n '--exclude=*.'{svg,c,cpp,html,js} --exclude-dir=env -RI "\s$" * | awk -F ":" '{print $1 ":" $2 ":Tailing whitespaces found: " $3}'
fi
RET=$(($RET + $?)) ; echo $MSG "DONE"
fi
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/azure-35-compat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ dependencies:
- xlsxwriter=0.9.8
- xlwt=1.2.0
# universal
- cython=0.28.2
- hypothesis>=3.58.0
- pytest-xdist
- pytest-mock
- pytest-azurepipelines
- pip
- pip:
# for python 3.5, pytest>=4.0.2 is not available in conda
# for python 3.5, pytest>=4.0.2, cython>=0.29.13 is not available in conda
- cython>=0.29.13
- pytest==4.5.0
- html5lib==1.0b2
4 changes: 3 additions & 1 deletion ci/deps/azure-36-32bit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ dependencies:
- gcc_linux-32
- gcc_linux-32
- gxx_linux-32
- cython=0.28.2
- numpy=1.14.*
- python-dateutil
- python=3.6.*
Expand All @@ -18,3 +17,6 @@ dependencies:
- pytest-azurepipelines
- hypothesis>=3.58.0
- pip
- pip:
# Anaconda doesn't build a new enough Cython
- cython>=0.29.13
2 changes: 1 addition & 1 deletion ci/deps/azure-36-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channels:
dependencies:
- beautifulsoup4==4.6.0
- bottleneck=1.2.*
- cython=0.28.2
- cython=0.29.13
- lxml
- matplotlib=2.2.2
- numpy=1.14.*
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-36-locale_slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
dependencies:
- beautifulsoup4
- cython>=0.28.2
- cython>=0.29.13
- gcsfs
- html5lib
- ipython
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-37-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
dependencies:
- beautifulsoup4
- cython>=0.28.2
- cython>=0.29.13
- html5lib
- ipython
- jinja2
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-37-numpydev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
dependencies:
- python=3.7.*
- pytz
- Cython>=0.28.2
- Cython>=0.29.13
# universal
# pytest < 5 until defaults has pytest-xdist>=1.29.0
- pytest>=4.0.2,<5.0
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/azure-macos-35.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ channels:
dependencies:
- beautifulsoup4
- bottleneck
- cython>=0.28.2
- html5lib
- jinja2
- lxml
Expand All @@ -24,6 +23,8 @@ dependencies:
- xlwt
- pip
- pip:
# Anaconda / conda-forge don't build for 3.5
- cython>=0.29.13
- pyreadstat
# universal
- pytest>=5.0.1
Expand All @@ -32,4 +33,3 @@ dependencies:
- hypothesis>=3.58.0
# https://github.com/pandas-dev/pandas/issues/27421
- pytest-azurepipelines<1.0.0

6 changes: 2 additions & 4 deletions ci/deps/azure-windows-36.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
name: pandas-dev
channels:
- defaults
- conda-forge
- defaults
dependencies:
- blosc
- bottleneck
- boost-cpp<1.67
- fastparquet>=0.2.1
- matplotlib=3.0.2
- numexpr
- numpy=1.15.*
- openpyxl
- parquet-cpp
- pyarrow
- pytables
- python-dateutil
Expand All @@ -22,7 +20,7 @@ dependencies:
- xlsxwriter
- xlwt
# universal
- cython>=0.28.2
- cython>=0.29.13
- pytest>=5.0.1
- pytest-xdist>=1.29.0
- pytest-mock
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-windows-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- xlsxwriter
- xlwt
# universal
- cython>=0.28.2
- cython>=0.29.13
- pytest>=5.0.0
- pytest-xdist>=1.29.0
- pytest-mock
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36-cov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channels:
dependencies:
- beautifulsoup4
- botocore>=1.11
- cython>=0.28.2
- cython>=0.29.13
- dask
- fastparquet>=0.2.1
- gcsfs
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- beautifulsoup4
- blosc=1.14.3
- python-blosc
- cython>=0.28.2
- cython>=0.29.13
- fastparquet=0.2.1
- gcsfs=0.2.2
- html5lib
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36-slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
dependencies:
- beautifulsoup4
- cython>=0.28.2
- cython>=0.29.13
- html5lib
- lxml
- matplotlib
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ channels:
dependencies:
- python=3.7.*
- botocore>=1.11
- cython>=0.28.2
- cython>=0.29.13
- numpy
- python-dateutil
- nomkl
Expand Down
8 changes: 4 additions & 4 deletions ci/incremental/build.cmd
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@rem https://github.com/numba/numba/blob/master/buildscripts/incremental/build.cmd

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

@rem Install pandas locally
python -m pip install -e .
@rem Install pandas
python -m pip install --no-build-isolation -e .

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

0 comments on commit a97763a

Please sign in to comment.