Merge branch 'master' into PR_TOOL_MERGE_PR_17453

Author: jreback

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,63 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+ addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+A working group of community members is committed to promptly addressing any
+reported issues. The working group is made up of pandas contributors and users.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the working group by e-mail (pandas-coc@googlegroups.com).
+Messages sent to this e-mail address will not be publicly visible but only to
+the working group members. The working group currently includes
+
+- Safia Abdalla
+- Tom Augspurger
+- Joris Van den Bossche
+- Camille Scott
+- Nathaniel Smith
+
+All complaints will be reviewed and investigated and will result in a response
+that is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version],
+and the [Swift Code of Conduct][swift].
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/
+[swift]: https://swift.org/community/#code-of-conduct
+

.gitignore

@@ -21,6 +21,7 @@
 .ipynb_checkpoints
 .tags
 .cache/
+.vscode/
 
 # Compiled source #
 ###################

.travis.yml

@@ -51,18 +51,18 @@ matrix:
  - python-gtk2
  - dist: trusty
  env:
- - JOB="3.5" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true
+ - JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true
  - dist: trusty
  env:
- - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true
+ - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true COVERAGE=true
  # In allow_failures
  - dist: trusty
  env:
  - JOB="2.7_SLOW" SLOW=true
  # In allow_failures
  - dist: trusty
  env:
- - JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
+ - JOB="3.6_PIP_BUILD_TEST" TEST_ARGS="--skip-slow" PIP_BUILD_TEST=true
  addons:
  apt:
  packages:
@@ -81,7 +81,7 @@ matrix:
  - JOB="2.7_SLOW" SLOW=true
  - dist: trusty
  env:
- - JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
+ - JOB="3.6_PIP_BUILD_TEST" TEST_ARGS="--skip-slow" PIP_BUILD_TEST=true
  addons:
  apt:
  packages:

README.md

@@ -160,10 +160,9 @@ pip install pandas
 ```
 
 ## Dependencies
-- [NumPy](http://www.numpy.org): 1.7.0 or higher
-- [python-dateutil](https://labix.org/python-dateutil): 1.5 or higher
-- [pytz](https://pythonhosted.org/pytz)
- - Needed for time zone support with ``pandas.date_range``
+- [NumPy](http://www.numpy.org): 1.9.0 or higher
+- [python-dateutil](https://labix.org/python-dateutil): 2.5.0 or higher
+- [pytz](https://pythonhosted.org/pytz): 2011k or higher
 
 See the [full installation instructions](https://pandas.pydata.org/pandas-docs/stable/install.html#dependencies)
 for recommended and optional dependencies.
@@ -205,9 +204,6 @@ See the full instructions for [installing from source](https://pandas.pydata.org
 ## Documentation
 The official documentation is hosted on PyData.org: https://pandas.pydata.org/pandas-docs/stable
 
-The Sphinx documentation should provide a good starting point for learning how
-to use the library. Expect the docs to continue to expand as time goes on.
-
 ## Background
 Work on ``pandas`` started at AQR (a quantitative hedge fund) in 2008 and
 has been under active development since then.

appveyor.yml

@@ -11,10 +11,11 @@ matrix:
 environment:
  global:
  # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
- # /E:ON and /V:ON options are not enabled in the batch script intepreter
+ # /E:ON and /V:ON options are not enabled in the batch script interpreter
  # See: http://stackoverflow.com/a/13751649/163740
  CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\run_with_env.cmd"
  clone_folder: C:\projects\pandas
+ PANDAS_TESTING_MODE: "deprecate"
 
  matrix:
 

asv_bench/benchmarks/ctors.py

@@ -1,35 +1,66 @@
 import numpy as np
-from pandas import DataFrame, Series, Index, DatetimeIndex, Timestamp
+import pandas.util.testing as tm
+from pandas import Series, Index, DatetimeIndex, Timestamp, MultiIndex
 
-from .pandas_vb_common import setup # noqa
+from .pandas_vb_common import setup  # noqa
 
 
-class Constructors(object):
+class SeriesConstructors(object):
+
+ goal_time = 0.2
+
+ param_names = ["data_fmt", "with_index"]
+ params = [[lambda x: x,
+ list,
+ lambda arr: list(arr.astype(str)),
+ lambda arr: dict(zip(range(len(arr)), arr)),
+ lambda arr: [(i, -i) for i in arr],
+ lambda arr: [[i, -i] for i in arr],
+ lambda arr: ([(i, -i) for i in arr][:-1] + [None]),
+ lambda arr: ([[i, -i] for i in arr][:-1] + [None])],
+ [False, True]]
+
+ def setup(self, data_fmt, with_index):
+ N = 10**4
+ arr = np.random.randn(N)
+ self.data = data_fmt(arr)
+ self.index = np.arange(N) if with_index else None
+
+ def time_series_constructor(self, data_fmt, with_index):
+ Series(self.data, index=self.index)
+
+
+class SeriesDtypesConstructors(object):
 
  goal_time = 0.2
 
  def setup(self):
- N = 10**2
+ N = 10**4
  self.arr = np.random.randn(N, N)
  self.arr_str = np.array(['foo', 'bar', 'baz'], dtype=object)
-
- self.data = np.random.randn(N)
- self.index = Index(np.arange(N))
-
  self.s = Series([Timestamp('20110101'), Timestamp('20120101'),
  Timestamp('20130101')] * N * 10)
 
- def time_frame_from_ndarray(self):
- DataFrame(self.arr)
-
- def time_series_from_ndarray(self):
- Series(self.data, index=self.index)
-
  def time_index_from_array_string(self):
  Index(self.arr_str)
 
+ def time_index_from_array_floats(self):
+ Index(self.arr)
+
  def time_dtindex_from_series(self):
  DatetimeIndex(self.s)
 
  def time_dtindex_from_index_with_series(self):
  Index(self.s)
+
+
+class MultiIndexConstructor(object):
+
+ goal_time = 0.2
+
+ def setup(self):
+ N = 10**4
+ self.iterables = [tm.makeStringIndex(N), range(20)]
+
+ def time_multiindex_from_iterables(self):
+ MultiIndex.from_product(self.iterables)

asv_bench/benchmarks/frame_ctor.py

@@ -4,7 +4,7 @@
 try:
  from pandas.tseries.offsets import Nano, Hour
 except ImportError:
- # For compatability with older versions
+ # For compatibility with older versions
  from pandas.core.datetools import * # noqa
 
 from .pandas_vb_common import setup # noqa
@@ -81,3 +81,15 @@ def setup(self, nrows):
  def time_frame_from_records_generator(self, nrows):
  # issue-6700
  self.df = DataFrame.from_records(self.gen, nrows=nrows)
+
+
+class FromNDArray(object):
+
+ goal_time = 0.2
+
+ def setup(self):
+ N = 100000
+ self.data = np.random.randn(N)
+
+ def time_frame_from_ndarray(self):
+ self.df = DataFrame(self.data)