From cecb0e5497bbe3abe187f236052b0c511edb40d24f12bd0b483debca197c3ebd Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 18 May 2017 15:02:34 +0000 Subject: [PATCH] Accepting request 495767 from home:dimstar:cycle For consideration - I know it is not optimal, if you find a better solution, please speak up. In essence, I'm trying to get rid of the (various) build cycles that accumulated in openSUSE:Factory (many hidden with the singlespec migration, something the bot seems not to have gotten correct) The issue here: if setuptools_scm requires git in the buildroot, then we get the cycle setuptools_scm -> git -> curl -> nghttp2 -> setuptools_scm git reqquires curl for the network access curl requires nghttp2 for http/2 access nghttp2 uses setuptools as build util. Gence, breaking at this very point seems to be the most beneficial - 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. OBS-URL: https://build.opensuse.org/request/show/495767 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=16 --- python-setuptools_scm.changes | 7 +++++++ python-setuptools_scm.spec | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) 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