Merge pull request #4 from chrishavlin/callable_experiment

yt ds from within accessor using callable

Author: chrishavlin

.github/workflows/build-test.yml

@@ -1,14 +1,14 @@
 name: Run tests
 
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: ['3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/check-manifest.yml

@@ -16,6 +16,9 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install check-manifest
+    - name: install build dependencies
+      run: |
+        python -m pip install wheel
     - name: Install yt_xarray
       shell: bash
       run: |

.github/workflows/style-checks.yml

@@ -38,7 +38,7 @@ jobs:
       id: black
       run: |
         black --version
-        black --check --diff yt_idv/
+        black --check --diff yt_xarray/
 
   isort:
     name: isort
@@ -57,7 +57,7 @@ jobs:
       id: isort
       run: |
         isort --version-number
-        isort . --check --diff
+        isort yt_xarray --check --diff
 
   flynt:
     name: flynt

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/ambv/black
-    rev: 19.10b0  # keep in sync with tests/lint_requirements.txt
+    rev: 22.8.0  # keep in sync with tests/lint_requirements.txt
     hooks:
     - id: black
       language_version: python3

MANIFEST.in

@@ -3,9 +3,13 @@ include CONTRIBUTING.rst
 include HISTORY.rst
 include LICENSE
 include README.rst
-
+include *.txt
+include *.yaml
+include Makefile
+include tox.ini
 recursive-include tests *
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
+exclude .editorconfig
 
 recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif

setup.cfg

@@ -28,5 +28,3 @@ ignore = E203, # Whitespace before ':' (black compatibility)
     E741, # Do not use variables named 'I', 'O', or 'l'
     W503, # Line break occurred before a binary operator (black compatibility)
 
-[tool:pytest]
-collect_ignore = ['setup.py']

setup.py

@@ -22,16 +22,16 @@
 setup(
     author="Chris Havlin",
     author_email="[email protected]",
-    python_requires=">=3.6",
+    python_requires=">=3.8",
     classifiers=[
         "Development Status :: 2 - Pre-Alpha",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Natural Language :: English",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
     description="interfaces between yt and xarray",
     install_requires=requirements,

tests/lint_requirements.txt

@@ -3,6 +3,6 @@ mccabe~=0.6.1
 pycodestyle~=2.6.0
 pyflakes~=2.2.0
 isort==5.6.4   # keep in sync with .pre-commit-config.yaml
-black==19.10b0 # keep in sync with .pre-commit-config.yaml
+black==22.8.0 # keep in sync with .pre-commit-config.yaml
 flake8-bugbear
 flynt==0.52    # keep in sync with .pre-commit-config.yaml

tests/test_accesor.py

@@ -1,9 +1,30 @@
 import numpy as np
+import pytest
+import yt
 
 import yt_xarray  # noqa: F401
 from yt_xarray._utilities import construct_minimal_ds
 
 
+@pytest.fixture()
+def ds_xr():
+    # a base xarray ds to be used in various places.
+    tfield = "a_new_field"
+    n_x = 3
+    n_y = 4
+    n_z = 5
+    ds = construct_minimal_ds(
+        field_name=tfield,
+        n_fields=3,
+        n_x=n_x,
+        n_y=n_y,
+        n_z=n_z,
+        z_name="depth",
+        coord_order=["z", "y", "x"],
+    )
+    return ds
+
+
 def test_accessor():
 
     tfield = "a_new_field"
@@ -69,33 +90,23 @@ def test_bbox():
     # the test dataset.
 
 
-def test_load_uniform_grid():
+def test_load_uniform_grid(ds_xr):
 
-    tfield = "a_new_field"
-    n_x = 3
-    n_y = 4
-    n_z = 5
-    ds = construct_minimal_ds(
-        field_name=tfield,
-        n_fields=3,
-        n_x=n_x,
-        n_y=n_y,
-        n_z=n_z,
-        z_name="depth",
-        coord_order=["z", "y", "x"],
-    )
-
-    flds = [tfield + "_0", tfield + "_1"]
-    ds_yt = ds.yt.load_uniform_grid(flds)
+    flds = ["a_new_field_0", "a_new_field_1"]
+    ds_yt = ds_xr.yt.load_uniform_grid(flds)
     assert ds_yt.coordinates.name == "internal_geographic"
     expected_field_list = [("stream", f) for f in flds]
     assert all([f in expected_field_list] for f in ds_yt.field_list)
 
-    ds_yt = ds.yt.ds  # should generate a ds with all fields
-    flds = [tfield + "_0", tfield + "_1", tfield + "_2"]
+    ds_yt = ds_xr.yt.load_uniform_grid()  # should generate a ds with all fields
+    flds = flds + [
+        "a_new_field_2",
+    ]
     expected_field_list = [("stream", f) for f in flds]
     assert all([f in expected_field_list] for f in ds_yt.field_list)
 
+    tfield = "nice_field"
+    n_x, n_y, n_z = (7, 5, 17)
     ds = construct_minimal_ds(
         field_name=tfield,
         n_fields=3,
@@ -105,7 +116,7 @@ def test_load_uniform_grid():
         z_name="altitude",
         coord_order=["z", "y", "x"],
     )
-    ds_yt = ds.yt.ds
+    ds_yt = ds.yt.load_uniform_grid()
     assert ds_yt.coordinates.name == "geographic"
     assert all([f in expected_field_list] for f in ds_yt.field_list)
 
@@ -120,6 +131,35 @@ def test_load_uniform_grid():
         y_name="y",
         coord_order=["z", "y", "x"],
     )
+    flds = [
+        tfield + "_0",
+    ]
     ds_yt = ds.yt.load_uniform_grid(flds, length_unit="km")
     assert ds_yt.coordinates.name == "cartesian"
     assert all([f in expected_field_list] for f in ds_yt.field_list)
+
+
+@pytest.mark.skipif(
+    yt.__version__.startswith("4.1") is False, reason="requires yt>=4.1.0"
+)
+def test_load_grid_from_callable(ds_xr):
+    ds = ds_xr.yt.load_grid_from_callable()
+    flds = list(ds_xr.data_vars)
+    for fld in flds:
+        assert ("stream", fld) in ds.field_list
+
+    f = ds.all_data()[flds[0]]
+    assert len(f) == ds_xr.data_vars[flds[0]].size
+
+
+@pytest.mark.skipif(
+    yt.__version__.startswith("4.1") is False, reason="requires yt>=4.1.0"
+)
+def test_yt_ds_attr(ds_xr):
+    ds = ds_xr.yt.ds()
+    flds = list(ds_xr.data_vars)
+    for fld in flds:
+        assert ("stream", fld) in ds.field_list
+
+    f = ds.all_data()[flds[0]]
+    assert len(f) == ds_xr.data_vars[flds[0]].size

yt_xarray/_utilities.py

@@ -1,4 +1,4 @@
-from typing import Tuple
+from typing import Optional, Tuple
 
 import numpy as np
 import xarray as xr
@@ -20,9 +20,12 @@ def construct_minimal_ds(
     z_units: str = "km",
     field_name: str = "test_field",
     n_fields: int = 1,
-    coord_order: Tuple[str, str, str] = ["z", "y", "x"],
+    coord_order: Optional[Tuple[str, str, str]] = None,
 ) -> xr.Dataset:
 
+    if coord_order is None:
+        coord_order = ("z", "y", "x")
+
     # contruct and return a minimal xarray dataset to use in tests as needed
 
     # current known z types = ["height", "depth", "radius", "altitude"]