From 62a89aa5d30fae064b54c74b5cc77e29cdedc0f9c5904c67f282902dcb06e579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 31 Jan 2020 10:34:57 +0000 Subject: [PATCH] Accepting request 769019 from home:mcalabkova:branches:devel:languages:python - update to 3.4.3 * ensure the git file finder closes file descriptor after reading archive * correctly transfer tag regex in the Configuration constructor * correctly set up the default version scheme for pyproject usage. * add support for projects built under setuptools declarative config * ensure the git file finder closes filedescriptors even when errors happen * clean out env vars from the git hook system to ensure correct function from within OBS-URL: https://build.opensuse.org/request/show/769019 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=57 --- python-setuptools_scm.changes | 11 +++++++++++ python-setuptools_scm.spec | 11 ++++++++--- setuptools_scm-3.3.3.tar.gz | 3 --- setuptools_scm-3.4.3.tar.gz | 3 +++ 4 files changed, 22 insertions(+), 6 deletions(-) delete mode 100644 setuptools_scm-3.3.3.tar.gz create mode 100644 setuptools_scm-3.4.3.tar.gz diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index 009a0c5..9229bbb 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Jan 31 10:24:46 UTC 2020 - Marketa Calabkova + +- update to 3.4.3 + * ensure the git file finder closes file descriptor after reading archive + * correctly transfer tag regex in the Configuration constructor + * correctly set up the default version scheme for pyproject usage. + * add support for projects built under setuptools declarative config + * ensure the git file finder closes filedescriptors even when errors happen + * clean out env vars from the git hook system to ensure correct function from within + ------------------------------------------------------------------- Fri Nov 1 08:54:02 UTC 2019 - Tomáš Chvátal diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index 5934478..72c8bac 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -1,7 +1,7 @@ # # spec file for package python-setuptools_scm # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %bcond_with test %endif Name: python-setuptools_scm%{psuffix} -Version: 3.3.3 +Version: 3.4.3 Release: 0 Summary: Python setuptools handler for SCM tags License: MIT @@ -37,13 +37,17 @@ BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-setuptools +Suggests: python-toml BuildArch: noarch %if %{with test} # Testing requirements BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools >= 42} BuildRequires: %{python_module setuptools_scm = %{version}} +BuildRequires: %{python_module toml} BuildRequires: git-core +BuildRequires: mercurial %endif %if 0%{?suse_version} || 0%{?fedora_version} >= 24 Recommends: git-core @@ -69,7 +73,8 @@ in SCM metadata. It also handles file finders for the supperted SCMs. %if %{with test} %check -%pytest -k 'not (test_mercurial or hg)' +# both tests in test_integration.py encounter https://github.com/pypa/setuptools_scm/issues/386 (at least on Python 2) +%pytest -k 'not test_integration' %endif %if !%{with test} diff --git a/setuptools_scm-3.3.3.tar.gz b/setuptools_scm-3.3.3.tar.gz deleted file mode 100644 index 16a2429..0000000 --- a/setuptools_scm-3.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd25e1fb5e4d603dcf490f1fde40fb4c595b357795674c3e5cb7f6217ab39ea5 -size 36903 diff --git a/setuptools_scm-3.4.3.tar.gz b/setuptools_scm-3.4.3.tar.gz new file mode 100644 index 0000000..eac7f81 --- /dev/null +++ b/setuptools_scm-3.4.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26b8a108783cd88f4b15ff1f0f347d6b476db25d0c226159b835d713f9487320 +size 45549