From 5277c4b185fbf80984426acc13e3a32561039a08 Mon Sep 17 00:00:00 2001 From: nil Date: Fri, 2 Aug 2024 15:52:01 +0200 Subject: [PATCH] removing interface dependency and docker version --- CHANGELOG.rst | 3 ++- guillotina_audit/tests/test_audit_basic.py | 4 +--- guillotina_audit/utility.py | 2 +- setup.py | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2696339..4af3440 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,8 @@ 2.0.4 (unreleased) ------------------ -- Nothing changed yet. +- Removing zope.interface dependency in setup.py +- Removing docker dependency 2.0.3 (2024-03-06) diff --git a/guillotina_audit/tests/test_audit_basic.py b/guillotina_audit/tests/test_audit_basic.py index a374896..71e6807 100644 --- a/guillotina_audit/tests/test_audit_basic.py +++ b/guillotina_audit/tests/test_audit_basic.py @@ -265,9 +265,7 @@ async def test_permissions_modified_without_indexing(guillotina_es): # There should be the same number of documents since indexing_permission_changes is False assert len(resp["hits"]["hits"]) == 2 response, status = await guillotina_es( - "PATCH", - "/db/guillotina/foo_item", - data=json.dumps({"title": "Another title"}) + "PATCH", "/db/guillotina/foo_item", data=json.dumps({"title": "Another title"}) ) assert status == 204 await asyncio.sleep(2) diff --git a/guillotina_audit/utility.py b/guillotina_audit/utility.py index 7dab110..e900c19 100644 --- a/guillotina_audit/utility.py +++ b/guillotina_audit/utility.py @@ -8,8 +8,8 @@ from guillotina.interfaces import IObjectDuplicatedEvent from guillotina.interfaces import IObjectModifiedEvent from guillotina.interfaces import IObjectMovedEvent -from guillotina.interfaces import IObjectRemovedEvent from guillotina.interfaces import IObjectPermissionsModifiedEvent +from guillotina.interfaces import IObjectRemovedEvent from guillotina.utils.auth import get_authenticated_user from guillotina.utils.content import get_content_path from guillotina_audit.models import AuditDocument diff --git a/setup.py b/setup.py index 69a087b..38c22b4 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ "coverage", "pytest-cov", "pytest-docker-fixtures[pg]>=1.3.0", - "docker>=6.0.0,<=6.1.3", + "docker", ] @@ -40,7 +40,6 @@ "guillotina>=6.0.0a16", "pydantic", "elasticsearch[async]>=8.0.0,<=8.12.0", - "zope.interface==5.1.0" # TODO: remove once guillotina has solved this ], tests_require=test_requires, extras_require={"test": test_requires},