Accepting request 1137240 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/1137240
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-setuptools_scm?expand=0&rev=35
This commit is contained in:
Ana Guerrero 2024-02-02 14:45:02 +00:00 committed by Git OBS Bridge
commit ea17c69359
6 changed files with 73 additions and 61 deletions

View File

@ -1,3 +1,43 @@
-------------------------------------------------------------------
Fri Jan 5 15:56:43 UTC 2024 - Ben Greiner <code@bnavigator.de>
- Add setuptools-scm-issue953-nowarn.patch
* gh#pypa/setuptools_scm#953
* don't warn if setuptools_scm is present but not directly used
-------------------------------------------------------------------
Wed Dec 27 11:40:15 UTC 2023 - Dirk Müller <dmueller@suse.com>
- update to 8.0.4:
* introduce scriv for changelog management
* reconfigure local build backend to use an attribute instead
of star imports from setuptools
* introduce ruff as a linter
* ensure the setuptools version keyword correctly load
pyproject.toml configuration
* add build and wheel to the test requirements for regression
testing
* move internal toml handling to own module
* remove legacy version parser api - config arg always required
turn Configuration into a dataclass
* require configuration to always pass into helpers
* hide file-finders implementation in private module
* renamed setuptools_scm.hacks to setuptools_scm.fallbacks and
drop support for pip-egg-info
* remove trace function and use logging instead
* unify `distance=None` and `distance=0` they should mean the
same andwhere hiding dirty states that are now explicitly
dirty
* depend on later importlib for the full selectable api
* move setuptools integration code to private sub-package
* use normalized dist names for the
`SETUPTOOLS_SCM_PRETEND_VERSION_FOR_${DIST_NAME}` env var
* drop support for python 3.7
* introduce `version_file` as replacement for `write_to`
* created a directory for the vcs-versioning package and added
it to pypi
- drop setuptools-68.patch (upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 4 22:23:27 UTC 2023 - Dirk Müller <dmueller@suse.com> Mon Sep 4 22:23:27 UTC 2023 - Dirk Müller <dmueller@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file # spec file
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -27,37 +27,33 @@
%{?sle15_python_module_pythons} %{?sle15_python_module_pythons}
Name: python-setuptools_scm%{psuffix} Name: python-setuptools_scm%{psuffix}
Version: 7.1.0 Version: 8.0.4
Release: 0 Release: 0
Summary: Python setuptools handler for SCM tags Summary: Python setuptools handler for SCM tags
License: MIT License: MIT
URL: https://github.com/pypa/setuptools_scm URL: https://github.com/pypa/setuptools_scm
Source: https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_scm-%{version}.tar.gz Source: https://files.pythonhosted.org/packages/source/s/setuptools-scm/setuptools-scm-%{version}.tar.gz
# PATCH-FIX-UPSTREAM: https://github.com/pypa/setuptools_scm/pull/867 # PATCH-FEATURE-OPENSUSE setuptools-scm-issue953-nowarn.patch gh#pypa/setuptools_scm#953 -- don't warn if setuptools_scm is present but not directly used
Patch1: setuptools-68.patch Patch0: setuptools-scm-issue953-nowarn.patch
BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module base >= 3.8}
BuildRequires: %{python_module packaging >= 20.0}
BuildRequires: %{python_module pip} BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools >= 45} BuildRequires: %{python_module setuptools >= 61}
BuildRequires: %{python_module typing-extensions} BuildRequires: %{python_module tomli if %python-base < 3.11}
BuildRequires: %{python_module wheel} BuildRequires: %{python_module wheel}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
Requires: python-packaging >= 20.0 Requires: python-packaging >= 20.0
Requires: python-setuptools Requires: python-setuptools
Requires: python-typing-extensions Requires: python-typing-extensions
%if 0%{?python_version_nodots} < 38
Requires: python-importlib-metadata
%endif
%if 0%{?python_version_nodots} < 311 %if 0%{?python_version_nodots} < 311
Requires: python-tomli >= 1 Requires: python-tomli >= 1
%endif %endif
BuildArch: noarch BuildArch: noarch
%if %{with test} %if %{with test}
# Testing requirements # Testing requirements
BuildRequires: %{python_module build}
BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools_scm = %{version}} BuildRequires: %{python_module setuptools_scm = %{version}}
BuildRequires: %{python_module virtualenv > 20}
BuildRequires: git-core BuildRequires: git-core
BuildRequires: mercurial BuildRequires: mercurial
%endif %endif
@ -71,7 +67,7 @@ The setuptools_scm package handles managing one's Python package versions
in SCM metadata. It also handles file finders for the supperted SCMs. in SCM metadata. It also handles file finders for the supperted SCMs.
%prep %prep
%autosetup -p1 -n setuptools_scm-%{version} %autosetup -p1 -n setuptools-scm-%{version}
%build %build
%pyproject_wheel %pyproject_wheel
@ -86,15 +82,13 @@ in SCM metadata. It also handles file finders for the supperted SCMs.
%check %check
# pip download needs network # pip download needs network
donttest="test_pip_download" donttest="test_pip_download"
# tested file not installed into sitelib. Yes the test is named that way. %pytest -rsEf -k "not ($donttest)"
donttest+=" or test_git_archhival_from_unfiltered"
%pytest -k "not ($donttest)"
%endif %endif
%if !%{with test} %if !%{with test}
%files %{python_files} %files %{python_files}
%license LICENSE %license LICENSE
%doc README.rst CHANGELOG.rst %doc README.md CHANGELOG.md
%{python_sitelib}/setuptools_scm %{python_sitelib}/setuptools_scm
%{python_sitelib}/setuptools_scm-%{version}*-info %{python_sitelib}/setuptools_scm-%{version}*-info
%endif %endif

View File

@ -1,34 +0,0 @@
From acb8a720bd6a74152bcd34401552221cc63e3817 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <slev@altlinux.org>
Date: Thu, 22 Jun 2023 15:36:48 +0300
Subject: [PATCH] tests: Specify version for test PEP621 metadata
According to today's specification
https://packaging.python.org/en/latest/specifications/declaring-project-metadata/#specification
> The only keys required to be statically defined are:
- name
The keys which are required but may be specified either
statically or listed as dynamic are:
- version
Fixes: https://github.com/pypa/setuptools_scm/issues/866
Signed-off-by: Stanislav Levin <slev@altlinux.org>
---
testing/test_integration.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/testing/test_integration.py b/testing/test_integration.py
index 98442724..c8bfc150 100644
--- a/testing/test_integration.py
+++ b/testing/test_integration.py
@@ -56,7 +56,8 @@ def test_pyproject_support(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> N
"[tool.setuptools_scm]\ndist_name='setuptools_scm_example'"
),
"pyproject.project": (
- "[project]\nname='setuptools_scm_example'\n[tool.setuptools_scm]"
+ "[project]\nname='setuptools_scm_example'\n"
+ "dynamic=['version']\n[tool.setuptools_scm]"
),
}

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7
size 74280

View File

@ -0,0 +1,12 @@
https://github.com/pypa/setuptools_scm/issues/953
--- setuptools-scm-8.0.4.orig/src/setuptools_scm/_integration/setuptools.py
+++ setuptools-scm-8.0.4/src/setuptools_scm/_integration/setuptools.py
@@ -116,6 +116,6 @@
try:
config = _config.Configuration.from_file(dist_name=dist_name)
except LookupError as e:
- log.warning(e)
+ log.info(e)
else:
_assign_version(dist, config)

BIN
setuptools_scm-7.1.0.tar.gz (Stored with Git LFS)

Binary file not shown.