Skip to content

Support Pydap 3.2, including on Python 3 #1439

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 8, 2017
Merged

Support Pydap 3.2, including on Python 3 #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fbbc31
Support Pydap 3.2, including on Python 3
shoyer Jun 3, 2017
4ecc236
Remove separate pydap test
shoyer Jun 4, 2017
3f2f8ef
Merge branch 'master' into pydap-3.2
shoyer Jun 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ matrix:
env:
- CONDA_ENV=py36
- EXTRA_FLAGS="--run-flaky --run-network-tests"
- python: 3.6
env: CONDA_ENV=py36-pydap
- python: 3.6
env: CONDA_ENV=py36-netcdf4-dev
addons:
Expand All @@ -46,8 +44,6 @@ matrix:
env:
- CONDA_ENV=py36
- EXTRA_FLAGS="--run-flaky --run-network-tests"
- python: 3.6
env: CONDA_ENV=py36-pydap
- python: 3.6
env: CONDA_ENV=py36-netcdf4-dev
addons:
Expand Down
19 changes: 0 additions & 19 deletions ci/requirements-py36-pydap.yml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ci/requirements-py36.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ dependencies:
- pip:
- coveralls
- pytest-cov
- pydap
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason for testing pydap on py3.6 only?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our pydap tests are currently network only tests, and we only run those on Python 3.6.

3 changes: 3 additions & 0 deletions doc/whats-new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ By `Keisuke Fujii <https://github.com/fujiisoup>`_.
- ``DataArray.chunk()`` now accepts dask specific kwargs like
``Dataset.chunk()`` does. By `Fabien Maussion <https://github.com/fmaussion>`_.

- Support for ``engine='pydap'`` with recent releases of Pydap (3.2.2+),
including on Python 3 (:issue:`1174`).

Documentation
~~~~~~~~~~~~~

Expand Down
4 changes: 2 additions & 2 deletions xarray/backends/pydap_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ def open_store_variable(self, var):
return Variable(var.dimensions, data, var.attributes)

def get_variables(self):
return FrozenOrderedDict((k, self.open_store_variable(v))
for k, v in self.ds.iteritems())
return FrozenOrderedDict((k, self.open_store_variable(self.ds[k]))
for k in self.ds.keys())

def get_attrs(self):
return Frozen(_fix_global_attributes(self.ds.attributes))
Expand Down
3 changes: 2 additions & 1 deletion xarray/tests/test_backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from . import (TestCase, requires_scipy, requires_netCDF4, requires_pydap,
requires_scipy_or_netCDF4, requires_dask, requires_h5netcdf,
requires_pynio, has_netCDF4, has_scipy, assert_allclose,
flaky, requires_rasterio, assert_identical)
flaky, network, requires_rasterio, assert_identical)
from .test_dataset import create_test_data

try:
Expand Down Expand Up @@ -1361,6 +1361,7 @@ class DaskTestAutocloseTrue(DaskTest):
autoclose = True


@network
@requires_scipy_or_netCDF4
@requires_pydap
class PydapTest(TestCase):
Expand Down