Merge pull request #3 from openclimatefix/rename-package

rename package
openclimatefix · Aug 2, 2024 · 29e1ec3 · 29e1ec3
2 parents e681508 + 1b3f877
commit 29e1ec3
Show file tree

Hide file tree

Showing 25 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/workflows.yaml b/.github/workflows/workflows.yaml
@@ -11,7 +11,7 @@ jobs:
       # 0 means don't use pytest-xdist
       pytest_numcpus: "4"
       # pytest-cov looks at this folder
-      pytest_cov_dir: "ocf_dataset_alpha"
+      pytest_cov_dir: "ocf_data_sampler"
       # extra things to install
       #sudo_apt_install: "libgeos++-dev libproj-dev proj-data proj-bin"
       #      brew_install: "proj geos librttopo"

diff --git a/ocf_dataset_alpha/data/uk_gsp_locations.csv → ocf_data_sampler/data/uk_gsp_locations.csv b/ocf_dataset_alpha/data/uk_gsp_locations.csv → ocf_data_sampler/data/uk_gsp_locations.csv
diff --git a/ocf_dataset_alpha/datasets/pvnet.py → ocf_data_sampler/datasets/pvnet.py b/ocf_dataset_alpha/datasets/pvnet.py → ocf_data_sampler/datasets/pvnet.py
@@ -8,22 +8,22 @@
 from torch.utils.data import Dataset
 
 
