Revert "merge origin/master"

This reverts commit 7b1a796.
pandas-dev · TomAugspurger · Sep 3, 2019 · Jun 15, 2019 · Aug 29, 2019 · Aug 29, 2019
commit 115b26dd281ae675b7af8313ac3fe19c57cd0daa
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,2 +1 @@
 custom: https://pandas.pydata.org/donate.html
-tidelift: pypi/pandas
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,4 @@
 - [ ] closes #xxxx
 - [ ] tests added / passed
-- [ ] passes `black pandas`
 - [ ] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`
 - [ ] whatsnew entry
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
diff --git a/.gitignore b/.gitignore
@@ -66,9 +66,6 @@ coverage_html_report
 # hypothesis test database
 .hypothesis/
 __pycache__
-# pytest-monkeytype
-monkeytype.sqlite3
-
 
 # OS generated files #
 ######################

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 language: python
 python: 3.5
 
@@ -21,7 +22,7 @@ env:
 
 git:
     # for cloning
-    depth: false
+    depth: 2000
 
 matrix:
     fast_finish: true
@@ -47,10 +48,17 @@ matrix:
       env:
         - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow"
 
+    # In allow_failures
+    - dist: trusty
+      env:
+        - JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
     allow_failures:
       - dist: trusty
         env:
           - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow"
+      - dist: trusty
+        env:
+          - JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
 
 before_install:
   - echo "before_install"
@@ -63,7 +71,7 @@ before_install:
   - pwd
   - uname -a
   - git --version
-  - ./ci/check_git_tags.sh
+  - git tag
   # Because travis runs on Google Cloud and has a /etc/boto.cfg,
   # it breaks moto import, see:
   # https://github.com/spulec/moto/issues/1771
@@ -89,10 +97,16 @@ before_script:
 script:
   - echo "script start"
   - source activate pandas-dev
+  - ci/build_docs.sh
   - ci/run_tests.sh
 
 after_script:
   - echo "after_script start"
   - source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
-  - ci/print_skipped.py 
+  - if [ -e test-data-single.xml ]; then
+        ci/print_skipped.py test-data-single.xml;
+    fi
+  - if [ -e test-data-multiple.xml ]; then
+        ci/print_skipped.py test-data-multiple.xml;
+    fi
   - echo "after_script done"
diff --git a/LICENSES/HAVEN_LICENSE b/LICENSES/HAVEN_LICENSE
diff --git a/LICENSES/HAVEN_MIT b/LICENSES/HAVEN_MIT
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
-.PHONY : develop build clean clean_pyc doc lint-diff black
+tseries: pandas/_libs/lib.pyx pandas/_libs/tslib.pyx pandas/_libs/hashtable.pyx
+	python setup.py build_ext --inplace
 
-all: develop
+.PHONY : develop build clean clean_pyc tseries doc
 
 clean:
 	-python setup.py clean
@@ -14,11 +15,8 @@ build: clean_pyc
 lint-diff:
 	git diff upstream/master --name-only -- "*.py" | xargs flake8
 
-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 setup.py develop
 
 doc:
 	-rm -rf doc/build doc/source/generated

diff --git a/README.md b/README.md
@@ -224,7 +224,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://pandas-docs.github.io/pandas-docs-travis/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.
 
@@ -233,5 +233,3 @@ You can also triage issues which may include reproducing bug reports, or asking
 Or maybe through using pandas you have an idea of your own or are looking for something in the documentation and thinking ‘this can be improved’...you can do something about it!
 
 Feel free to ask questions on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata) or on [Gitter](https://gitter.im/pydata/pandas).
-
-As contributors and maintainers to this project, you are expected to abide by pandas' code of conduct. More information can be found at: [Contributor Code of Conduct](https://github.com/pandas-dev/pandas/blob/master/.github/CODE_OF_CONDUCT.md)
diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json
@@ -107,7 +107,7 @@
     // `asv` will cache wheels of the recent builds in each
     // environment, making them faster to install next time.  This is
     // number of builds to keep, per environment.
-    "build_cache_size": 8,
+    "wheel_cache_size": 8,
 
     // The commits after which the regression search in `asv publish`
     // should start looking for regressions. Dictionary whose keys are
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		custom: https://pandas.pydata.org/donate.html
		tidelift: pypi/pandas