Skip to content

Commit

Permalink
Update test-requirements to be py3 only
Browse files Browse the repository at this point in the history
This commit updates the test-requirements to remove things no longer
needed in a py3 only world. This involves updating the sphinx version so
that we don't have to explicitly set a python 2 version. It also means
removing the mock library as we can just use mock from stdlib now that
we're only supporting python3.
  • Loading branch information
mtreinish committed Mar 18, 2020
1 parent 2ec46e5 commit 82fe384
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion stestr/tests/repository/test_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
# License for the specific language governing permissions and limitations
# under the License.

import mock
import os
import shutil
import tempfile
from unittest import mock

from stestr.repository import util
from stestr.tests import base
Expand Down
2 changes: 1 addition & 1 deletion stestr/tests/test_bisect_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

import io
import operator
from unittest import mock

import mock
import subunit
import testtools

Expand Down
3 changes: 2 additions & 1 deletion stestr/tests/test_config_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
# License for the specific language governing permissions and limitations
# under the License.

from unittest import mock

import ddt
import mock

from stestr import config_file
from stestr.tests import base
Expand Down
2 changes: 1 addition & 1 deletion stestr/tests/test_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

import datetime
import re
from unittest import mock

import mock
from subunit import iso8601

from stestr.repository import memory
Expand Down
3 changes: 1 addition & 2 deletions stestr/tests/test_selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@

import io
import re

import mock
from unittest import mock

from stestr import selection
from stestr.tests import base
Expand Down
2 changes: 1 addition & 1 deletion stestr/tests/test_subunit_trace.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import io
import os
import sys
from unittest.mock import patch

from ddt import data
from ddt import ddt
from ddt import unpack
from mock import patch

from stestr import subunit_trace
from stestr.tests import base
Expand Down
3 changes: 1 addition & 2 deletions stestr/tests/test_test_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
# under the License.

import subprocess

import mock
from unittest import mock

from stestr import test_processor
from stestr.tests import base
Expand Down
3 changes: 1 addition & 2 deletions stestr/tests/test_user_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@

import io
import os

import mock
from unittest import mock

from stestr.tests import base
from stestr import user_config
Expand Down
4 changes: 1 addition & 3 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
# process, which may cause wedges in the gate later.

hacking<1.2.0,>=1.1.0
sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD
mock>=2.0 # BSD
sphinx>2.1.0 # BSD
subunit2sql>=1.8.0
coverage>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT
Expand Down

0 comments on commit 82fe384

Please sign in to comment.