Merge branch 'master' into to

xarray-contrib · Jul 8, 2020 · 71712ba · 71712ba
2 parents 6855b31 + 7e8e0d2
commit 71712ba
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 3 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -21,7 +21,7 @@
 import sphinx_autosummary_accessors
 
 # need to import so accessors get registered
-import pintxarray  # noqa: F401
+import pint_xarray  # noqa: F401
 
 # -- Project information -----------------------------------------------------
 

diff --git a/pintxarray/__init__.py → pint_xarray/__init__.py b/pintxarray/__init__.py → pint_xarray/__init__.py
diff --git a/pintxarray/accessors.py → pint_xarray/accessors.py b/pintxarray/accessors.py → pint_xarray/accessors.py
diff --git a/pintxarray/conversion.py → pint_xarray/conversion.py b/pintxarray/conversion.py → pint_xarray/conversion.py
diff --git a/pintxarray/tests/__init__.py → pint_xarray/tests/__init__.py b/pintxarray/tests/__init__.py → pint_xarray/tests/__init__.py
diff --git a/pintxarray/tests/test_accessors.py → pint_xarray/tests/test_accessors.py b/pintxarray/tests/test_accessors.py → pint_xarray/tests/test_accessors.py
diff --git a/pintxarray/tests/test_conversion.py → pint_xarray/tests/test_conversion.py b/pintxarray/tests/test_conversion.py → pint_xarray/tests/test_conversion.py
@@ -3,7 +3,7 @@
 import pytest
 from xarray import DataArray, Dataset, Variable
 
-from pintxarray import conversion
+from pint_xarray import conversion
 
 from .utils import assert_array_equal, assert_array_units_equal, assert_equal
 

diff --git a/pintxarray/tests/utils.py → pint_xarray/tests/utils.py b/pintxarray/tests/utils.py → pint_xarray/tests/utils.py
diff --git 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