diff --git a/docs/conf.py b/docs/conf.py index 274c3d6..354625b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -45,7 +45,7 @@ autodoc_typehints = "none" # autoapi configuration -autoapi_dirs = ["../earthkit/transforms"] +autoapi_dirs = ["../src/earthkit/transforms"] autoapi_ignore = ["*/version.py", "*/aggregate/general.py"] autoapi_options = [ "members", diff --git a/pyproject.toml b/pyproject.toml index 8cdd170..5c50fa4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ requires = ["setuptools>=64", "setuptools_scm>=8"] [project] classifiers = [ - "Development Status :: 2 - Pre-Alpha", + "Development Status :: 4 - Beta", "Intended Audience :: Science/Research", "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", @@ -68,11 +68,12 @@ select = [ "D" ] -[tool.setuptools] -packages = ["earthkit.transforms"] +[tool.setuptools.packages.find] +include = ["earthkit.transforms"] +where = ["src/"] [tool.setuptools_scm] -write_to = "earthkit/transforms/version.py" +write_to = "src/earthkit/transforms/version.py" write_to_template = ''' # Do not change! Do not track in version control! __version__ = "{version}" diff --git a/earthkit/transforms/__init__.py b/src/earthkit/transforms/__init__.py similarity index 100% rename from earthkit/transforms/__init__.py rename to src/earthkit/transforms/__init__.py diff --git a/earthkit/transforms/aggregate/__init__.py b/src/earthkit/transforms/aggregate/__init__.py similarity index 100% rename from earthkit/transforms/aggregate/__init__.py rename to src/earthkit/transforms/aggregate/__init__.py diff --git a/earthkit/transforms/aggregate/climatology.py b/src/earthkit/transforms/aggregate/climatology.py similarity index 99% rename from earthkit/transforms/aggregate/climatology.py rename to src/earthkit/transforms/aggregate/climatology.py index f279bbd..363ef1d 100644 --- a/earthkit/transforms/aggregate/climatology.py +++ b/src/earthkit/transforms/aggregate/climatology.py @@ -1,7 +1,6 @@ import typing as T import xarray as xr - from earthkit.transforms import tools from earthkit.transforms.aggregate.general import reduce as _reduce from earthkit.transforms.aggregate.general import resample diff --git a/earthkit/transforms/aggregate/general.py b/src/earthkit/transforms/aggregate/general.py similarity index 99% rename from earthkit/transforms/aggregate/general.py rename to src/earthkit/transforms/aggregate/general.py index eb237b3..8b48583 100644 --- a/earthkit/transforms/aggregate/general.py +++ b/src/earthkit/transforms/aggregate/general.py @@ -2,7 +2,6 @@ import numpy as np import xarray as xr - from earthkit.transforms import tools diff --git a/earthkit/transforms/aggregate/spatial.py b/src/earthkit/transforms/aggregate/spatial.py similarity index 99% rename from earthkit/transforms/aggregate/spatial.py rename to src/earthkit/transforms/aggregate/spatial.py index b9e6494..ecb99c6 100644 --- a/earthkit/transforms/aggregate/spatial.py +++ b/src/earthkit/transforms/aggregate/spatial.py @@ -6,7 +6,6 @@ import numpy as np import pandas as pd import xarray as xr - from earthkit.transforms.tools import ensure_list, get_how, get_spatial_info, standard_weights logger = logging.getLogger(__name__) diff --git a/earthkit/transforms/aggregate/temporal.py b/src/earthkit/transforms/aggregate/temporal.py similarity index 99% rename from earthkit/transforms/aggregate/temporal.py rename to src/earthkit/transforms/aggregate/temporal.py index 05eb314..6d0b215 100644 --- a/earthkit/transforms/aggregate/temporal.py +++ b/src/earthkit/transforms/aggregate/temporal.py @@ -4,7 +4,6 @@ import numpy as np import pandas as pd import xarray as xr - from earthkit.transforms import tools from earthkit.transforms.aggregate.general import how_label_rename, resample from earthkit.transforms.aggregate.general import reduce as _reduce diff --git a/earthkit/transforms/tools.py b/src/earthkit/transforms/tools.py similarity index 100% rename from earthkit/transforms/tools.py rename to src/earthkit/transforms/tools.py diff --git a/tests/test_10_tools.py b/tests/test_10_tools.py index 6206d65..b45a17d 100644 --- a/tests/test_10_tools.py +++ b/tests/test_10_tools.py @@ -4,7 +4,6 @@ import pandas as pd import pytest import xarray as xr - from earthkit.transforms.tools import ( get_dim_key, get_how, diff --git a/tests/test_20_general.py b/tests/test_20_general.py index a4f5ec4..821c27c 100644 --- a/tests/test_20_general.py +++ b/tests/test_20_general.py @@ -1,7 +1,6 @@ import numpy as np import pytest import xarray as xr - from earthkit.transforms.aggregate.general import ( _reduce_dataarray, _rolling_reduce_dataarray, diff --git a/tests/test_30_spatial.py b/tests/test_30_spatial.py index 99a3ac5..1740e0d 100644 --- a/tests/test_30_spatial.py +++ b/tests/test_30_spatial.py @@ -4,7 +4,6 @@ # from earthkit.data.core.temporary import temp_directory import xarray as xr - from earthkit import data as ek_data from earthkit.data.testing import earthkit_remote_test_data_file from earthkit.transforms.aggregate import spatial diff --git a/tests/test_30_temporal.py b/tests/test_30_temporal.py index 4a50311..9a5f142 100644 --- a/tests/test_30_temporal.py +++ b/tests/test_30_temporal.py @@ -4,7 +4,6 @@ # from earthkit.data.core.temporary import temp_directory import xarray as xr - from earthkit import data as ek_data from earthkit.data.testing import earthkit_remote_test_data_file from earthkit.transforms.aggregate import temporal diff --git a/tests/test_40_climatology.py b/tests/test_40_climatology.py index 633e70a..8133c3b 100644 --- a/tests/test_40_climatology.py +++ b/tests/test_40_climatology.py @@ -2,7 +2,6 @@ # from earthkit.data.core.temporary import temp_directory import xarray as xr - from earthkit import data as ek_data from earthkit.data.testing import earthkit_remote_test_data_file from earthkit.transforms.aggregate import climatology