From 3800a028f78ac2aa18378a0e879f6e8b7c8d9e04 Mon Sep 17 00:00:00 2001 From: Davis Vann Bennett Date: Fri, 8 Aug 2025 10:27:55 +0200 Subject: [PATCH 1/3] use src layout --- pyproject.toml | 2 +- {eopf_geozarr => src/eopf_geozarr}/__init__.py | 0 {eopf_geozarr => src/eopf_geozarr}/__main__.py | 0 {eopf_geozarr => src/eopf_geozarr}/cli.py | 0 {eopf_geozarr => src/eopf_geozarr}/conversion/__init__.py | 0 {eopf_geozarr => src/eopf_geozarr}/conversion/fs_utils.py | 0 {eopf_geozarr => src/eopf_geozarr}/conversion/geozarr.py | 0 {eopf_geozarr => src/eopf_geozarr}/conversion/utils.py | 0 {eopf_geozarr => src/eopf_geozarr}/data_api/__init__.py | 0 {eopf_geozarr/tests => tests}/__init__.py | 0 {eopf_geozarr/tests => tests}/test_cli_e2e.py | 0 {eopf_geozarr/tests => tests}/test_conversion.py | 0 {eopf_geozarr/tests => tests}/test_fs_utils.py | 0 {eopf_geozarr/tests => tests}/test_integration_sentinel2.py | 0 14 files changed, 1 insertion(+), 1 deletion(-) rename {eopf_geozarr => src/eopf_geozarr}/__init__.py (100%) rename {eopf_geozarr => src/eopf_geozarr}/__main__.py (100%) rename {eopf_geozarr => src/eopf_geozarr}/cli.py (100%) rename {eopf_geozarr => src/eopf_geozarr}/conversion/__init__.py (100%) rename {eopf_geozarr => src/eopf_geozarr}/conversion/fs_utils.py (100%) rename {eopf_geozarr => src/eopf_geozarr}/conversion/geozarr.py (100%) rename {eopf_geozarr => src/eopf_geozarr}/conversion/utils.py (100%) rename {eopf_geozarr => src/eopf_geozarr}/data_api/__init__.py (100%) rename {eopf_geozarr/tests => tests}/__init__.py (100%) rename {eopf_geozarr/tests => tests}/test_cli_e2e.py (100%) rename {eopf_geozarr/tests => tests}/test_conversion.py (100%) rename {eopf_geozarr/tests => tests}/test_fs_utils.py (100%) rename {eopf_geozarr/tests => tests}/test_integration_sentinel2.py (100%) diff --git a/pyproject.toml b/pyproject.toml index 9acd1b7..75fc308 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -82,7 +82,7 @@ Documentation = "https://github.com/developmentseed/eopf-geozarr/tree/main/docs" eopf-geozarr = "eopf_geozarr.cli:main" [tool.setuptools.packages.find] -where = ["."] +where = ["src"] include = ["eopf_geozarr*"] [tool.setuptools.package-data] diff --git a/eopf_geozarr/__init__.py b/src/eopf_geozarr/__init__.py similarity index 100% rename from eopf_geozarr/__init__.py rename to src/eopf_geozarr/__init__.py diff --git a/eopf_geozarr/__main__.py b/src/eopf_geozarr/__main__.py similarity index 100% rename from eopf_geozarr/__main__.py rename to src/eopf_geozarr/__main__.py diff --git a/eopf_geozarr/cli.py b/src/eopf_geozarr/cli.py similarity index 100% rename from eopf_geozarr/cli.py rename to src/eopf_geozarr/cli.py diff --git a/eopf_geozarr/conversion/__init__.py b/src/eopf_geozarr/conversion/__init__.py similarity index 100% rename from eopf_geozarr/conversion/__init__.py rename to src/eopf_geozarr/conversion/__init__.py diff --git a/eopf_geozarr/conversion/fs_utils.py b/src/eopf_geozarr/conversion/fs_utils.py similarity index 100% rename from eopf_geozarr/conversion/fs_utils.py rename to src/eopf_geozarr/conversion/fs_utils.py diff --git a/eopf_geozarr/conversion/geozarr.py b/src/eopf_geozarr/conversion/geozarr.py similarity index 100% rename from eopf_geozarr/conversion/geozarr.py rename to src/eopf_geozarr/conversion/geozarr.py diff --git a/eopf_geozarr/conversion/utils.py b/src/eopf_geozarr/conversion/utils.py similarity index 100% rename from eopf_geozarr/conversion/utils.py rename to src/eopf_geozarr/conversion/utils.py diff --git a/eopf_geozarr/data_api/__init__.py b/src/eopf_geozarr/data_api/__init__.py similarity index 100% rename from eopf_geozarr/data_api/__init__.py rename to src/eopf_geozarr/data_api/__init__.py diff --git a/eopf_geozarr/tests/__init__.py b/tests/__init__.py similarity index 100% rename from eopf_geozarr/tests/__init__.py rename to tests/__init__.py diff --git a/eopf_geozarr/tests/test_cli_e2e.py b/tests/test_cli_e2e.py similarity index 100% rename from eopf_geozarr/tests/test_cli_e2e.py rename to tests/test_cli_e2e.py diff --git a/eopf_geozarr/tests/test_conversion.py b/tests/test_conversion.py similarity index 100% rename from eopf_geozarr/tests/test_conversion.py rename to tests/test_conversion.py diff --git a/eopf_geozarr/tests/test_fs_utils.py b/tests/test_fs_utils.py similarity index 100% rename from eopf_geozarr/tests/test_fs_utils.py rename to tests/test_fs_utils.py diff --git a/eopf_geozarr/tests/test_integration_sentinel2.py b/tests/test_integration_sentinel2.py similarity index 100% rename from eopf_geozarr/tests/test_integration_sentinel2.py rename to tests/test_integration_sentinel2.py From 6343212d038d390c33fbf943c995114cde2fbacf Mon Sep 17 00:00:00 2001 From: Davis Vann Bennett Date: Fri, 8 Aug 2025 10:39:29 +0200 Subject: [PATCH 2/3] update coverage section of pyproject.toml --- pyproject.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 75fc308..8950623 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -153,10 +153,9 @@ markers = [ ] [tool.coverage.run] -source = ["."] +source = ["src"] omit = [ - "*/tests/*", - "*/test_*", + "tests/*", "setup.py", ] From 05609f9aa5c51549a3166fc1d9c81d4ca4e4665c Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Wed, 13 Aug 2025 23:02:18 +0200 Subject: [PATCH 3/3] Fix test paths in CI workflow for consistency --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8f8dbc..cd4da64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,7 @@ jobs: - name: Run tests run: | - uv run pytest eopf_geozarr/tests/ -v --tb=short -m "not network" --cov=eopf_geozarr --cov-report=xml --cov-report=term-missing + uv run pytest tests/ -v --tb=short -m "not network" --cov=eopf_geozarr --cov-report=xml --cov-report=term-missing - name: Upload coverage to Codecov if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' @@ -105,7 +105,7 @@ jobs: - name: Run network tests run: | - uv run pytest eopf_geozarr/tests/ -v --tb=short -m "network" + uv run pytest tests/ -v --tb=short -m "network" security: runs-on: ubuntu-latest