Skip to content

Commit

Permalink
Merge pull request #121 from crgwbr/fix_unittest_mock
Browse files Browse the repository at this point in the history
Replace mock with unittest.mock
  • Loading branch information
seb-b authored May 10, 2024
2 parents edd8656 + 9f3c8c8 commit c87e8ae
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ head:
extends: .python_test
image: python:3.11
before_script:
- pip install .['testing']
- pip install .


lts_52:
image: python:3.11
extends: .python_test
before_script:
- pip install .['testing'] wagtail~=5.2 django~=4.2
- pip install . wagtail~=5.2 django~=4.2

flake8:
stage: lint
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"django-enumchoicefield>=1.1.0",
"bcp47==0.0.4",
],
extras_require={"testing": ["mock==2.0.0"]},
zip_safe=False,
license="BSD License",
packages=find_packages(),
Expand Down
2 changes: 1 addition & 1 deletion tests/test_admin_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.template.defaultfilters import filesizeformat
from django.test import TestCase, override_settings
from django.urls import reverse
from mock import patch
from unittest.mock import patch
from wagtail.models import Collection, GroupCollectionPermission
from wagtail.test.utils import WagtailTestUtils

Expand Down

0 comments on commit c87e8ae

Please sign in to comment.