diff --git a/.travis.yml b/.travis.yml
index 0e51e946da0..1e6c3254cdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,8 @@ matrix:
env: CONDA_ENV=py35
- python: 3.6
env: CONDA_ENV=py36
+ - python: 3.6 # TODO: change this to 3.7 once https://github.com/travis-ci/travis-ci/issues/9815 is fixed
+ env: CONDA_ENV=py37
- python: 3.6
env:
- CONDA_ENV=py36
diff --git a/ci/requirements-py37.yml b/ci/requirements-py37.yml
new file mode 100644
index 00000000000..5f973936f63
--- /dev/null
+++ b/ci/requirements-py37.yml
@@ -0,0 +1,13 @@
+name: test_env
+channels:
+ - defaults
+dependencies:
+ - python=3.7
+ - pip:
+ - pytest
+ - flake8
+ - mock
+ - numpy
+ - pandas
+ - coveralls
+ - pytest-cov
diff --git a/doc/installing.rst b/doc/installing.rst
index 85cd5a02568..eb74eb7162b 100644
--- a/doc/installing.rst
+++ b/doc/installing.rst
@@ -6,7 +6,7 @@ Installation
Required dependencies
---------------------
-- Python 2.7 [1]_, 3.5, or 3.6
+- Python 2.7 [1]_, 3.5, 3.6, or 3.7
- `numpy `__ (1.12 or later)
- `pandas `__ (0.19.2 or later)
diff --git a/doc/whats-new.rst b/doc/whats-new.rst
index 3bc2c521568..67d0d548ec5 100644
--- a/doc/whats-new.rst
+++ b/doc/whats-new.rst
@@ -33,6 +33,9 @@ v0.11.0 (unreleased)
Enhancements
~~~~~~~~~~~~
+- Added support for Python 3.7. (:issue:`2271`).
+ By `Joe Hamman `_.
+
Bug fixes
~~~~~~~~~
@@ -78,8 +81,8 @@ Enhancements
(:issue:`1186`)
By `Seth P `_.
- A new CFTimeIndex-enabled :py:func:`cftime_range` function for use in
- generating dates from standard or non-standard calendars. By `Spencer Clark
- `_.
+ generating dates from standard or non-standard calendars. By `Spencer Clark
+ `_.
- When interpolating over a ``datetime64`` axis, you can now provide a datetime string instead of a ``datetime64`` object. E.g. ``da.interp(time='1991-02-01')``
(:issue:`2284`)
@@ -178,7 +181,6 @@ Enhancements
:py:meth:`~xarray.DataArray.from_cdms2` (:issue:`2262`).
By `Stephane Raynaud `_.
-
Bug fixes
~~~~~~~~~