Skip to content

Commit

Permalink
Issue #112/#117 remove now unused conf/backend_config.py
Browse files Browse the repository at this point in the history
  • Loading branch information
soxofaan committed Mar 1, 2024
1 parent aac1c91 commit 3a1381e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 40 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

The format is roughly based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [0.26.0]

- Remove now unused `conf/backend_config.py` ([#112](https://github.com/Open-EO/openeo-aggregator/issues/112), [#117](https://github.com/Open-EO/openeo-aggregator/issues/117))

## [0.25.0]

- Add `AggregatorBackendConfig.memoizer` and deprecate `AggregatorConfig.memoizer` ([#112](https://github.com/Open-EO/openeo-aggregator/issues/112))
Expand Down
12 changes: 0 additions & 12 deletions conf/backend_config.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/openeo_aggregator/about.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import sys
from typing import Optional

__version__ = "0.25.0a1"
__version__ = "0.26.0a1"


def log_version_info(logger: Optional[logging.Logger] = None):
Expand Down
3 changes: 0 additions & 3 deletions src/openeo_aggregator/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ def create_app(config: Any = None, auto_logging_setup: bool = True, flask_error_

log_version_info(logger=_log)

# TODO #112 move this default to the AggregatorBackendConfig getter (get_backend_config)
os.environ.setdefault(ConfigGetter.OPENEO_BACKEND_CONFIG, str(get_config_dir() / "backend_config.py"))

config: AggregatorConfig = get_config(config)
_log.info(f"Using config: {config.config_source=!r}")

Expand Down
24 changes: 0 additions & 24 deletions tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,30 +135,6 @@ def test_health_check_invalid_backend(self, api100, requests_mock, backend1, bac
}


class TestGeneralRealConfig:
"""Some temporary test against real config (that is going to be moved out of this repo at some point)"""

@pytest.fixture(autouse=True)
def real_config(self, monkeypatch):
openeo_driver.config.load._backend_config_getter.flush()
monkeypatch.setenv(
openeo_driver.config.load.ConfigGetter.OPENEO_BACKEND_CONFIG,
str(get_config_dir() / "backend_config.py"),
)
yield
openeo_driver.config.load._backend_config_getter.flush()

def test_title_and_description(self, api100):
res = api100.get("/").assert_status_code(200)
capabilities = res.json
assert capabilities["title"] == "openEO Platform"
assert capabilities["description"] == "openEO Platform, provided through openEO Aggregator Driver"

def test_only_oidc_auth(self, api100):
res = api100.get("/").assert_status_code(200)
capabilities = res.json
endpoints = {e["path"] for e in capabilities["endpoints"]}
assert {e for e in endpoints if e.startswith("/credentials")} == {"/credentials/oidc"}


class TestCatalog:
Expand Down

0 comments on commit 3a1381e

Please sign in to comment.