Matej Cepl
12cf5f81ed
- Update to 5.5.1 * Run tempest-full for stable/train * Remove use_2to3 backward compat for Setuptools * More easy_install.ScriptWriter.get_header() - Changes for 5.5.0 * Remove bdist_wininst support * Increase integration test timeout * Add Release Notes to documentation * Cleanup old legacy devstack-gate jobs * Begin work to modernize pbr’s integration testing * Re-add ChangeLog * Update some url to use opendev.org * Support newer openstackdocstheme * Use easy_install.ScriptWriter.get_header() * Remove neutron-fwaas from the jobs’ required project * Update python requires packaging metadata for package * trivial: Improve logging of run commands + Map requires-python to python-requires * Update hacking * Add support for virtualenv 20.x - Only test the primary python3 interpreter because some test dependencies from OpenStack (which are not hard required by the package itself) only provide that one. gh#openSUSE/python-rpm-macros#66 - Add remove_mock.patch https://review.opendev.org/c/openstack/pbr/+/767972 OBS-URL: https://build.opensuse.org/request/show/857014 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=133
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
Index: pbr-5.5.1/pbr/tests/test_packaging.py
|
|
===================================================================
|
|
--- pbr-5.5.1.orig/pbr/tests/test_packaging.py
|
|
+++ pbr-5.5.1/pbr/tests/test_packaging.py
|
|
@@ -48,7 +48,10 @@ import tempfile
|
|
import textwrap
|
|
|
|
import fixtures
|
|
-import mock
|
|
+try:
|
|
+ from unittest import mock
|
|
+except ImportError:
|
|
+ import mock
|
|
import pkg_resources
|
|
import six
|
|
import testscenarios
|
|
Index: pbr-5.5.1/pbr/tests/test_pbr_json.py
|
|
===================================================================
|
|
--- pbr-5.5.1.orig/pbr/tests/test_pbr_json.py
|
|
+++ pbr-5.5.1/pbr/tests/test_pbr_json.py
|
|
@@ -10,7 +10,10 @@
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
-import mock
|
|
+try:
|
|
+ from unittest import mock
|
|
+except ImportError:
|
|
+ import mock
|
|
|
|
from pbr import pbr_json
|
|
from pbr.tests import base
|
|
Index: pbr-5.5.1/test-requirements.txt
|
|
===================================================================
|
|
--- pbr-5.5.1.orig/test-requirements.txt
|
|
+++ pbr-5.5.1/test-requirements.txt
|
|
@@ -5,7 +5,7 @@
|
|
wheel>=0.32.0 # MIT
|
|
fixtures>=3.0.0 # Apache-2.0/BSD
|
|
hacking>=1.1.0,<4.0.0 # Apache-2.0
|
|
-mock>=2.0.0 # BSD
|
|
+mock>=2.0.0;python_version<='3.3' # BSD
|
|
six>=1.12.0 # MIT
|
|
stestr>=2.1.0,<3.0;python_version=='2.7' # Apache-2.0
|
|
stestr>=2.1.0;python_version>='3.0' # Apache-2.0
|