From 95e6c5bea534ed4488bac2bfb2c45f7c81994f8c Mon Sep 17 00:00:00 2001 From: Darragh Bailey Date: Fri, 29 Jun 2018 13:01:47 +0100 Subject: [PATCH] Align with openstack check-requirements Replace loremipsum with faker, drop discover as unneeded and ensure any remaining requirements match the minimum requirements. Change-Id: Ia5c5b033173c09e899e52b23f548ff822af998f0 --- git_upstream/tests/base.py | 5 +++-- test-requirements.txt | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/git_upstream/tests/base.py b/git_upstream/tests/base.py index 2f4170b..3f428bd 100644 --- a/git_upstream/tests/base.py +++ b/git_upstream/tests/base.py @@ -21,9 +21,9 @@ import re import subprocess import tempfile +import faker import fixtures import git -import loremipsum import testtools from testtools.content import text_content import yaml @@ -136,6 +136,7 @@ class GitRepo(fixtures.Fixture): def __init__(self, path=None): self.path = path + self._faker = faker.Faker() def _setUp(self): self._file_list = set() @@ -154,7 +155,7 @@ class GitRepo(fixtures.Fixture): def _create_file(self, contents=None): if not contents: - contents = "\n\n".join(loremipsum.get_paragraphs(3)) + contents = "\n\n".join(self._faker.paragraphs(3)) # always want to ensure the files added to the repo are unique no # matter which branch they are added to, as otherwise there may diff --git a/test-requirements.txt b/test-requirements.txt index e2cbaaf..6b3aafc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,14 +1,13 @@ hacking>=0.11.0,<0.12 # Apache-2.0 -loremipsum -mock!=1.1.1,<=1.3.0 +faker>=0.8.16 +mock>=2.0.0 sphinx>=1.5.1 # BSD -discover coverage>=3.6 # Apache-2.0 fixtures>=0.3.14 -python-subunit -sphinxcontrib-fulltoc # Apache-2.0 +python-subunit>=1.3.0 +sphinxcontrib-fulltoc>=1.2.0 # Apache-2.0 testrepository>=0.0.17 testscenarios>=0.4 testtools>=0.9.32 PyYAML>=3.1.0 -psutil>=1.1.1,<2.0.0 # BSD +psutil>=3.2.2 # BSD