Refactor registration-library Python package

EOEPCA · Oct 18, 2024 · c967354 · c967354
1 parent ec9f077
commit c967354
Show file tree

Hide file tree

Showing 27 changed files with 11 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -160,3 +160,6 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+# VSCode
+.vscode/
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,7 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
 [project]
 name = "registration-library"
 version = "0.0.1"
@@ -7,6 +11,7 @@ authors = [
 ]
 description = "Common Library of the Resource Registration Building Block to harvest and register resources"
 readme = "README.md"
+license = {file = "LICENSE"}
 requires-python = ">=3.8"
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -22,7 +27,6 @@ dependencies = [
     "psycopg2-binary",
     "pika"
 ]
-license = {file = "LICENSE"}
 
 [project.optional-dependencies]
 dev = [
@@ -44,21 +48,10 @@ Issues = "https://github.com/EOEPCA/registration-library/issues"
 minversion = "6.0"
 addopts = "-q --import-mode=importlib --no-header -rfE --disable-warnings --log-level=INFO"
 testpaths = [
-    "tests",
+    "test",
     "integration",
 ]
 
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.hatch.metadata]
-allow-direct-references = true
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/registration-library"]
-
-
 [tool.black]
 line-length = 120
 target-version = ["py38"]
diff --git a/src/registration-library/__init__.py → src/registration_library/__init__.py b/src/registration-library/__init__.py → src/registration_library/__init__.py
diff --git a/src/registration-library/base/__init__.py → src/registration_library/base/__init__.py b/src/registration-library/base/__init__.py → src/registration_library/base/__init__.py
diff --git a/src/registration-library/base/download.py → src/registration_library/base/download.py b/src/registration-library/base/download.py → src/registration_library/base/download.py
diff --git a/src/registration-library/base/file.py → src/registration_library/base/file.py b/src/registration-library/base/file.py → src/registration_library/base/file.py
diff --git a/src/registration-library/base/geometry.py → src/registration_library/base/geometry.py b/src/registration-library/base/geometry.py → src/registration_library/base/geometry.py
diff --git a/src/registration-library/base/geoparquet.py → src/registration_library/base/geoparquet.py b/src/registration-library/base/geoparquet.py → src/registration_library/base/geoparquet.py
diff --git a/src/registration-library/base/inventory.py → src/registration_library/base/inventory.py b/src/registration-library/base/inventory.py → src/registration_library/base/inventory.py
diff --git a/src/registration-library/base/order.py → src/registration_library/base/order.py b/src/registration-library/base/order.py → src/registration_library/base/order.py
diff --git a/...registration-library/datasets/__init__.py → ...registration_library/datasets/__init__.py b/...registration-library/datasets/__init__.py → ...registration_library/datasets/__init__.py
diff --git a/src/registration-library/datasets/landsat.py → src/registration_library/datasets/landsat.py b/src/registration-library/datasets/landsat.py → src/registration_library/datasets/landsat.py
diff --git a/...tration-library/datasets/modis.preview.py → ...tration_library/datasets/modis.preview.py b/...tration-library/datasets/modis.preview.py → ...tration_library/datasets/modis.preview.py
diff --git a/src/registration-library/datasets/modis.py → src/registration_library/datasets/modis.py b/src/registration-library/datasets/modis.py → src/registration_library/datasets/modis.py
diff --git a/...registration-library/datasets/sentinel.py → ...registration_library/datasets/sentinel.py b/...registration-library/datasets/sentinel.py → ...registration_library/datasets/sentinel.py
diff --git a/src/registration-library/datasets/viirs.py → src/registration_library/datasets/viirs.py b/src/registration-library/datasets/viirs.py → src/registration_library/datasets/viirs.py
diff --git a/...egistration-library/providers/__init__.py → ...egistration_library/providers/__init__.py b/...egistration-library/providers/__init__.py → ...egistration_library/providers/__init__.py
diff --git a/...egistration-library/providers/esa_cdse.py → ...egistration_library/providers/esa_cdse.py b/...egistration-library/providers/esa_cdse.py → ...egistration_library/providers/esa_cdse.py
diff --git a/...egistration-library/providers/nasa_cmr.py → ...egistration_library/providers/nasa_cmr.py b/...egistration-library/providers/nasa_cmr.py → ...egistration_library/providers/nasa_cmr.py
diff --git a/...gistration-library/providers/nasa_daac.py → ...gistration_library/providers/nasa_daac.py b/...gistration-library/providers/nasa_daac.py → ...gistration_library/providers/nasa_daac.py
diff --git a/...egistration-library/providers/usgs_m2m.py → ...egistration_library/providers/usgs_m2m.py b/...egistration-library/providers/usgs_m2m.py → ...egistration_library/providers/usgs_m2m.py
diff --git a/...egistration-library/resources/__init__.py → ...egistration_library/resources/__init__.py b/...egistration-library/resources/__init__.py → ...egistration_library/resources/__init__.py
diff --git a/src/registration-library/resources/pgstac.py → src/registration_library/resources/pgstac.py b/src/registration-library/resources/pgstac.py → src/registration_library/resources/pgstac.py
diff --git a/src/registration-library/resources/stac.py → src/registration_library/resources/stac.py b/src/registration-library/resources/stac.py → src/registration_library/resources/stac.py
diff --git a/...tion-library/resources/stac_geoparquet.py → ...tion_library/resources/stac_geoparquet.py b/...tion-library/resources/stac_geoparquet.py → ...tion_library/resources/stac_geoparquet.py
diff --git a/tests/base/test_download.py b/tests/base/test_download.py
@@ -4,8 +4,7 @@
 import pytest
 
 import requests
-from lib.base.download import access_token
-
+from registration_library.base.download import access_token
 
 # Test if the function returns the existing token if it is not expired
 def test_access_token_existing_valid_token(monkeypatch):

diff --git a/tests/base/test_file.py b/tests/base/test_file.py
@@ -7,7 +7,7 @@
 
 import pytest
 import zipfile
-from lib.base.file import (
+from registration_library.base.file import (
     zip_directory,
     delete_file,
     unzip_file,