rpm/python-HyperKitty
SHA256
1
0
Fork 0
forked from pool/python-HyperKitty
Code Pull Requests Activity

Accepting request 979312 from home:pgajdos:python

Browse Source 
- do not require python-mock for build
- added patches
  fix https://gitlab.com/mailman/hyperkitty/-/issues/429
  + python-HyperKitty-no-mock.patch

OBS-URL: https://build.opensuse.org/request/show/979312
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-HyperKitty?expand=0&rev=50
This commit is contained in:
Markéta Machová
2022-05-26 14:50:27 +00:00
committed by Git OBS Bridge
parent 0881c1d00c
commit 21d16f1b38
3 changed files with 204 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
python-HyperKitty-no-mock.patch Normal file
View File

@@ -0,0 +1,192 @@
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/commands/test_import.py HyperKitty-1.3.5/hyperkitty/tests/commands/test_import.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/commands/test_import.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/commands/test_import.py 2022-05-26 11:03:59.326617643 +0200
@@ -15,7 +15,7 @@ from django.core.management import call_
from django.db import DEFAULT_DB_ALIAS
from django.utils.timezone import utc
-from mock import Mock, patch
+from unittest.mock import Mock, patch
from hyperkitty.lib.incoming import add_to_list
from hyperkitty.management.commands.hyperkitty_import import Command
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/commands/test_mailman_sync.py HyperKitty-1.3.5/hyperkitty/tests/commands/test_mailman_sync.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/commands/test_mailman_sync.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/commands/test_mailman_sync.py 2022-05-26 11:03:59.326617643 +0200
@@ -22,7 +22,7 @@
from django.core.management import call_command
-from mock import patch
+from unittest.mock import patch
from hyperkitty.tests.utils import TestCase
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_incoming.py HyperKitty-1.3.5/hyperkitty/tests/lib/test_incoming.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_incoming.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/lib/test_incoming.py 2022-05-26 11:03:59.326617643 +0200
@@ -30,7 +30,7 @@ from django.core.cache import cache
from django.db import DataError, IntegrityError
from django.utils import timezone
-import mock
+from unittest import mock
from hyperkitty.lib.incoming import DuplicateMessage, add_to_list
from hyperkitty.lib.utils import get_message_id_hash
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_mailman.py HyperKitty-1.3.5/hyperkitty/tests/lib/test_mailman.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_mailman.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/lib/test_mailman.py 2022-05-26 11:03:59.326617643 +0200
@@ -26,7 +26,7 @@ from django.contrib.auth.models import U
from django.core.cache import cache
from django_mailman3.tests.utils import FakeMMList, FakeMMPage
-from mock import Mock, patch
+from unittest.mock import Mock, patch
from hyperkitty.lib import mailman
from hyperkitty.models import MailingList, Sender
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_posting.py HyperKitty-1.3.5/hyperkitty/tests/lib/test_posting.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_posting.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/lib/test_posting.py 2022-05-26 11:03:59.326617643 +0200
@@ -28,7 +28,7 @@ from django.core import mail
from django.test.client import RequestFactory
from django_mailman3.tests.utils import FakeMMList, FakeMMMember
-from mock import Mock, patch
+from unittest.mock import Mock, patch
from hyperkitty.lib import posting
from hyperkitty.models import MailingList
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/_test_caching.py HyperKitty-1.3.5/hyperkitty/tests/_test_caching.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/_test_caching.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/_test_caching.py 2022-05-26 11:03:59.326617643 +0200
@@ -8,7 +8,7 @@ from urllib.error import HTTPError
from mailman.email.message import Message
from mailman.interfaces.archiver import ArchivePolicy
-from mock import Mock
+from unittest.mock import Mock
#import kittystore.utils
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/test_signals.py HyperKitty-1.3.5/hyperkitty/tests/test_signals.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/test_signals.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/test_signals.py 2022-05-26 11:03:59.326617643 +0200
@@ -21,7 +21,7 @@
#
from django_mailman3.signals import mailinglist_created, mailinglist_modified
-from mock import patch
+from unittest.mock import patch
from hyperkitty.tests.utils import TestCase
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/test_tasks.py HyperKitty-1.3.5/hyperkitty/tests/test_tasks.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/test_tasks.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/test_tasks.py 2022-05-26 11:03:59.330617665 +0200
@@ -22,7 +22,7 @@
from email.message import EmailMessage
-from mock import patch
+from unittest.mock import patch
from hyperkitty import tasks
from hyperkitty.lib.incoming import add_to_list
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/utils.py HyperKitty-1.3.5/hyperkitty/tests/utils.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/utils.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/utils.py 2022-05-26 11:03:59.330617665 +0200
@@ -37,7 +37,7 @@ from django.test import TestCase as Djan
from django.test import TransactionTestCase
import mailmanclient
-from mock import Mock, patch
+from unittest.mock import Mock, patch
def setup_logging(tmpdir):
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_accounts.py HyperKitty-1.3.5/hyperkitty/tests/views/test_accounts.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_accounts.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_accounts.py 2022-05-26 11:03:59.330617665 +0200
@@ -31,7 +31,7 @@ from django.contrib.auth.models import U
from allauth.account.models import EmailAddress
from django_mailman3.tests.utils import FakeMMList, FakeMMMember
-from mock import Mock
+from unittest.mock import Mock
from hyperkitty.lib.incoming import add_to_list
from hyperkitty.lib.utils import get_message_id_hash
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_archives.py HyperKitty-1.3.5/hyperkitty/tests/views/test_archives.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_archives.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_archives.py 2022-05-26 11:03:59.330617665 +0200
@@ -34,7 +34,7 @@ from django.core.cache import cache
from bs4 import BeautifulSoup
from django_mailman3.tests.utils import FakeMMList, FakeMMMember
-from mock import Mock
+from unittest.mock import Mock
from hyperkitty.lib.incoming import add_to_list
from hyperkitty.models import (
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_index.py HyperKitty-1.3.5/hyperkitty/tests/views/test_index.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_index.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_index.py 2022-05-26 11:03:59.330617665 +0200
@@ -31,7 +31,7 @@ from django.test import override_setting
from django_mailman3.models import MailDomain
from django_mailman3.tests.utils import FakeMMList, FakeMMMember
-from mock import Mock
+from unittest.mock import Mock
from hyperkitty.lib.incoming import add_to_list
from hyperkitty.models import ArchivePolicy, MailingList
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_mailman.py HyperKitty-1.3.5/hyperkitty/tests/views/test_mailman.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_mailman.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_mailman.py 2022-05-26 11:03:59.330617665 +0200
@@ -27,7 +27,7 @@ from io import BytesIO
from django.conf import settings
from django.contrib.sites.models import Site
-import mock
+from unittest import mock
from django_mailman3.models import MailDomain
from hyperkitty.models.email import Email
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_message.py HyperKitty-1.3.5/hyperkitty/tests/views/test_message.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_message.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_message.py 2022-05-26 11:03:59.330617665 +0200
@@ -36,7 +36,7 @@ from django.utils import timezone
from allauth.account.models import EmailAddress
from django_gravatar.helpers import get_gravatar_url
from django_mailman3.tests.utils import get_flash_messages
-from mock import Mock, patch
+from unittest.mock import Mock, patch
from hyperkitty.lib.incoming import add_to_list
from hyperkitty.lib.utils import get_message_id_hash
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_search.py HyperKitty-1.3.5/hyperkitty/tests/views/test_search.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_search.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_search.py 2022-05-26 11:03:59.330617665 +0200
@@ -26,7 +26,7 @@ from django.contrib.auth.models import U
from django_mailman3.tests.utils import FakeMMList, FakeMMMember
from haystack import DEFAULT_ALIAS
-from mock import Mock, patch
+from unittest.mock import Mock, patch
from hyperkitty.lib.incoming import add_to_list
from hyperkitty.models import ArchivePolicy, MailingList
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_thread.py HyperKitty-1.3.5/hyperkitty/tests/views/test_thread.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_thread.py 2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_thread.py 2022-05-26 11:03:59.330617665 +0200
@@ -31,7 +31,7 @@ from django.test import override_setting
from bs4 import BeautifulSoup
from django_mailman3.tests.utils import get_flash_messages
-from mock import patch
+from unittest.mock import patch
from hyperkitty.lib.incoming import add_to_list
from hyperkitty.models import Email, MailingList, Tag, Tagging, Thread

8
python-HyperKitty.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu May 26 09:19:37 UTC 2022 - pgajdos@suse.com
- do not require python-mock for build
- added patches
fix https://gitlab.com/mailman/hyperkitty/-/issues/429
+ python-HyperKitty-no-mock.patch
-------------------------------------------------------------------
Tue Dec 28 07:02:11 UTC 2021 - John Vandenberg <jayvdb@gmail.com>

6
python-HyperKitty.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-HyperKitty
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -61,6 +61,8 @@ Patch0: hyperkitty-settings.patch
Patch1: hyperkitty-fix-mistune-2.0-imports.patch
# PATCH-FIX-UPSTREAM hyperkitty-django4.patch gl#mailman/hyperkitty#384 jayvdb@gmail.com
Patch2: hyperkitty-django4.patch
# https://gitlab.com/mailman/hyperkitty/-/issues/429
Patch3: python-HyperKitty-no-mock.patch
#
BuildRequires: %{python_module django-debug-toolbar >= 2.2}
BuildRequires: %{python_module isort}
@@ -108,7 +110,6 @@ BuildRequires: %{python_module flufl.lock}
BuildRequires: %{python_module lxml}
BuildRequires: %{python_module mailmanclient >= 3.3.2}
BuildRequires: %{python_module mistune}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module networkx >= 1.9.1}
BuildRequires: %{python_module pytest-django}
BuildRequires: %{python_module pytest}
@@ -160,6 +161,7 @@ rsync -a example_project/* build_static_files
%patch0 -p1
%patch1 -p1
%patch3 -p1
%build
sed -i 's|^#!/usr/bin/env.*|#!%{_bindir}/python3|' \