diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index a3ef1bf..b16b86b 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 17 22:32:38 UTC 2017 - dimstar@opensuse.org + +- Do not buildrequire git: having git in the build root causes a + build cycle over curl -> nghttp2 -> python-setuptoos_scm -> git. +- Do not run the tests relying on git's presence. + ------------------------------------------------------------------- Fri Mar 3 15:24:56 UTC 2017 - jmatejek@suse.com diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index c88adae..5acc60d 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -32,7 +32,6 @@ BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros # Testing requirements BuildRequires: %{python_module pytest} -BuildRequires: git BuildRequires: mercurial Requires: python-setuptools Recommends: git @@ -49,6 +48,9 @@ in scm metadata. It also handles file finders for the supperted scm's. %prep %setup -q -n setuptools_scm-%{version} %patch0 -p1 +# We can't pull in git into the build root, as this causes a nasty build cycle +# git - curl - nghttp2 - setuptools - git +rm testing/test_{git,regressions}.py %build %python_build