Merge branch 'master' into fix-some-PeriodIndex-resampling-issues

Author: winklerand

.gitignore

@@ -7,6 +7,7 @@
 *$
 *.bak
 *flymake*
+*.iml
 *.kdev4
 *.log
 *.swp

.travis.yml

@@ -16,9 +16,10 @@ cache:
 
 env:
  global:
-
- # pandas-docs-travis GH
- - secure: "YvvTc+FrSYHgdxqoxn9s8VOaCWjvZzlkaf6k55kkmQqCYR9dPiLMsot1F96/N7o3YlD1s0znPQCak93Du8HHi/8809zAXloTaMSZrWz4R4qn96xlZFRE88O/w/Z1t3VVYpKX3MHlCggBc8MtXrqmvWKJMAqXyysZ4TTzoiJDPvE="
+ # create a github personal access token
+ # cd pandas-dev/pandas
+ # travis encrypt 'PANDAS_GH_TOKEN=personal_access_token' -r pandas-dev/pandas
+ - secure: "EkWLZhbrp/mXJOx38CHjs7BnjXafsqHtwxPQrqWy457VDFWhIY1DMnIR/lOWG+a20Qv52sCsFtiZEmMfUjf0pLGXOqurdxbYBGJ7/ikFLk9yV2rDwiArUlVM9bWFnFxHvdz9zewBH55WurrY4ShZWyV+x2dWjjceWG5VpWeI6sA="
 
 git:
  # for cloning
@@ -123,7 +124,7 @@ after_success:
 
 after_script:
  - echo "after_script start"
- - source activate pandas && python -c "import pandas; pandas.show_versions();"
+ - source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
  - if [ -e /tmp/single.xml ]; then
  ci/print_skipped.py /tmp/single.xml;
  fi

asv_bench/benchmarks/indexing.py

@@ -19,6 +19,9 @@ def time_getitem_list_like(self):
  def time_getitem_array(self):
  self.s[np.arange(10000)]
 
+ def time_getitem_lists(self):
+ self.s[np.arange(10000).tolist()]
+
  def time_iloc_array(self):
  self.s.iloc[np.arange(10000)]
 
@@ -190,9 +193,15 @@ def setup(self):
  np.arange(1000)], names=['one', 'two'])
 
  import string
- self.mistring = MultiIndex.from_product(
- [np.arange(1000),
- np.arange(20), list(string.ascii_letters)],
+
+ self.mi_large = MultiIndex.from_product(
+ [np.arange(1000), np.arange(20), list(string.ascii_letters)],
+ names=['one', 'two', 'three'])
+ self.mi_med = MultiIndex.from_product(
+ [np.arange(1000), np.arange(10), list('A')],
+ names=['one', 'two', 'three'])
+ self.mi_small = MultiIndex.from_product(
+ [np.arange(100), list('A'), list('A')],
  names=['one', 'two', 'three'])
 
  def time_series_xs_mi_ix(self):
@@ -215,8 +224,26 @@ def time_multiindex_get_indexer(self):
  (0, 16), (0, 17), (0, 18),
  (0, 19)], dtype=object))
 
+ def time_multiindex_large_get_loc(self):
+ self.mi_large.get_loc((999, 19, 'Z'))
+
+ def time_multiindex_large_get_loc_warm(self):
+ for _ in range(1000):
+ self.mi_large.get_loc((999, 19, 'Z'))
+
+ def time_multiindex_med_get_loc(self):
+ self.mi_med.get_loc((999, 9, 'A'))
+
+ def time_multiindex_med_get_loc_warm(self):
+ for _ in range(1000):
+ self.mi_med.get_loc((999, 9, 'A'))
+
  def time_multiindex_string_get_loc(self):
- self.mistring.get_loc((999, 19, 'Z'))
+ self.mi_small.get_loc((99, 'A', 'A'))
+
+ def time_multiindex_small_get_loc_warm(self):
+ for _ in range(1000):
+ self.mi_small.get_loc((99, 'A', 'A'))
 
  def time_is_monotonic(self):
  self.miint.is_monotonic

asv_bench/benchmarks/series_methods.py

@@ -111,6 +111,7 @@ def setup(self):
  def time_series_dropna_int64(self):
  self.s.dropna()
 
+
 class series_dropna_datetime(object):
  goal_time = 0.2
 
@@ -120,3 +121,13 @@ def setup(self):
 
  def time_series_dropna_datetime(self):
  self.s.dropna()
+
+
+class series_clip(object):
+ goal_time = 0.2
+
+ def setup(self):
+ self.s = pd.Series(np.random.randn(50))
+
+ def time_series_dropna_datetime(self):
+ self.s.clip(0, 1)

ci/build_docs.sh

@@ -40,10 +40,10 @@ if [ "$DOC" ]; then
  cd /tmp/doc/build/html
  git config --global user.email "pandas-docs-bot@localhost.foo"
  git config --global user.name "pandas-docs-bot"
- git config --global credential.helper cache
 
  # create the repo
  git init
+
  touch README
  git add README
  git commit -m "Initial commit" --allow-empty
@@ -52,8 +52,12 @@ if [ "$DOC" ]; then
  touch .nojekyll
  git add --all .
  git commit -m "Version" --allow-empty
+
  git remote remove origin
- git remote add origin "https://${PANDAS_GH_TOKEN}@github.com/pandas-docs/pandas-docs-travis.git"
+ git remote add origin "https://${PANDAS_GH_TOKEN}@github.com/pandas-dev/pandas-docs-travis.git"
+ git fetch origin
+ git remote -v
+
  git push origin gh-pages -f
 fi
 

ci/install_travis.sh

@@ -119,15 +119,7 @@ if [ "$COVERAGE" ]; then
 fi
 
 echo
-if [ "$BUILD_TEST" ]; then
-
- # build & install testing
- echo ["Starting installation test."]
- bash ci/install_release_build.sh
- conda uninstall -y cython
- time pip install dist/*tar.gz || exit 1
-
-else
+if [ -z "$BUILD_TEST" ]; then
 
  # build but don't install
  echo "[build em]"
@@ -163,9 +155,22 @@ fi
 # w/o removing anything else
 echo
 echo "[removing installed pandas]"
-conda remove pandas --force
+conda remove pandas -y --force
 
-if [ -z "$BUILD_TEST" ]; then
+if [ "$BUILD_TEST" ]; then
+
+ # remove any installation
+ pip uninstall -y pandas
+ conda list pandas
+ pip list --format columns |grep pandas
+
+ # build & install testing
+ echo ["building release"]
+ bash scripts/build_dist_for_release.sh
+ conda uninstall -y cython
+ time pip install dist/*tar.gz || exit 1
+
+else
 
  # install our pandas
  echo