From c298cc7796dd13c019e8eb27e42d06fd3f18de64 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Wed, 4 Dec 2024 10:30:03 +0000 Subject: [PATCH 01/19] Merging in the extra metadata. --- esgf_playground_utils/models/kafka.py | 40 ++++++++++++--------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/esgf_playground_utils/models/kafka.py b/esgf_playground_utils/models/kafka.py index 087124e..8ac29a1 100644 --- a/esgf_playground_utils/models/kafka.py +++ b/esgf_playground_utils/models/kafka.py @@ -87,28 +87,31 @@ class Data(BaseModel): payload: Union[CreatePayload, RevokePayload, UpdatePayload, PartialUpdatePayload] -class Auth(BaseModel): +class RequesterData(BaseModel): """ - Model describing the ``AUTH`` component of a Kafka message. - - .. note:: - - This is not an authorisation token or other verified identity. It is the simply an indication of the institute - providing the message. + Model describing ``Requests Data`` for the ``Auth`` component of a Kafka message in more detail. """ - client_id: str - server: str + auth_service: str + sub: str + user_id: str + identity_provider: str + identity_provider_display_name: str -class AuthData(BaseModel): +class Auth(BaseModel): """ Model describing ``Auth`` component of a Kafka message in more detail. + + .. note:: + + This is not an authorisation token or other verified identity. It is the simply an indication of the institute + providing the message. """ auth_policy_id: str client_id: str - requester_data: Dict[str, str] + requester_data: RequesterData class Publisher(BaseModel): @@ -126,28 +129,21 @@ class Metadata(BaseModel): Multiple metadata attributes required for ESGF but not part of the STAC payload. """ - auth: Union[Auth, AuthData] + event_id: str + request_id: str + auth: Auth publisher: Publisher time: datetime schema_version: str -class ExtendedMetadata(Metadata): - """ - An extension of the Metadata Model for Publish Events. - """ - - event_id: str - request_id: str - - class KafkaEvent(BaseModel): """ The full content of a Kafka message, containing both the STAC payload, the request description and the ESGF mandated metadata. """ - metadata: Union[Metadata, ExtendedMetadata] + metadata: Metadata data: Data From 01968b42f1d440ed3bfcc43a8727086d972bb3c1 Mon Sep 17 00:00:00 2001 From: rhysrevans3 <34507919+rhysrevans3@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:31:41 +0000 Subject: [PATCH 02/19] Merging Kafka metadata. --- esgf_playground_utils/models/kafka.py | 40 ++++++++++++--------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/esgf_playground_utils/models/kafka.py b/esgf_playground_utils/models/kafka.py index 087124e..8ac29a1 100644 --- a/esgf_playground_utils/models/kafka.py +++ b/esgf_playground_utils/models/kafka.py @@ -87,28 +87,31 @@ class Data(BaseModel): payload: Union[CreatePayload, RevokePayload, UpdatePayload, PartialUpdatePayload] -class Auth(BaseModel): +class RequesterData(BaseModel): """ - Model describing the ``AUTH`` component of a Kafka message. - - .. note:: - - This is not an authorisation token or other verified identity. It is the simply an indication of the institute - providing the message. + Model describing ``Requests Data`` for the ``Auth`` component of a Kafka message in more detail. """ - client_id: str - server: str + auth_service: str + sub: str + user_id: str + identity_provider: str + identity_provider_display_name: str -class AuthData(BaseModel): +class Auth(BaseModel): """ Model describing ``Auth`` component of a Kafka message in more detail. + + .. note:: + + This is not an authorisation token or other verified identity. It is the simply an indication of the institute + providing the message. """ auth_policy_id: str client_id: str - requester_data: Dict[str, str] + requester_data: RequesterData class Publisher(BaseModel): @@ -126,28 +129,21 @@ class Metadata(BaseModel): Multiple metadata attributes required for ESGF but not part of the STAC payload. """ - auth: Union[Auth, AuthData] + event_id: str + request_id: str + auth: Auth publisher: Publisher time: datetime schema_version: str -class ExtendedMetadata(Metadata): - """ - An extension of the Metadata Model for Publish Events. - """ - - event_id: str - request_id: str - - class KafkaEvent(BaseModel): """ The full content of a Kafka message, containing both the STAC payload, the request description and the ESGF mandated metadata. """ - metadata: Union[Metadata, ExtendedMetadata] + metadata: Metadata data: Data From 9b01a338f8a55b073214a5d2f069666252c01d7b Mon Sep 17 00:00:00 2001 From: rhysrevans3 <34507919+rhysrevans3@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:44:19 +0000 Subject: [PATCH 03/19] Update test data. --- test/functional_test/__init__.py | 105 ++++++++++++++++++++++--------- 1 file changed, 75 insertions(+), 30 deletions(-) diff --git a/test/functional_test/__init__.py b/test/functional_test/__init__.py index a5448a0..3860f55 100644 --- a/test/functional_test/__init__.py +++ b/test/functional_test/__init__.py @@ -149,16 +149,25 @@ def test_create_payload_valid(self) -> None: } }, "metadata": { + "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", + "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "client_id": "", - "server": "" + "auth_policy_id": "ESGF-Publish-00012", # We need registered auth policies? + "client_id": "CEDA-transaction-client", + "requester_data": { + "auth_service": "auth.globus.org", + "sub": "b16b12b6-d274-11e5-8e41-5fea585a1aa2", + "user_id": "7fd9ab20-f6c5-4902-a7ac-b40bc4d8ad7b", + "identity_provider": "0dcf5063-bffd-40f7-b403-24f97e32fa47", + "identity_provider_display_name": "University of Chicago" + } }, "publisher": { - "package": "some_python_package", - "version": "0.3.0" + "package": "some_python_package", + "version": "0.3.0" }, - "time": "2022-01-20T00:00:00Z", - "schema_version": "1.0.0" + "time": "2024-07-04T14:17:35Z", + "schema_version": "1.0.0", } } """ @@ -299,16 +308,25 @@ def test_create_payload_invalid(self) -> None: } }, "metadata": { + "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", + "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "client_id": "", - "server": "" + "auth_policy_id": "ESGF-Publish-00012", # We need registered auth policies? + "client_id": "CEDA-transaction-client", + "requester_data": { + "auth_service": "auth.globus.org", + "sub": "b16b12b6-d274-11e5-8e41-5fea585a1aa2", + "user_id": "7fd9ab20-f6c5-4902-a7ac-b40bc4d8ad7b", + "identity_provider": "0dcf5063-bffd-40f7-b403-24f97e32fa47", + "identity_provider_display_name": "University of Chicago" + } }, "publisher": { - "package": "some_python_package", - "version": "0.3.0" + "package": "some_python_package", + "version": "0.3.0" }, - "time": "2022-01-20T00:00:00Z", - "schema_version": "1.0.0" + "time": "2024-07-04T14:17:35Z", + "schema_version": "1.0.0", } } """ @@ -329,16 +347,25 @@ def test_revoke_payload_soft(self) -> None: } }, "metadata": { + "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", + "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "client_id": "", - "server": "" + "auth_policy_id": "ESGF-Publish-00012", # We need registered auth policies? + "client_id": "CEDA-transaction-client", + "requester_data": { + "auth_service": "auth.globus.org", + "sub": "b16b12b6-d274-11e5-8e41-5fea585a1aa2", + "user_id": "7fd9ab20-f6c5-4902-a7ac-b40bc4d8ad7b", + "identity_provider": "0dcf5063-bffd-40f7-b403-24f97e32fa47", + "identity_provider_display_name": "University of Chicago" + } }, "publisher": { - "package": "some_python_package", - "version": "0.3.0" + "package": "some_python_package", + "version": "0.3.0" }, - "time": "2022-01-20T00:00:00Z", - "schema_version": "1.0.0" + "time": "2024-07-04T14:17:35Z", + "schema_version": "1.0.0", } } """ @@ -360,16 +387,25 @@ def test_revoke_payload_hard(self) -> None: } }, "metadata": { + "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", + "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "client_id": "", - "server": "" + "auth_policy_id": "ESGF-Publish-00012", # We need registered auth policies? + "client_id": "CEDA-transaction-client", + "requester_data": { + "auth_service": "auth.globus.org", + "sub": "b16b12b6-d274-11e5-8e41-5fea585a1aa2", + "user_id": "7fd9ab20-f6c5-4902-a7ac-b40bc4d8ad7b", + "identity_provider": "0dcf5063-bffd-40f7-b403-24f97e32fa47", + "identity_provider_display_name": "University of Chicago" + } }, "publisher": { - "package": "some_python_package", - "version": "0.3.0" + "package": "some_python_package", + "version": "0.3.0" }, - "time": "2022-01-20T00:00:00Z", - "schema_version": "1.0.0" + "time": "2024-07-04T14:17:35Z", + "schema_version": "1.0.0", } } """ @@ -511,16 +547,25 @@ def test_update_payload_full(self) -> None: } }, "metadata": { + "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", + "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "client_id": "", - "server": "" + "auth_policy_id": "ESGF-Publish-00012", # We need registered auth policies? + "client_id": "CEDA-transaction-client", + "requester_data": { + "auth_service": "auth.globus.org", + "sub": "b16b12b6-d274-11e5-8e41-5fea585a1aa2", + "user_id": "7fd9ab20-f6c5-4902-a7ac-b40bc4d8ad7b", + "identity_provider": "0dcf5063-bffd-40f7-b403-24f97e32fa47", + "identity_provider_display_name": "University of Chicago" + } }, "publisher": { - "package": "some_python_package", - "version": "0.3.0" + "package": "some_python_package", + "version": "0.3.0" }, - "time": "2022-01-20T00:00:00Z", - "schema_version": "1.0.0" + "time": "2024-07-04T14:17:35Z", + "schema_version": "1.0.0", } } """ From d334ea6f719346036630002bdc2d79ef59348804 Mon Sep 17 00:00:00 2001 From: rhysrevans3 <34507919+rhysrevans3@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:48:29 +0000 Subject: [PATCH 04/19] Removing trailing ",". --- test/functional_test/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/functional_test/__init__.py b/test/functional_test/__init__.py index 3860f55..6e22ab0 100644 --- a/test/functional_test/__init__.py +++ b/test/functional_test/__init__.py @@ -167,7 +167,7 @@ def test_create_payload_valid(self) -> None: "version": "0.3.0" }, "time": "2024-07-04T14:17:35Z", - "schema_version": "1.0.0", + "schema_version": "1.0.0" } } """ @@ -326,7 +326,7 @@ def test_create_payload_invalid(self) -> None: "version": "0.3.0" }, "time": "2024-07-04T14:17:35Z", - "schema_version": "1.0.0", + "schema_version": "1.0.0" } } """ @@ -365,7 +365,7 @@ def test_revoke_payload_soft(self) -> None: "version": "0.3.0" }, "time": "2024-07-04T14:17:35Z", - "schema_version": "1.0.0", + "schema_version": "1.0.0" } } """ @@ -405,7 +405,7 @@ def test_revoke_payload_hard(self) -> None: "version": "0.3.0" }, "time": "2024-07-04T14:17:35Z", - "schema_version": "1.0.0", + "schema_version": "1.0.0" } } """ @@ -565,7 +565,7 @@ def test_update_payload_full(self) -> None: "version": "0.3.0" }, "time": "2024-07-04T14:17:35Z", - "schema_version": "1.0.0", + "schema_version": "1.0.0" } } """ From a2f2573521afa7892bc5c04745d7c2896bca0166 Mon Sep 17 00:00:00 2001 From: rhysrevans3 <34507919+rhysrevans3@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:56:56 +0000 Subject: [PATCH 05/19] Removing bad comment. --- test/functional_test/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/functional_test/__init__.py b/test/functional_test/__init__.py index 6e22ab0..b96aee5 100644 --- a/test/functional_test/__init__.py +++ b/test/functional_test/__init__.py @@ -152,7 +152,7 @@ def test_create_payload_valid(self) -> None: "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "auth_policy_id": "ESGF-Publish-00012", # We need registered auth policies? + "auth_policy_id": "ESGF-Publish-00012", "client_id": "CEDA-transaction-client", "requester_data": { "auth_service": "auth.globus.org", @@ -311,7 +311,7 @@ def test_create_payload_invalid(self) -> None: "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "auth_policy_id": "ESGF-Publish-00012", # We need registered auth policies? + "auth_policy_id": "ESGF-Publish-00012", "client_id": "CEDA-transaction-client", "requester_data": { "auth_service": "auth.globus.org", @@ -350,7 +350,7 @@ def test_revoke_payload_soft(self) -> None: "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "auth_policy_id": "ESGF-Publish-00012", # We need registered auth policies? + "auth_policy_id": "ESGF-Publish-00012", "client_id": "CEDA-transaction-client", "requester_data": { "auth_service": "auth.globus.org", @@ -390,7 +390,7 @@ def test_revoke_payload_hard(self) -> None: "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "auth_policy_id": "ESGF-Publish-00012", # We need registered auth policies? + "auth_policy_id": "ESGF-Publish-00012", "client_id": "CEDA-transaction-client", "requester_data": { "auth_service": "auth.globus.org", @@ -550,7 +550,7 @@ def test_update_payload_full(self) -> None: "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "auth_policy_id": "ESGF-Publish-00012", # We need registered auth policies? + "auth_policy_id": "ESGF-Publish-00012", "client_id": "CEDA-transaction-client", "requester_data": { "auth_service": "auth.globus.org", From 635e524d00bdf4239823b97dd21154b44d655fb4 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Tue, 10 Dec 2024 09:05:56 +0000 Subject: [PATCH 06/19] Switching from auth_service to iss. Removing redundent user_id. --- esgf_playground_utils/models/kafka.py | 3 +- test/functional_test/__init__.py | 92 +++++++++++++++++++-------- 2 files changed, 67 insertions(+), 28 deletions(-) diff --git a/esgf_playground_utils/models/kafka.py b/esgf_playground_utils/models/kafka.py index 8ac29a1..9475773 100644 --- a/esgf_playground_utils/models/kafka.py +++ b/esgf_playground_utils/models/kafka.py @@ -92,9 +92,8 @@ class RequesterData(BaseModel): Model describing ``Requests Data`` for the ``Auth`` component of a Kafka message in more detail. """ - auth_service: str + iss: str sub: str - user_id: str identity_provider: str identity_provider_display_name: str diff --git a/test/functional_test/__init__.py b/test/functional_test/__init__.py index a5448a0..b1c0e13 100644 --- a/test/functional_test/__init__.py +++ b/test/functional_test/__init__.py @@ -149,15 +149,23 @@ def test_create_payload_valid(self) -> None: } }, "metadata": { + "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", + "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "client_id": "", - "server": "" + "auth_policy_id": "ESGF-Publish-00012", + "client_id": "CEDA-transaction-client", + "requester_data": { + "iss": "auth.globus.org", + "sub": "b16b12b6-d274-11e5-8e41-5fea585a1aa2", + "identity_provider": "0dcf5063-bffd-40f7-b403-24f97e32fa47", + "identity_provider_display_name": "University of Chicago" + } }, "publisher": { - "package": "some_python_package", - "version": "0.3.0" + "package": "some_python_package", + "version": "0.3.0" }, - "time": "2022-01-20T00:00:00Z", + "time": "2024-07-04T14:17:35Z", "schema_version": "1.0.0" } } @@ -299,15 +307,23 @@ def test_create_payload_invalid(self) -> None: } }, "metadata": { + "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", + "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "client_id": "", - "server": "" + "auth_policy_id": "ESGF-Publish-00012", + "client_id": "CEDA-transaction-client", + "requester_data": { + "iss": "auth.globus.org", + "sub": "b16b12b6-d274-11e5-8e41-5fea585a1aa2", + "identity_provider": "0dcf5063-bffd-40f7-b403-24f97e32fa47", + "identity_provider_display_name": "University of Chicago" + } }, "publisher": { - "package": "some_python_package", - "version": "0.3.0" + "package": "some_python_package", + "version": "0.3.0" }, - "time": "2022-01-20T00:00:00Z", + "time": "2024-07-04T14:17:35Z", "schema_version": "1.0.0" } } @@ -325,19 +341,27 @@ def test_revoke_payload_soft(self) -> None: "payload": { "collection_id": "cmip6", "method": "PATCH", - "item_id": "an_item" + "item_id": "an_item" } }, "metadata": { + "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", + "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "client_id": "", - "server": "" + "auth_policy_id": "ESGF-Publish-00012", + "client_id": "CEDA-transaction-client", + "requester_data": { + "iss": "auth.globus.org", + "sub": "b16b12b6-d274-11e5-8e41-5fea585a1aa2", + "identity_provider": "0dcf5063-bffd-40f7-b403-24f97e32fa47", + "identity_provider_display_name": "University of Chicago" + } }, "publisher": { - "package": "some_python_package", - "version": "0.3.0" + "package": "some_python_package", + "version": "0.3.0" }, - "time": "2022-01-20T00:00:00Z", + "time": "2024-07-04T14:17:35Z", "schema_version": "1.0.0" } } @@ -360,15 +384,23 @@ def test_revoke_payload_hard(self) -> None: } }, "metadata": { + "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", + "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "client_id": "", - "server": "" + "auth_policy_id": "ESGF-Publish-00012", + "client_id": "CEDA-transaction-client", + "requester_data": { + "iss": "auth.globus.org", + "sub": "b16b12b6-d274-11e5-8e41-5fea585a1aa2", + "identity_provider": "0dcf5063-bffd-40f7-b403-24f97e32fa47", + "identity_provider_display_name": "University of Chicago" + } }, "publisher": { - "package": "some_python_package", - "version": "0.3.0" + "package": "some_python_package", + "version": "0.3.0" }, - "time": "2022-01-20T00:00:00Z", + "time": "2024-07-04T14:17:35Z", "schema_version": "1.0.0" } } @@ -511,15 +543,23 @@ def test_update_payload_full(self) -> None: } }, "metadata": { + "event_id": "3a8a2536-323b-4259-a218-6002a3491d25", + "request_id": "dee8c54c-e815-4863-87fb-7b606efd2501", "auth": { - "client_id": "", - "server": "" + "auth_policy_id": "ESGF-Publish-00012", + "client_id": "CEDA-transaction-client", + "requester_data": { + "iss": "auth.globus.org", + "sub": "b16b12b6-d274-11e5-8e41-5fea585a1aa2", + "identity_provider": "0dcf5063-bffd-40f7-b403-24f97e32fa47", + "identity_provider_display_name": "University of Chicago" + } }, "publisher": { - "package": "some_python_package", - "version": "0.3.0" + "package": "some_python_package", + "version": "0.3.0" }, - "time": "2022-01-20T00:00:00Z", + "time": "2024-07-04T14:17:35Z", "schema_version": "1.0.0" } } From dde5bcef3feeae646765ab92ef78b6097546ab15 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Tue, 7 Jan 2025 14:27:11 +0000 Subject: [PATCH 07/19] Adding optional sasl config. --- esgf_playground_utils/config/kafka.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/esgf_playground_utils/config/kafka.py b/esgf_playground_utils/config/kafka.py index 53ec51b..86e0b66 100644 --- a/esgf_playground_utils/config/kafka.py +++ b/esgf_playground_utils/config/kafka.py @@ -24,5 +24,7 @@ class Settings(BaseSettings): bootstrap_servers: List[str] = ["localhost"] consumer_group: Optional[str] = None kafka_topics: Pattern[str] = compile(r".*\..*\..*") - error_topic: str = "esgf_consumer_error" + sasl_mechanism: str = "PLAIN" + sasl_plain_username: Optional[str] = None + sasl_plain_password: Optional[str] = None stac_server: HttpUrl = HttpUrl("http://localhost:9010") From 044e201c54ac0fd40da20b457542c1524f466493 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Tue, 7 Jan 2025 14:54:15 +0000 Subject: [PATCH 08/19] Updating toml for quality check. --- pyproject.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index a8b5722..4d26be6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,8 @@ +[project] +name = "esgf-playground-utils" +description = "Common library and models for the ESGF-Playground" +dynamic = ["version", "readme"] + [tool.poetry] name = "esgf-playground-utils" version = "0.3.8" From 96a967dfd78637e6d6050ebfce89990eda598817 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Tue, 7 Jan 2025 15:07:21 +0000 Subject: [PATCH 09/19] Removing poetry.tools for project. --- pyproject.toml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4d26be6..692dc56 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,18 +1,17 @@ [project] name = "esgf-playground-utils" -description = "Common library and models for the ESGF-Playground" -dynamic = ["version", "readme"] - -[tool.poetry] -name = "esgf-playground-utils" version = "0.3.8" description = "Common library and models for the ESGF-Playground" +readme = "README.rst" +dynamic = [ + "dependencies", + "requires-python" +] authors = [ - "David Poulter ", - "Rhys Evans ", - "Ed Borthwick ", + {name = "David Poulter", email = "david.poulter@stfc.ac.uk"}, + {name = "Rhys Evans", email = "rhys.r.evans@stfc.ac.uk"}, + {name = "Ed Borthwick", email = "ed.borthwick@stfc.ac.uk"}, ] -readme = "README.rst" [tool.poetry.dependencies] python = ">=3.9" From 92dcbec29575f57fc4c15db9642f9b5f4bd27793 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Tue, 7 Jan 2025 15:37:38 +0000 Subject: [PATCH 10/19] Pinning poetry version. --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index bd36cb0..d868c47 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Poetry run: | - pipx install poetry + pipx install poetry==1.8.5 - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} From 5a899f32cb98d0969eff9763780a5232ac91a9e7 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Tue, 7 Jan 2025 15:39:16 +0000 Subject: [PATCH 11/19] Reverting poetry 2.0.0 changes. --- pyproject.toml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 692dc56..9825d07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,16 +1,12 @@ -[project] +[tool.poetry] name = "esgf-playground-utils" version = "0.3.8" description = "Common library and models for the ESGF-Playground" readme = "README.rst" -dynamic = [ - "dependencies", - "requires-python" -] authors = [ - {name = "David Poulter", email = "david.poulter@stfc.ac.uk"}, - {name = "Rhys Evans", email = "rhys.r.evans@stfc.ac.uk"}, - {name = "Ed Borthwick", email = "ed.borthwick@stfc.ac.uk"}, + "David Poulter ", + "Rhys Evans ", + "Ed Borthwick ", ] [tool.poetry.dependencies] From 1e34031d0c6b6919f09cc72df8463877b4bd100c Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Tue, 7 Jan 2025 15:41:48 +0000 Subject: [PATCH 12/19] pinning all poetry versions. --- .github/workflows/check.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/sphinx.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index d868c47..c4cba6a 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Poetry run: | - pipx install poetry + pipx install poetry==1.8.5 - uses: actions/setup-python@v5 with: python-version: "3.12" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d99285f..6b5c481 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,7 +21,7 @@ jobs: python-version: "3.12" - name: Install dependencies run: | - pipx install poetry + pipx install poetry==1.8.5 - name: Build package run: | poetry build diff --git a/.github/workflows/sphinx.yaml b/.github/workflows/sphinx.yaml index 8ca09f0..433e63b 100644 --- a/.github/workflows/sphinx.yaml +++ b/.github/workflows/sphinx.yaml @@ -40,7 +40,7 @@ jobs: python-version: "3.12" - name: Install Poetry run: | - pipx install poetry + pipx install poetry==1.8.5 - name: Install dependencies run: poetry install --with docs - name: Setup Pages From 2fd273f2ce3fed9ea53f5fb67e0267b9ed49f839 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Wed, 8 Jan 2025 11:28:56 +0000 Subject: [PATCH 13/19] Adding new version number. --- .github/workflows/check.yml | 4 ++-- .github/workflows/publish.yml | 2 +- .github/workflows/sphinx.yaml | 2 +- pyproject.toml | 11 ++++++----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index c4cba6a..2ec1c45 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Poetry run: | - pipx install poetry==1.8.5 + pipx install poetry<2.0.0 - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Poetry run: | - pipx install poetry==1.8.5 + pipx install poetry<2.0.0 - uses: actions/setup-python@v5 with: python-version: "3.12" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6b5c481..2b48942 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,7 +21,7 @@ jobs: python-version: "3.12" - name: Install dependencies run: | - pipx install poetry==1.8.5 + pipx install poetry<2.0.0 - name: Build package run: | poetry build diff --git a/.github/workflows/sphinx.yaml b/.github/workflows/sphinx.yaml index 433e63b..aba8111 100644 --- a/.github/workflows/sphinx.yaml +++ b/.github/workflows/sphinx.yaml @@ -40,7 +40,7 @@ jobs: python-version: "3.12" - name: Install Poetry run: | - pipx install poetry==1.8.5 + pipx install poetry<2.0.0 - name: Install dependencies run: poetry install --with docs - name: Setup Pages diff --git a/pyproject.toml b/pyproject.toml index 9825d07..6553b74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,13 +1,14 @@ -[tool.poetry] +[project] name = "esgf-playground-utils" -version = "0.3.8" +version = "0.4.0" description = "Common library and models for the ESGF-Playground" readme = "README.rst" authors = [ - "David Poulter ", - "Rhys Evans ", - "Ed Borthwick ", + {name = "David Poulter", email = "david.poulter@stfc.ac.uk"}, + {name = "Rhys Evans", email = "rhys.r.evans@stfc.ac.uk"}, + {name = "Ed Borthwick", email = "ed.borthwick@stfc.ac.uk"}, ] +dynamic = ["dependencies"] [tool.poetry.dependencies] python = ">=3.9" From 1aac61e1baaa40565488b9cf055b7282c1de76ac Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Wed, 8 Jan 2025 11:33:25 +0000 Subject: [PATCH 14/19] poetry version. --- .github/workflows/check.yml | 4 ++-- .github/workflows/publish.yml | 2 +- .github/workflows/sphinx.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 2ec1c45..5e5c806 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Poetry run: | - pipx install poetry<2.0.0 + pipx install 'poetry<2' - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Poetry run: | - pipx install poetry<2.0.0 + pipx install 'poetry<2' - uses: actions/setup-python@v5 with: python-version: "3.12" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2b48942..213992a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,7 +21,7 @@ jobs: python-version: "3.12" - name: Install dependencies run: | - pipx install poetry<2.0.0 + pipx install 'poetry<2' - name: Build package run: | poetry build diff --git a/.github/workflows/sphinx.yaml b/.github/workflows/sphinx.yaml index aba8111..1a2bdb5 100644 --- a/.github/workflows/sphinx.yaml +++ b/.github/workflows/sphinx.yaml @@ -40,7 +40,7 @@ jobs: python-version: "3.12" - name: Install Poetry run: | - pipx install poetry<2.0.0 + pipx install 'poetry<2' - name: Install dependencies run: poetry install --with docs - name: Setup Pages From 207ac9ee485b728094306b605a280e0ad735a682 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Wed, 8 Jan 2025 11:36:59 +0000 Subject: [PATCH 15/19] Fixing poetry. --- pyproject.toml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6553b74..9825d07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,14 +1,13 @@ -[project] +[tool.poetry] name = "esgf-playground-utils" -version = "0.4.0" +version = "0.3.8" description = "Common library and models for the ESGF-Playground" readme = "README.rst" authors = [ - {name = "David Poulter", email = "david.poulter@stfc.ac.uk"}, - {name = "Rhys Evans", email = "rhys.r.evans@stfc.ac.uk"}, - {name = "Ed Borthwick", email = "ed.borthwick@stfc.ac.uk"}, + "David Poulter ", + "Rhys Evans ", + "Ed Borthwick ", ] -dynamic = ["dependencies"] [tool.poetry.dependencies] python = ">=3.9" From 69daaa58db7be0e566553b250675c9ba00dd630e Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Wed, 8 Jan 2025 11:38:24 +0000 Subject: [PATCH 16/19] version update. --- pyproject.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9825d07..10058c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,12 @@ -[tool.poetry] +[project] name = "esgf-playground-utils" -version = "0.3.8" +version = "0.4.0" description = "Common library and models for the ESGF-Playground" readme = "README.rst" authors = [ - "David Poulter ", - "Rhys Evans ", - "Ed Borthwick ", + {name = "David Poulter", email = "david.poulter@stfc.ac.uk"}, + {name = "Rhys Evans", email = "rhys.r.evans@stfc.ac.uk"}, + {name = "Ed Borthwick", email = "ed.borthwick@stfc.ac.uk"}, ] [tool.poetry.dependencies] From 76afa7aabc49f697b979fe802af5d32c58b09920 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Wed, 8 Jan 2025 11:41:07 +0000 Subject: [PATCH 17/19] Poetry fix. --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 10058c1..65bbde8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,12 @@ -[project] +[tool.poetry] name = "esgf-playground-utils" version = "0.4.0" description = "Common library and models for the ESGF-Playground" readme = "README.rst" authors = [ - {name = "David Poulter", email = "david.poulter@stfc.ac.uk"}, - {name = "Rhys Evans", email = "rhys.r.evans@stfc.ac.uk"}, - {name = "Ed Borthwick", email = "ed.borthwick@stfc.ac.uk"}, + "David Poulter", + "Ed Borthwick ", ] [tool.poetry.dependencies] From d6778ac5d57608e86b6bc842b6bfc8bc4bafa4df Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Wed, 8 Jan 2025 11:42:22 +0000 Subject: [PATCH 18/19] Missing space. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 65bbde8..d01d551 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ version = "0.4.0" description = "Common library and models for the ESGF-Playground" readme = "README.rst" authors = [ - "David Poulter", "Ed Borthwick ", ] From c138ff369c9ad71018051033874b511ca08762a4 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Wed, 8 Jan 2025 11:45:15 +0000 Subject: [PATCH 19/19] Adding missing >. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d01d551..f865fef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ version = "0.4.0" description = "Common library and models for the ESGF-Playground" readme = "README.rst" authors = [ - "David Poulter ", "Rhys Evans ", "Ed Borthwick ", ]