diff --git a/.travis.yml b/.travis.yml index 5a858c3f..91b41be4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,9 @@ language: python env: - PYTHON=2.7 PANDAS=0.19.2 COVERAGE='false' LINT='false' - - PYTHON=3.4 PANDAS=0.18.1 COVERAGE='false' LINT='false' - - PYTHON=3.5 PANDAS=0.19.2 COVERAGE='true' LINT='false' - - PYTHON=3.6 PANDAS=0.19.2 COVERAGE='false' LINT='true' + - PYTHON=3.5 PANDAS=0.18.1 COVERAGE='true' LINT='false' + - PYTHON=3.6 PANDAS=0.20.1 COVERAGE='false' LINT='true' + - PYTHON=3.6 PANDAS=MASTER COVERAGE='false' LINT='false' before_install: - echo "before_install" @@ -23,9 +23,15 @@ install: - conda info -a - conda create -n test-environment python=$PYTHON - source activate test-environment - - conda install pandas=$PANDAS + - if [[ "$PANDAS" == "MASTER" ]]; then + conda install numpy pytz python-dateutil; + PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"; + pip install --pre --upgrade --timeout=60 -f $PRE_WHEELS pandas; + else + conda install pandas=$PANDAS; + fi - pip install coverage pytest pytest-cov flake8 codecov - - REQ="ci/requirements-${PYTHON}.pip" + - REQ="ci/requirements-${PYTHON}-${PANDAS}.pip" - pip install -r $REQ - conda list - python setup.py install diff --git a/ci/requirements-2.7.pip b/ci/requirements-2.7-0.19.2.pip similarity index 100% rename from ci/requirements-2.7.pip rename to ci/requirements-2.7-0.19.2.pip diff --git a/ci/requirements-3.4.pip b/ci/requirements-3.5-0.18.1.pip similarity index 100% rename from ci/requirements-3.4.pip rename to ci/requirements-3.5-0.18.1.pip diff --git a/ci/requirements-3.5.pip b/ci/requirements-3.6-0.20.1.pip similarity index 100% rename from ci/requirements-3.5.pip rename to ci/requirements-3.6-0.20.1.pip diff --git a/ci/requirements-3.6.pip b/ci/requirements-3.6-MASTER.pip similarity index 100% rename from ci/requirements-3.6.pip rename to ci/requirements-3.6-MASTER.pip diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 677cfcc5..53c1a1b9 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,10 +1,11 @@ Changelog ========= -0.1.7 / 2017-??-?? +0.2.0 / 2017-??-?? ------------------ -- Resolve issue where the optional ``--noauth_local_webserver`` command line argument would not be propagated during the authentication process. +- Resolve issue where the optional ``--noauth_local_webserver`` command line argument would not be propagated during the authentication process. (:issue:`35`) +- Drop support for Python 3.4 (:issue:`40`) 0.1.6 / 2017-05-03 ------------------ @@ -14,12 +15,12 @@ Changelog 0.1.4 / 2017-03-17 ------------------ -- ``InvalidIndexColumn`` will be raised instead of ``InvalidColumnOrder`` in ``read_gbq`` when the index column specified does not exist in the BigQuery schema. :issue:`6` +- ``InvalidIndexColumn`` will be raised instead of ``InvalidColumnOrder`` in ``read_gbq`` when the index column specified does not exist in the BigQuery schema. (:issue:`6`) 0.1.3 / 2017-03-04 ------------------ -- Bug with appending to a BigQuery table where fields have modes (NULLABLE,REQUIRED,REPEATED) specified. These modes were compared versus the remote schema and writing a table via ``to_gbq`` would previously raise. :issue:`13` +- Bug with appending to a BigQuery table where fields have modes (NULLABLE,REQUIRED,REPEATED) specified. These modes were compared versus the remote schema and writing a table via ``to_gbq`` would previously raise. (:issue:`13`) 0.1.2 / 2017-02-23 ------------------ diff --git a/setup.py b/setup.py index 3aa08a64..a3b8f06f 100644 --- a/setup.py +++ b/setup.py @@ -1,26 +1,27 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from ast import parse -import os from setuptools import setup, find_packages +import versioneer NAME = 'pandas-gbq' # versioning -import versioneer cmdclass = versioneer.get_cmdclass() + def readme(): with open('README.rst') as f: return f.read() + INSTALL_REQUIRES = ( ['pandas', 'httplib2', 'google-api-python-client', 'oauth2client'] ) + setup( name=NAME, version=versioneer.get_version(), @@ -40,7 +41,6 @@ def readme(): 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Topic :: Scientific/Engineering',