Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove usage of deprecated python3-mock #364

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -17,7 +17,7 @@ RUN apt-get update -qq -o Acquire::Languages=none \
-yqq --no-install-recommends -o Dpkg::Options::=--force-unsafe-io \
build-essential debhelper devscripts equivs lsb-release libparse-debianchangelog-perl \
python3 python3-setuptools python3-pip python3-dev \
python3-sphinx python3-mock dh-exec dh-python python3-sphinx-rtd-theme \
python3-sphinx dh-exec dh-python python3-sphinx-rtd-theme \
&& if test "$(lsb_release -cs)" = 'bionic' ; then \
apt-get install -yqq --no-install-recommends -o Dpkg::Options::=--force-unsafe-io \
-t bionic-backports debhelper; fi \
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Expand Up @@ -3,7 +3,7 @@ Section: python
Priority: optional
Maintainer: Jyrki Pulliainen <jyrki@dywypi.org>
Build-Depends: debhelper-compat (= 12), python3,
python3-setuptools, python3-sphinx, python3-mock, dh-exec,
python3-setuptools, python3-sphinx, dh-exec,
dh-python, libjs-jquery, libjs-underscore,
# python-sphinx-rtd-theme doesn't exist in distributions
# predating Debian Jessie and Ubuntu Xenial. On these legacy
Expand Down
2 changes: 1 addition & 1 deletion test/test_cmdline.py
Expand Up @@ -20,9 +20,9 @@
import io
import os
import warnings
from unittest.mock import patch

from dh_virtualenv import cmdline
from mock import patch
from nose.tools import eq_, ok_


Expand Down
3 changes: 1 addition & 2 deletions test/test_deployment.py
Expand Up @@ -23,8 +23,7 @@
import tempfile
import textwrap
import contextlib

from mock import patch, call, ANY
from unittest.mock import patch, call, ANY

from nose.tools import eq_
from dh_virtualenv import Deployment
Expand Down
1 change: 0 additions & 1 deletion travis-requirements.txt
Expand Up @@ -4,5 +4,4 @@ Pygments==2.7.2
Sphinx==3.3.0
sphinx-rtd-theme==0.5.0
docutils==0.16
mock==4.0.2
nose==1.3.7