Skip to content

Commit

Permalink
Merge github.com:pydata/pandas into issue_9084_get_schema_index_param…
Browse files Browse the repository at this point in the history
…eter

* github.com:pydata/pandas: (554 commits)
  BUG: compat with Stata ver 111
  Fix: F999 dictionary key '2000q4' repeated with different values (pandas-dev#14198)
  BLD: Test for Python 3.5 with C locale
  BUG: DatetimeTZBlock can't assign values near dst boundary
  BUG: union_categorical with Series and cat idx
  BUG: fix str.contains for series containing only nan values
  BUG: Categorical constructor not idempotent with ext dtype
  TST: Make encoded sep check more locale sensitive (pandas-dev#14161)
  DOC: minor typo in 0.19.0 whatsnew file (pandas-dev#14185)
  BUG: fix tz-aware datetime convert to DatetimeIndex (GH 14088)
  BUG : bug in setting a slice of a Series with a np.timedelta64
  RLS: v0.19.0rc1
  DOC: clean-up 0.19.0 whatsnew file (pandas-dev#14176)
  DOC: cleanup build warnings (pandas-dev#14172)
  Add steps to run gbq integration testing to the contributing docs (pandas-dev#14144)
  ENH: concat and append now can handle unordered categories (pandas-dev#13767)
  DEPR: Deprecate pandas.core.datetools (pandas-dev#14105)
  API/DEPR: Remove +/- as setops for DatetimeIndex/PeriodIndex (GH9630) (pandas-dev#14164)
  Fix trivial typo in comment (pandas-dev#14174)
  API/DEPR: Remove +/- as setops for Index (GH8227) (pandas-dev#14127)
  ...
  • Loading branch information
trbs committed Sep 12, 2016
2 parents ad62533 + 54ab5be commit 8ab1250
Show file tree
Hide file tree
Showing 521 changed files with 90,198 additions and 86,411 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
.vagrant
.noseids
.ipynb_checkpoints
.tags

# Compiled source #
###################
Expand Down Expand Up @@ -83,7 +84,10 @@ scikits

# Performance Testing #
#######################
asv_bench/
asv_bench/env/
asv_bench/html/
asv_bench/results/
asv_bench/pandas/

# Documentation generated files #
#################################
Expand Down
219 changes: 165 additions & 54 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@

sudo: false
language: python

env:
# To turn off cached miniconda, cython files and compiler cache comment out the
# USE_CACHE=true line for the build in the matrix below. To delete caches go to
# https://travis-ci.org/OWNER/REPOSITORY/caches or run
# travis cache --delete inside the project directory from the travis command line client
# The cash directories will be deleted if anything in ci/ changes in a commit
cache:
directories:
- $HOME/miniconda # miniconda cache
- $HOME/.cache # cython cache
- $HOME/.ccache # compiler cache

env:
global:
# scatterci API key
#- secure: "Bx5umgo6WjuGY+5XFa004xjCiX/vq0CyMZ/ETzcs7EIBI1BE/0fIDXOoWhoxbY9HPfdPGlDnDgB9nGqr5wArO2s+BavyKBWg6osZ3dmkfuJPMOWeyCa92EeP+sfKw8e5HSU5MizW9e319wHWOF/xkzdHR7T67Qd5erhv91x4DnQ="
# ironcache API key
- secure: "e4eEFn9nDQc3Xa5BWYkzfX37jaWVq89XidVX+rcCNEr5OlOImvveeXnF1IzbRXznH4Sv0YsLwUd8RGUWOmyCvkONq/VJeqCHWtTMyfaCIdqSyhIP9Odz8r9ahch+Y0XFepBey92AJHmlnTh+2GjCDgIiqq4fzglojnp56Vg1ojA="
- secure: "CjmYmY5qEu3KrvMtel6zWFEtMq8ORBeS1S1odJHnjQpbwT1KY2YFZRVlLphfyDQXSz6svKUdeRrCNp65baBzs3DQNA8lIuXGIBYFeJxqVGtYAZZs6+TzBPfJJK798sGOj5RshrOJkFG2rdlWNuTq/XphI0JOrN3nPUkRrdQRpAw="
#- secure: "e4eEFn9nDQc3Xa5BWYkzfX37jaWVq89XidVX+rcCNEr5OlOImvveeXnF1IzbRXznH4Sv0YsLwUd8RGUWOmyCvkONq/VJeqCHWtTMyfaCIdqSyhIP9Odz8r9ahch+Y0XFepBey92AJHmlnTh+2GjCDgIiqq4fzglojnp56Vg1ojA="
#- secure: "CjmYmY5qEu3KrvMtel6zWFEtMq8ORBeS1S1odJHnjQpbwT1KY2YFZRVlLphfyDQXSz6svKUdeRrCNp65baBzs3DQNA8lIuXGIBYFeJxqVGtYAZZs6+TzBPfJJK798sGOj5RshrOJkFG2rdlWNuTq/XphI0JOrN3nPUkRrdQRpAw="
# pandas-docs-bot GH
- secure: "PCzUFR8CHmw9lH84p4ygnojdF7Z8U5h7YfY0RyT+5K/aiQ1ZTU3ZkDTPI0/rR5FVMxsEEKEQKMcc5fvqW0PeD7Q2wRmluloKgT9w4EVEJ1ppKf7lITPcvZR2QgVOvjv4AfDtibLHFNiaSjzoqyJVjM4igjOu8WTlF3JfZcmOQjQ="

git:
# for cloning
depth: 300
depth: 1000

matrix:
fast_finish: true
Expand All @@ -29,115 +39,215 @@ matrix:
- BUILD_TYPE=conda
- JOB_TAG=_OSX
- TRAVIS_PYTHON_VERSION=3.5
- CACHE_NAME="35_osx"
- USE_CACHE=true
- python: 2.7
env:
- JOB_NAME: "27_slow_nnet_LOCALE"
- NOSE_ARGS="slow and not network and not disabled"
- LOCALE_OVERRIDE="zh_CN.GB18030"
- FULL_DEPS=true
- JOB_TAG=_LOCALE
- JOB_NAME: "27_slow_nnet_LOCALE"
- NOSE_ARGS="slow and not network and not disabled"
- LOCALE_OVERRIDE="zh_CN.UTF-8"
- FULL_DEPS=true
- JOB_TAG=_LOCALE
- CACHE_NAME="27_slow_nnet_LOCALE"
- USE_CACHE=true
addons:
apt:
packages:
- language-pack-zh-hans
- python: 2.7
env:
- JOB_NAME: "27_nslow"
- NOSE_ARGS="not slow and not disabled"
- FULL_DEPS=true
- CLIPBOARD_GUI=gtk2
- LINT=true
- JOB_NAME: "27_nslow"
- NOSE_ARGS="not slow and not disabled"
- FULL_DEPS=true
- CLIPBOARD_GUI=gtk2
- LINT=true
- CACHE_NAME="27_nslow"
- USE_CACHE=true
addons:
apt:
packages:
- python-gtk2
- python: 3.4
env:
- JOB_NAME: "34_nslow"
- NOSE_ARGS="not slow and not disabled"
- FULL_DEPS=true
- CLIPBOARD=xsel
- JOB_NAME: "34_nslow"
- NOSE_ARGS="not slow and not disabled"
- FULL_DEPS=true
- CLIPBOARD=xsel
- CACHE_NAME="34_nslow"
- USE_CACHE=true
addons:
apt:
packages:
- xsel
- python: 3.5
env:
- JOB_NAME: "35_nslow"
- NOSE_ARGS="not slow and not network and not disabled"
- FULL_DEPS=true
- CLIPBOARD=xsel
- COVERAGE=true
- JOB_NAME: "35_nslow"
- NOSE_ARGS="not slow and not network and not disabled"
- FULL_DEPS=true
- CLIPBOARD=xsel
- COVERAGE=true
- CACHE_NAME="35_nslow"
# - USE_CACHE=true # Don't use cache for 35_nslow
addons:
apt:
packages:
- xsel
# In allow_failures
- python: 2.7
env:
- JOB_NAME: "27_slow"
- JOB_TAG=_SLOW
- NOSE_ARGS="slow and not network and not disabled"
- FULL_DEPS=true
- JOB_NAME: "27_slow"
- JOB_TAG=_SLOW
- NOSE_ARGS="slow and not network and not disabled"
- FULL_DEPS=true
- CACHE_NAME="27_slow"
- USE_CACHE=true
# In allow_failures
- python: 3.4
env:
- JOB_NAME: "34_slow"
- JOB_TAG=_SLOW
- NOSE_ARGS="slow and not network and not disabled"
- FULL_DEPS=true
- CLIPBOARD=xsel
- JOB_NAME: "34_slow"
- JOB_TAG=_SLOW
- NOSE_ARGS="slow and not network and not disabled"
- FULL_DEPS=true
- CLIPBOARD=xsel
- CACHE_NAME="34_slow"
- USE_CACHE=true
addons:
apt:
packages:
- xsel
# In allow_failures
- python: 2.7
env:
- JOB_NAME: "27_build_test_conda"
- JOB_TAG=_BUILD_TEST
- NOSE_ARGS="not slow and not disabled"
- FULL_DEPS=true
- BUILD_TEST=true
- JOB_NAME: "27_build_test_conda"
- JOB_TAG=_BUILD_TEST
- NOSE_ARGS="not slow and not disabled"
- FULL_DEPS=true
- BUILD_TEST=true
- CACHE_NAME="27_build_test_conda"
- USE_CACHE=true
# In allow_failures
- python: 3.5
env:
- JOB_NAME: "35_numpy_dev"
- JOB_TAG=_NUMPY_DEV
- NOSE_ARGS="not slow and not network and not disabled"
- PANDAS_TESTING_MODE="deprecate"
- JOB_NAME: "35_numpy_dev"
- JOB_TAG=_NUMPY_DEV
- NOSE_ARGS="not slow and not network and not disabled"
- PANDAS_TESTING_MODE="deprecate"
- CACHE_NAME="35_numpy_dev"
- USE_CACHE=true
addons:
apt:
packages:
- libatlas-base-dev
- gfortran
# In allow_failures
- python: 2.7
env:
- JOB_NAME: "27_nslow_nnet_COMPAT"
- NOSE_ARGS="not slow and not network and not disabled"
- LOCALE_OVERRIDE="it_IT.UTF-8"
- INSTALL_TEST=true
- JOB_TAG=_COMPAT
- JOB_NAME: "27_nslow_nnet_COMPAT"
- NOSE_ARGS="not slow and not network and not disabled"
- LOCALE_OVERRIDE="it_IT.UTF-8"
- INSTALL_TEST=true
- JOB_TAG=_COMPAT
- CACHE_NAME="27_nslow_nnet_COMPAT"
- USE_CACHE=true
addons:
apt:
packages:
- language-pack-it
# In allow_failures
- python: 3.5
env:
- JOB_NAME: "35_ascii"
- JOB_TAG=_ASCII
- NOSE_ARGS="not slow and not network and not disabled"
- LOCALE_OVERRIDE="C"
- CACHE_NAME="35_ascii"
- USE_CACHE=true
# In allow_failures
- python: 2.7
env:
- JOB_NAME: "doc_build"
- FULL_DEPS=true
- DOC_BUILD=true # if rst files were changed, build docs in parallel with tests
- JOB_TAG=_DOC_BUILD
- JOB_NAME: "doc_build"
- FULL_DEPS=true
- DOC_BUILD=true
- JOB_TAG=_DOC_BUILD
- CACHE_NAME="doc_build"
- USE_CACHE=true
allow_failures:
- python: 2.7
env:
- JOB_NAME: "27_slow"
- JOB_TAG=_SLOW
- NOSE_ARGS="slow and not network and not disabled"
- FULL_DEPS=true
- CACHE_NAME="27_slow"
- USE_CACHE=true
- python: 3.4
env:
- JOB_NAME: "34_slow"
- JOB_TAG=_SLOW
- NOSE_ARGS="slow and not network and not disabled"
- FULL_DEPS=true
- CLIPBOARD=xsel
- CACHE_NAME="34_slow"
- USE_CACHE=true
addons:
apt:
packages:
- xsel
- python: 2.7
env:
- JOB_NAME: "27_build_test_conda"
- JOB_TAG=_BUILD_TEST
- NOSE_ARGS="not slow and not disabled"
- FULL_DEPS=true
- BUILD_TEST=true
- CACHE_NAME="27_build_test_conda"
- USE_CACHE=true
- python: 3.5
env:
- JOB_NAME: "35_numpy_dev"
- JOB_TAG=_NUMPY_DEV
- NOSE_ARGS="not slow and not network and not disabled"
- PANDAS_TESTING_MODE="deprecate"
- CACHE_NAME="35_numpy_dev"
- USE_CACHE=true
addons:
apt:
packages:
- libatlas-base-dev
- gfortran
- python: 2.7
env:
- JOB_NAME: "27_nslow_nnet_COMPAT"
- NOSE_ARGS="not slow and not network and not disabled"
- LOCALE_OVERRIDE="it_IT.UTF-8"
- INSTALL_TEST=true
- JOB_TAG=_COMPAT
- CACHE_NAME="27_nslow_nnet_COMPAT"
- USE_CACHE=true
addons:
apt:
packages:
- language-pack-it
- python: 3.5
env:
- JOB_NAME: "35_ascii"
- JOB_TAG=_ASCII
- NOSE_ARGS="not slow and not network and not disabled"
- LOCALE_OVERRIDE="C"
- CACHE_NAME="35_ascii"
- USE_CACHE=true
- python: 2.7
env:
- JOB_NAME: "doc_build"
- FULL_DEPS=true
- DOC_BUILD=true
- JOB_TAG=_DOC_BUILD
- CACHE_NAME="doc_build"
- USE_CACHE=true

before_install:
- echo "before_install"
- source ci/travis_process_gbq_encryption.sh
- echo $VIRTUAL_ENV
- export PATH="$HOME/miniconda/bin:$PATH"
- df -h
Expand All @@ -153,9 +263,10 @@ before_install:

install:
- echo "install start"
- ci/prep_ccache.sh
- ci/check_cache.sh
- ci/prep_cython_cache.sh
- ci/install_travis.sh
- ci/submit_ccache.sh
- ci/submit_cython_cache.sh
- echo "install done"

before_script:
Expand All @@ -175,6 +286,6 @@ after_success:
after_script:
- echo "after_script start"
- ci/install_test.sh
- source activate pandas && ci/print_versions.py
- source activate pandas && python -c "import pandas; pandas.show_versions();"
- ci/print_skipped.py /tmp/nosetests.xml
- echo "after_script done"
4 changes: 2 additions & 2 deletions LICENSES/ULTRAJSON_LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


Portions of code from MODP_ASCII - Ascii transformations (upper/lower, etc)
http://code.google.com/p/stringencoders/
https://github.com/client9/stringencoders
Copyright (c) 2007 Nick Galbreath -- nickg [at] modp [dot] com. All rights reserved.

Numeric decoder derived from from TCL library
http://www.opensource.apple.com/source/tcl/tcl-14/tcl/license.terms
* Copyright (c) 1988-1993 The Regents of the University of California.
* Copyright (c) 1994 Sun Microsystems, Inc.
* Copyright (c) 1994 Sun Microsystems, Inc.
Loading

0 comments on commit 8ab1250

Please sign in to comment.