From d6a073bea9c99a4cb132e9bb8886f548e43f9fc5 Mon Sep 17 00:00:00 2001 From: Keewis Date: Mon, 6 Jul 2020 12:35:21 +0200 Subject: [PATCH 1/2] rename the main package to pint_xarray just like it was recently done for pint_pandas --- {pintxarray => pint_xarray}/__init__.py | 0 {pintxarray => pint_xarray}/accessors.py | 15 ++++++--------- {pintxarray => pint_xarray}/tests/__init__.py | 0 .../tests/test_accessors.py | 8 ++------ {pintxarray => pint_xarray}/tests/utils.py | 4 +--- 5 files changed, 9 insertions(+), 18 deletions(-) rename {pintxarray => pint_xarray}/__init__.py (100%) rename {pintxarray => pint_xarray}/accessors.py (99%) rename {pintxarray => pint_xarray}/tests/__init__.py (100%) rename {pintxarray => pint_xarray}/tests/test_accessors.py (99%) rename {pintxarray => pint_xarray}/tests/utils.py (99%) diff --git a/pintxarray/__init__.py b/pint_xarray/__init__.py similarity index 100% rename from pintxarray/__init__.py rename to pint_xarray/__init__.py diff --git a/pintxarray/accessors.py b/pint_xarray/accessors.py similarity index 99% rename from pintxarray/accessors.py rename to pint_xarray/accessors.py index b9f08598..a70aba1c 100644 --- a/pintxarray/accessors.py +++ b/pint_xarray/accessors.py @@ -1,20 +1,17 @@ # TODO is it possible to import pint-xarray from within xarray if pint is present? +import numpy as np +import pint +from pint.quantity import Quantity +from pint.unit import Unit from xarray import ( - register_dataarray_accessor, - register_dataset_accessor, DataArray, Dataset, Variable, + register_dataarray_accessor, + register_dataset_accessor, ) from xarray.core.npcompat import IS_NEP18_ACTIVE -import numpy as np - -import pint -from pint.quantity import Quantity -from pint.unit import Unit - - if not hasattr(Quantity, "__array_function__"): raise ImportError( "Imported version of pint does not implement " "__array_function__" diff --git a/pintxarray/tests/__init__.py b/pint_xarray/tests/__init__.py similarity index 100% rename from pintxarray/tests/__init__.py rename to pint_xarray/tests/__init__.py diff --git a/pintxarray/tests/test_accessors.py b/pint_xarray/tests/test_accessors.py similarity index 99% rename from pintxarray/tests/test_accessors.py rename to pint_xarray/tests/test_accessors.py index 534a0b3b..76e3fc7e 100644 --- a/pintxarray/tests/test_accessors.py +++ b/pint_xarray/tests/test_accessors.py @@ -1,20 +1,16 @@ +import numpy as np import pytest - import xarray as xr -from xarray.testing import assert_equal - -import numpy as np from numpy.testing import assert_array_equal - from pint import UnitRegistry # from pint.unit import Unit from pint.errors import UndefinedUnitError # , DimensionalityError +from xarray.testing import assert_equal # from pintxarray.accessors import PintDataArrayAccessor, PintDatasetAccessor from .utils import raises_regex # extract_units - # make sure scalars are converted to 0d arrays so quantities can # always be treated like ndarrays unit_registry = UnitRegistry(force_ndarray=True) diff --git a/pintxarray/tests/utils.py b/pint_xarray/tests/utils.py similarity index 99% rename from pintxarray/tests/utils.py rename to pint_xarray/tests/utils.py index b69dd0c7..c5c50e71 100644 --- a/pintxarray/tests/utils.py +++ b/pint_xarray/tests/utils.py @@ -1,10 +1,8 @@ -from contextlib import contextmanager import re +from contextlib import contextmanager import pytest - import xarray as xr - from pint.quantity import Quantity From 35fc1d2bf40e002a6d8d01cf3ddb6731d146e6cb Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 8 Jul 2020 14:32:48 +0200 Subject: [PATCH 2/2] also rename the package in the isort configuration --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index d796ae76..98ef2a45 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ exclude= [isort] default_section = THIRDPARTY -known_first_party = pintxarray +known_first_party = pint_xarray multi_line_output = 3 include_trailing_comma = True force_grid_wrap = 0