-from ocf_dataset_alpha.load.gsp import open_gsp
-from ocf_dataset_alpha.load.nwp import open_nwp
-from ocf_dataset_alpha.load.satellite import open_sat_data
-from ocf_dataset_alpha.select.find_contiguous_t0_time_periods import (
+from ocf_data_sampler.load.gsp import open_gsp
+from ocf_data_sampler.load.nwp import open_nwp
+from ocf_data_sampler.load.satellite import open_sat_data
+from ocf_data_sampler.select.find_contiguous_t0_time_periods import (
     find_contiguous_t0_time_periods, find_contiguous_t0_periods_nwp, 
     intersection_of_multiple_dataframes_of_periods,
 )
 
-from ocf_dataset_alpha.select.fill_time_periods import fill_time_periods
+from ocf_data_sampler.select.fill_time_periods import fill_time_periods
 
-from ocf_dataset_alpha.select.select_time_slice import select_time_slice, select_time_slice_nwp
-from ocf_dataset_alpha.select.dropout import draw_dropout_time, apply_dropout_time
+from ocf_data_sampler.select.select_time_slice import select_time_slice, select_time_slice_nwp
+from ocf_data_sampler.select.dropout import draw_dropout_time, apply_dropout_time
 
-from ocf_dataset_alpha.select.select_spatial_slice import select_spatial_slice_pixels
+from ocf_data_sampler.select.select_spatial_slice import select_spatial_slice_pixels
 
-from ocf_dataset_alpha.numpy_batch import (
+from ocf_data_sampler.numpy_batch import (
     convert_gsp_to_numpy_batch,
     convert_nwp_to_numpy_batch,
     convert_satellite_to_numpy_batch,

diff --git a/ocf_dataset_alpha/load/__init__..py → ocf_data_sampler/load/__init__..py b/ocf_dataset_alpha/load/__init__..py → ocf_data_sampler/load/__init__..py
diff --git a/ocf_dataset_alpha/load/gsp.py → ocf_data_sampler/load/gsp.py b/ocf_dataset_alpha/load/gsp.py → ocf_data_sampler/load/gsp.py
diff --git a/ocf_dataset_alpha/load/nwp/__init__.py → ocf_data_sampler/load/nwp/__init__.py b/ocf_dataset_alpha/load/nwp/__init__.py → ocf_data_sampler/load/nwp/__init__.py
diff --git a/ocf_dataset_alpha/load/nwp/nwp.py → ocf_data_sampler/load/nwp/nwp.py b/ocf_dataset_alpha/load/nwp/nwp.py → ocf_data_sampler/load/nwp/nwp.py
@@ -2,8 +2,8 @@
 
 import xarray as xr
 
-from ocf_dataset_alpha.load.nwp.providers.ukv import open_ukv
-from ocf_dataset_alpha.load.nwp.providers.ecmwf import open_ifs
+from ocf_data_sampler.load.nwp.providers.ukv import open_ukv
+from ocf_data_sampler.load.nwp.providers.ecmwf import open_ifs
 
 
 def open_nwp(zarr_path: Path | str | list[Path] | list[str], provider: str = "ukv"):

diff --git a/...dataset_alpha/load/nwp/providers/ecmwf.py → ocf_data_sampler/load/nwp/providers/ecmwf.py b/...dataset_alpha/load/nwp/providers/ecmwf.py → ocf_data_sampler/load/nwp/providers/ecmwf.py
@@ -1,7 +1,7 @@
 """ECMWF provider loaders"""
 from pathlib import Path
 import xarray as xr
-from ocf_dataset_alpha.load.nwp.providers.utils import (
+from ocf_data_sampler.load.nwp.providers.utils import (
     open_zarr_paths, check_time_unique_increasing
 )
 

diff --git a/ocf_dataset_alpha/load/nwp/providers/ukv.py → ocf_data_sampler/load/nwp/providers/ukv.py b/ocf_dataset_alpha/load/nwp/providers/ukv.py → ocf_data_sampler/load/nwp/providers/ukv.py
@@ -5,7 +5,7 @@
 from pathlib import Path
 
 
-from ocf_dataset_alpha.load.nwp.providers.utils import (
+from ocf_data_sampler.load.nwp.providers.utils import (
     open_zarr_paths, check_time_unique_increasing
 )
 

diff --git a/...dataset_alpha/load/nwp/providers/utils.py → ocf_data_sampler/load/nwp/providers/utils.py b/...dataset_alpha/load/nwp/providers/utils.py → ocf_data_sampler/load/nwp/providers/utils.py
diff --git a/ocf_dataset_alpha/load/satellite.py → ocf_data_sampler/load/satellite.py b/ocf_dataset_alpha/load/satellite.py → ocf_data_sampler/load/satellite.py
diff --git a/ocf_dataset_alpha/numpy_batch/__init__.py → ocf_data_sampler/numpy_batch/__init__.py b/ocf_dataset_alpha/numpy_batch/__init__.py → ocf_data_sampler/numpy_batch/__init__.py
diff --git a/...set_alpha/numpy_batch/add_sun_position.py → ...a_sampler/numpy_batch/add_sun_position.py b/...set_alpha/numpy_batch/add_sun_position.py → ...a_sampler/numpy_batch/add_sun_position.py
diff --git a/ocf_dataset_alpha/numpy_batch/gsp.py → ocf_data_sampler/numpy_batch/gsp.py b/ocf_dataset_alpha/numpy_batch/gsp.py → ocf_data_sampler/numpy_batch/gsp.py
diff --git a/ocf_dataset_alpha/numpy_batch/nwp.py → ocf_data_sampler/numpy_batch/nwp.py b/ocf_dataset_alpha/numpy_batch/nwp.py → ocf_data_sampler/numpy_batch/nwp.py
diff --git a/ocf_dataset_alpha/numpy_batch/satellite.py → ocf_data_sampler/numpy_batch/satellite.py b/ocf_dataset_alpha/numpy_batch/satellite.py → ocf_data_sampler/numpy_batch/satellite.py
diff --git a/ocf_dataset_alpha/select/dropout.py → ocf_data_sampler/select/dropout.py b/ocf_dataset_alpha/select/dropout.py → ocf_data_sampler/select/dropout.py
diff --git a/...dataset_alpha/select/fill_time_periods.py → ocf_data_sampler/select/fill_time_periods.py b/...dataset_alpha/select/fill_time_periods.py → ocf_data_sampler/select/fill_time_periods.py
diff --git a/...select/find_contiguous_t0_time_periods.py → ...select/find_contiguous_t0_time_periods.py b/...select/find_contiguous_t0_time_periods.py → ...select/find_contiguous_t0_time_periods.py
diff --git a/...aset_alpha/select/select_spatial_slice.py → ...ta_sampler/select/select_spatial_slice.py b/...aset_alpha/select/select_spatial_slice.py → ...ta_sampler/select/select_spatial_slice.py
diff --git a/...dataset_alpha/select/select_time_slice.py → ocf_data_sampler/select/select_time_slice.py b/...dataset_alpha/select/select_time_slice.py → ocf_data_sampler/select/select_time_slice.py
diff --git a/setup.py b/setup.py
@@ -9,11 +9,11 @@
 install_requires = (this_directory / "requirements.txt").read_text().splitlines()
 
 setup(
-    name="cool_ocf_project",
+    name="ocf_data_sampler",
     version="0.0.1",
     license="MIT",
     description="Super cool OCF Repo",
-    author="Jacob Bieker, Jack Kelly, Peter Dudfield",
+    author="James Fulton, Peter Dudfield, and the Open Climate Fix team",
     author_email="[email protected]",
     company="Open Climate Fix Ltd",
     install_requires=install_requires,

diff --git a/tests/load/test_load_gsp.py b/tests/load/test_load_gsp.py
@@ -1,4 +1,4 @@
-from ocf_dataset_alpha.load.gsp import open_gsp
+from ocf_data_sampler.load.gsp import open_gsp
 import xarray as xr
 
 

diff --git a/tests/load/test_load_nwp.py b/tests/load/test_load_nwp.py
@@ -1,7 +1,7 @@
 import pandas as pd
 from xarray import DataArray
 
-from ocf_dataset_alpha.load.nwp import open_nwp
+from ocf_data_sampler.load.nwp import open_nwp
 
 
 def test_load_ukv(nwp_ukv_zarr_path):

diff --git a/tests/load/test_load_satellite.py b/tests/load/test_load_satellite.py
@@ -1,4 +1,4 @@
-from ocf_dataset_alpha.load.satellite import open_sat_data
+from ocf_data_sampler.load.satellite import open_sat_data
 import xarray as xr
 import numpy as np