diff --git a/.gitignore b/.gitignore index 520c786..8a5f4b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ -SOURCES/mock-2.0.0.tar.gz +/mock-0.7.2.tar.gz +/mock-0.8.0.tar.gz +/mock-1.0.1.tar.gz +/mock-1.3.0.tar.gz /mock-2.0.0.tar.gz +/0001-Remove-pbr-dependency.patch diff --git a/0001-Remove-pbr-dependency.patch b/0001-Remove-pbr-dependency.patch deleted file mode 100644 index a883c0e..0000000 --- a/0001-Remove-pbr-dependency.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 894204aba025609a91ad219767b88caa65d81259 Mon Sep 17 00:00:00 2001 -From: Lumir Balhar -Date: Wed, 20 Jun 2018 12:47:42 +0200 -Subject: [PATCH] Remove pbr dependency - ---- - mock/mock.py | 6 ++---- - requirements.txt | 4 ---- - setup.cfg | 3 +++ - setup.py | 3 +-- - 4 files changed, 6 insertions(+), 10 deletions(-) - -diff --git a/mock/mock.py b/mock/mock.py -index c674a85..afa1105 100644 ---- a/mock/mock.py -+++ b/mock/mock.py -@@ -66,11 +66,9 @@ from types import ModuleType - - import six - from six import wraps --from pbr.version import VersionInfo - --_v = VersionInfo('mock').semantic_version() --__version__ = _v.release_string() --version_info = _v.version_tuple() -+__version__ = 'VERSIONPLACEHOLDER' -+version_info = tuple(map(int, __version__.split('.'))) + ('final', 0) - - import mock - -diff --git a/requirements.txt b/requirements.txt -index 31bbe5d..bca9f9b 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,6 +1,2 @@ - funcsigs>=1;python_version<"3.3" --# For runtime needs this is correct. For setup_requires needs, 1.2.0 is needed --# but setuptools can't cope with conflicts in setup_requires, so thats --# unversioned. --pbr>=0.11 - six>=1.9 -diff --git a/setup.cfg b/setup.cfg -index f5e0a02..3f7f263 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -1,5 +1,6 @@ - [metadata] - name = mock -+version = VERSIONPLACEHOLDER - summary = Rolling backport of unittest.mock for all Pythons - home-page = https://github.com/testing-cabal/mock - description-file = README.rst -@@ -49,3 +50,5 @@ tag_build = - tag_date = 0 - tag_svn_revision = 0 - -+[options] -+packages = mock -diff --git a/setup.py b/setup.py -index 5f727ae..b80f541 100755 ---- a/setup.py -+++ b/setup.py -@@ -2,5 +2,4 @@ - import setuptools - - setuptools.setup( -- setup_requires=['pbr>=1.3', 'setuptools>=17.1'], -- pbr=True) -+ setup_requires=['setuptools>=17.1']) --- -2.17.1 - diff --git a/sources b/sources index 3c40340..afa0b5c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (mock-2.0.0.tar.gz) = a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238 +0febfafd14330c9dcaa40de2d82d40ad mock-2.0.0.tar.gz +2d71375fd50c306e3e8e079ca5de46b6 0001-Remove-pbr-dependency.patch