Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CFTimeIndex #1252

Merged
merged 75 commits into from
May 13, 2018
Merged

CFTimeIndex #1252

merged 75 commits into from
May 13, 2018

Commits on Feb 6, 2017

  1. Configuration menu
    Copy the full SHA
    e1e8223 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6496458 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

  1. Configuration menu
    Copy the full SHA
    675b2f7 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2017

  1. Configuration menu
    Copy the full SHA
    7beddc1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3cf03bc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    53b085c View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2017

  1. Merge branch 'master' of https://github.com/pydata/xarray into NetCDF…

    …TimeIndex
    
    Conflicts:
    	xarray/backends/netcdf3.py
    	xarray/conventions/coding.py
    	xarray/core/dataset.py
    spencerkclark committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    738979b View commit details
    Browse the repository at this point in the history

Commits on May 10, 2017

  1. First attempts at integrating NetCDFTimeIndex into xarray

    This is a first pass at the following:
    - Resetting the logic for decoding datetimes such that `np.datetime64` objects
    are never used for non-standard calendars
    - Adding logic to use a `NetCDFTimeIndex` whenever `netcdftime.datetime`
    objects are used in an array being cast as an index (so if one reads in a
    Dataset from a netCDF file or creates one in Python, which is indexed by a time
    coordinate that uses `netcdftime.datetime` objects a NetCDFTimeIndex will be
    used rather than a generic object-based index)
    - Adding logic to encode `netcdftime.datetime` objects when saving out to
    netCDF files
    spencerkclark committed May 10, 2017
    Configuration menu
    Copy the full SHA
    a177f89 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2017

  1. Cleanup

    spencerkclark committed May 11, 2017
    Configuration menu
    Copy the full SHA
    48ec519 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9e76df6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2a7b439 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b942724 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2017

  1. Merge branch 'master' into NetCDFTimeIndex

    Conflicts:
    	xarray/__init__.py
    spencerkclark committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    7845e6d View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2017

  1. Configuration menu
    Copy the full SHA
    a9ed3c8 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2017

  1. Merge branch 'master' into NetCDFTimeIndex

    Conflicts:
    	xarray/core/accessors.py
    	xarray/core/common.py
    	xarray/core/dataset.py
    spencerkclark committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    3e23ed5 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2018

  1. Merge branch 'master' into NetCDFTimeIndex

    Conflicts:
    	xarray/__init__.py
    	xarray/backends/api.py
    	xarray/backends/common.py
    	xarray/backends/netcdf3.py
    	xarray/conventions/coding.py
    	xarray/convert.py
    	xarray/core/dataset.py
    	xarray/tests/test_coding.py
    	xarray/tests/test_utils.py
    spencerkclark committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    a9f3548 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f00f59a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b34879d View commit details
    Browse the repository at this point in the history
  4. flake8

    spencerkclark committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    e93b62d View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2018

  1. Merge branch 'master' into NetCDFTimeIndex

    Conflicts:
    	xarray/coding/times.py
    spencerkclark committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    61e8bc6 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2018

  1. Merge branch 'master' into NetCDFTimeIndex

    Conflicts:
    	xarray/coding/times.py
    	xarray/core/accessors.py
    	xarray/core/dataset.py
    	xarray/tests/test_coding_times.py
    	xarray/tests/test_utils.py
    spencerkclark committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    0244f58 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    32d7986 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9855176 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8d61fdb View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2018

  1. Configuration menu
    Copy the full SHA
    6b87da7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    812710c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3610e6e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8f69a90 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2018

  1. Configuration menu
    Copy the full SHA
    cec909c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    422792b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    de74037 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2993e3c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f3438fd View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c35364e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    08f72dc View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2018

  1. Configuration menu
    Copy the full SHA
    62ce0ae View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2018

  1. Configuration menu
    Copy the full SHA
    ff05005 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2018

  1. Merge branch 'master' into NetCDFTimeIndex

    Conflicts:
    	xarray/core/dataset.py
    spencerkclark committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    20fea63 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d5a3cef View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2018

  1. Configuration menu
    Copy the full SHA
    e721d26 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2018

  1. Configuration menu
    Copy the full SHA
    5e1c4a8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    257f086 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2018

  1. Merge branch 'master' into NetCDFTimeIndex

    Conflicts:
    	xarray/core/common.py
    	xarray/tests/test_coding_times.py
    spencerkclark committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    00e8ada View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c9d0454 View commit details
    Browse the repository at this point in the history
  3. Documentation edits

    spencerkclark committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    f678714 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2018

  1. Ensure proper enable_netcdftimeindex option is used under lazy decoding

    Prior to this, opening a dataset with enable_netcdftimeindex set to True
    and then accessing one of its variables outside the context manager would
    lead to it being decoded with the default enable_netcdftimeindex
    (which is False).  This makes sure that lazy decoding takes into account
    the context under which it was called.
    spencerkclark committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    b03e38e View commit details
    Browse the repository at this point in the history
  2. Add fix and test for concatenating variables with a NetCDFTimeIndex

    Previously when concatenating variables indexed by a NetCDFTimeIndex
    the index would be wrongly converted to a generic pd.Index
    spencerkclark committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    890dde0 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2018

  1. Merge branch 'master' into NetCDFTimeIndex

    Conflicts:
    	xarray/coding/times.py
    	xarray/tests/test_coding_times.py
    spencerkclark committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    80e05ba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    13c8358 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ab46798 View commit details
    Browse the repository at this point in the history
  4. Documentation updates

    spencerkclark committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    67fd335 View commit details
    Browse the repository at this point in the history
  5. Only allow use of CFTimeIndex when using the standalone cftime

    Also only allow for serialization of cftime.datetime objects when
    using the standalone cftime package.
    spencerkclark committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    7041a8d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9df4e11 View commit details
    Browse the repository at this point in the history
  7. flake8

    spencerkclark committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    9391463 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    da12ecd View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2018

  1. Configuration menu
    Copy the full SHA
    a6997ec View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7302d7e View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2018

  1. Require standalone cftime library for all new functionality

    Add tests/fixes for dt accessor with cftime datetimes
    spencerkclark committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    9dc5539 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1aa8d86 View commit details
    Browse the repository at this point in the history
  3. Fix skipping logic in test_cftimeindex.py for when cftime or netcdftime

    are not available.  Use existing requires_cftime decorator where possible
    (i.e. only on tests that are not parametrized via pytest.mark.parametrize)
    spencerkclark committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    ef3f2b1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4fb5a90 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1fd205a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    58a0715 View commit details
    Browse the repository at this point in the history
  7. flake8

    spencerkclark committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    ca4d7dd View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2018

  1. Address review comments

    spencerkclark committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    3947aac View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a395db0 View commit details
    Browse the repository at this point in the history
  3. flake8

    spencerkclark committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    1b00bde View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5fdcd20 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' into NetCDFTimeIndex

    Conflicts:
    	xarray/backends/zarr.py
    spencerkclark committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    459211c View commit details
    Browse the repository at this point in the history
  6. flake8

    spencerkclark committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    7e9bb20 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2018

  1. Configuration menu
    Copy the full SHA
    247c9eb View commit details
    Browse the repository at this point in the history
  2. Restore test case for pydata#2002 in test_coding_times.py

    I must have inadvertently removed it during a merge.
    spencerkclark committed May 1, 2018
    Configuration menu
    Copy the full SHA
    e66abe9 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2018

  1. Configuration menu
    Copy the full SHA
    f25b0b6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b10cc73 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2018

  1. Address review comments

    spencerkclark committed May 12, 2018
    Configuration menu
    Copy the full SHA
    c318755 View commit details
    Browse the repository at this point in the history