Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-setuptools for
openSUSE:Factory checked in at 2024-02-02 15:45:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-setuptools (Old)
and /work/SRC/openSUSE:Factory/.python-setuptools.new.1815 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-setuptools"
Fri Feb 2 15:45:02 2024 rev:81 rq:1136302 version:69.0.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-setuptools/python-setuptools.changes
2023-12-25 19:04:48.244396394 +0100
+++
/work/SRC/openSUSE:Factory/.python-setuptools.new.1815/python-setuptools.changes
2024-02-02 15:45:25.220671678 +0100
@@ -1,0 +2,14 @@
+Tue Jan 2 21:55:38 UTC 2024 - Dirk Müller <dmuel...@suse.com>
+
+- update to 69.0.3:
+ * Bugfixes - Retain valid names with underscores in egg_info.
+
+-------------------------------------------------------------------
+Fri Dec 22 14:58:46 UTC 2023 - Ben Greiner <c...@bnavigator.de>
+
+- Drop fix-get-python-lib-python38.patch: No Python <3.9 built
+- Drop ugly allow-only-direct-compilation.patch in favor of proper
+ PEP517 compliant bootstrap, using a built-in pip and the wheel
+ package
+
+-------------------------------------------------------------------
Old:
----
allow-only-direct-compilation.patch
fix-get-python-lib-python38.patch
setuptools-69.0.2.tar.gz
New:
----
setuptools-69.0.3.tar.gz
BETA DEBUG BEGIN:
Old:- Drop fix-get-python-lib-python38.patch: No Python <3.9 built
- Drop ugly allow-only-direct-compilation.patch in favor of proper
PEP517 compliant bootstrap, using a built-in pip and the wheel
Old:
- Drop fix-get-python-lib-python38.patch: No Python <3.9 built
- Drop ugly allow-only-direct-compilation.patch in favor of proper
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-setuptools.spec ++++++
--- /var/tmp/diff_new_pack.5oiXZy/_old 2024-02-02 15:45:27.028737168 +0100
+++ /var/tmp/diff_new_pack.5oiXZy/_new 2024-02-02 15:45:27.032737313 +0100
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,43 +21,32 @@
%if "%{flavor}" == "test"
%define psuffix -test
%bcond_without test
-%bcond_with wheel
-%endif
-%if "%{flavor}" == "wheel"
-%define psuffix -wheel
-%bcond_with test
-%bcond_without wheel
%endif
%if "%{flavor}" == ""
%define psuffix %{nil}
%bcond_with test
-%bcond_with wheel
%endif
# in order to avoid rewriting for subpackage generator
%define mypython python
%{?sle15_python_module_pythons}
Name: python-setuptools%{psuffix}
-Version: 69.0.2
+Version: 69.0.3
Release: 0
Summary: Download, build, install, upgrade, and uninstall Python
packages
License: Apache-2.0 AND MIT AND BSD-2-Clause AND Python-2.0
URL: https://github.com/pypa/setuptools
Source:
https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
Patch0: sort-for-reproducibility.patch
-# PATCH-FIX-OPENSUSE fix-get-python-lib-python38.patch bsc#1204395
-Patch2: fix-get-python-lib-python38.patch
-# PATCH-FIX-OPENSUSE Allow forcing direct compilation, see
gh#pypa/setuptools#4164
-Patch3: allow-only-direct-compilation.patch
-BuildRequires: %{python_module base >= 3.7}
+# Bootstrap: Don't BuildRequire pip here!
+BuildRequires: %{python_module base >= 3.9}
+# The rpm python-wheel build is bootstrap friendly since 0.42
+BuildRequires: %{python_module wheel >= 0.42}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires(post): update-alternatives
Requires(postun):update-alternatives
BuildArch: noarch
-%if %{with wheel}
-Requires: %mypython(abi) = %python_version
-%endif
%if %{with test}
BuildRequires: %{python_module build}
BuildRequires: %{python_module devel}
@@ -75,14 +64,10 @@
BuildRequires: %{python_module setuptools-wheel = %{version}}
BuildRequires: %{python_module tomli-w >= 1.0.0}
BuildRequires: %{python_module virtualenv >= 13.0.0}
-BuildRequires: %{python_module wheel}
%endif
%if 0%{?suse_version} || 0%{?fedora_version} >= 24
Recommends: ca-certificates-mozilla
%endif
-%if %{with wheel}
-BuildRequires: %{python_module wheel}
-%endif
%python_subpackages
%description
@@ -90,6 +75,14 @@
allow you to build and distribute Python packages,
especially ones that have dependencies on other packages.
+%package wheel
+Summary: The setuptools wheel for custom tests and install requirements
+Requires: %mypython(abi) = %python_version
+
+%description wheel
+This packages provides the setuptools wheel as separate file for cases where
+the wheel needs to be used directly in test or install setups
+
%prep
%autosetup -p1 -n setuptools-%{version}
@@ -97,26 +90,32 @@
rm -f setuptools/*.exe
%build
-%if ! %{with wheel}
-%python_build
-%else
-%python_exec setup.py bdist_wheel --universal
+%if !%{with test}
+%{python_expand # bootstrap with built-in pip
+$python -m venv build/env
+build/env/bin/python -m ensurepip
+export PYTHONPATH=build/env/lib/python%{$python_bin_suffix}/site-packages
+%{$python_pyproject_wheel}
+}
%endif
%install
-%if !%{with test} && !%{with wheel}
-export SETUPTOOLS_FORCE_DIRECT=True
-%python_install
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
-%endif
-
-%if %{with wheel}
-%python_expand install -D -m 0644 -t %{buildroot}%{$python_sitelib}/../wheels
dist/*.whl
+%if !%{with test}
+%{python_expand # use pip bootstrapped above
+export PYTHONPATH=build/env/lib/python%{$python_bin_suffix}/site-packages
+%{$python_pyproject_install}
+%fdupes %{buildroot}%{$python_sitelib}
+install -D -m 0644 -t %{buildroot}%{$python_sitelib}/../wheels dist/*.whl
+}
%endif
%check
%if %{with test}
-%python_expand export
PRE_BUILT_SETUPTOOLS_WHEEL=%{$python_sitelib}/../wheels/setuptools-%{version}-py2.py3-none-any.whl
+%{python_expand # just use the last one from the expansion, they're all the
same
+mkdir -p dist/
+cp %{$python_sitelib}/../wheels/setuptools-%{version}-py3-none-any.whl
$PWD/dist/
+}
+export
PRE_BUILT_SETUPTOOLS_WHEEL=$PWD/dist/setuptools-%{version}-py3-none-any.whl
export LANG=en_US.UTF-8
# tests need imports from local source dir
export PYTHONPATH=$(pwd)
@@ -133,16 +132,15 @@
%license LICENSE
%doc NEWS.rst README.rst
%{python_sitelib}/setuptools
-%{python_sitelib}/setuptools-%{version}*-info
+%{python_sitelib}/setuptools-%{version}.dist-info
%dir %{python_sitelib}/pkg_resources
%{python_sitelib}/pkg_resources/*
%{python_sitelib}/_distutils_hack
%{python_sitelib}/distutils-precedence.pth
%endif
-%if %{with wheel}
+%files %{python_files wheel}
%dir %{python_sitelib}/../wheels
%{python_sitelib}/../wheels/*
%endif
-%endif
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.5oiXZy/_old 2024-02-02 15:45:27.084739197 +0100
+++ /var/tmp/diff_new_pack.5oiXZy/_new 2024-02-02 15:45:27.100739777 +0100
@@ -1,5 +1,4 @@
<multibuild>
<package>test</package>
- <package>wheel</package>
</multibuild>
++++++ setuptools-69.0.2.tar.gz -> setuptools-69.0.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-69.0.2/NEWS.rst
new/setuptools-69.0.3/NEWS.rst
--- old/setuptools-69.0.2/NEWS.rst 2023-11-21 20:00:33.000000000 +0100
+++ new/setuptools-69.0.3/NEWS.rst 2023-12-23 16:08:45.000000000 +0100
@@ -1,3 +1,12 @@
+v69.0.3
+=======
+
+Bugfixes
+--------
+
+- Retain valid names with underscores in egg_info.
+
+
v69.0.2
=======
@@ -58,7 +67,7 @@
- Added strict enforcement for ``project.dynamic`` in ``pyproject.toml``.
This removes the transitional ability of users configuring certain parameters
via ``setup.py`` without making the necessary changes to ``pyproject.toml``
- (as mandated by :pep:`612`). (#4066)
+ (as mandated by :pep:`621`). (#4066)
- Removed handling of ``--config-settings["--build-option"]`` in
``setuptools.build_meta``
from build-backend API hooks *other than* ``build_wheel``.
This was motivate by `errors caused when passing this option
@@ -529,7 +538,7 @@
Misc
----
* #3638: Drop a test dependency on the ``mock`` package, always use
:external+python:py:mod:`unittest.mock` -- by :user:`hroncok`
-* #3659: Fixed REDoS vector in package_index.
+* #3659: Fixed REDoS vector in package_index -- by :user:`SCH227`
v65.5.0
@@ -1152,7 +1161,7 @@
.. warning::
Please note that future releases of setuptools will halt the build process
if a ``pyproject.toml`` file that does not match doc:`the PyPA
Specification
- <PyPUG:specifications/declaring-project-metadata>` is given.
+ <PyPUG:specifications/section-distribution-metadata>` is given.
* #3215: Updated ``pyproject.toml`` validation, as generated by
``validate-pyproject==0.6.1``.
* #3218: Prevented builds from erroring if the project specifies metadata via
``pyproject.toml``, but uses other files (e.g. ``setup.py``) to complement
it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-69.0.2/PKG-INFO
new/setuptools-69.0.3/PKG-INFO
--- old/setuptools-69.0.2/PKG-INFO 2023-11-21 20:00:51.398863800 +0100
+++ new/setuptools-69.0.3/PKG-INFO 2023-12-23 16:09:03.045497200 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: setuptools
-Version: 69.0.2
+Version: 69.0.3
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
Home-page: https://github.com/pypa/setuptools
Author: Python Packaging Authority
@@ -75,7 +75,7 @@
.. image:: https://img.shields.io/pypi/pyversions/setuptools.svg
-.. image:: https://github.com/pypa/setuptools/workflows/tests/badge.svg
+.. image::
https://github.com/pypa/setuptools/actions/workflows/main.yml/badge.svg
:target:
https://github.com/pypa/setuptools/actions?query=workflow%3A%22tests%22
:alt: tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-69.0.2/README.rst
new/setuptools-69.0.3/README.rst
--- old/setuptools-69.0.2/README.rst 2023-11-21 20:00:33.000000000 +0100
+++ new/setuptools-69.0.3/README.rst 2023-12-23 16:08:45.000000000 +0100
@@ -3,7 +3,7 @@
.. image:: https://img.shields.io/pypi/pyversions/setuptools.svg
-.. image:: https://github.com/pypa/setuptools/workflows/tests/badge.svg
+.. image::
https://github.com/pypa/setuptools/actions/workflows/main.yml/badge.svg
:target:
https://github.com/pypa/setuptools/actions?query=workflow%3A%22tests%22
:alt: tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-69.0.2/pytest.ini
new/setuptools-69.0.3/pytest.ini
--- old/setuptools-69.0.2/pytest.ini 2023-11-21 20:00:33.000000000 +0100
+++ new/setuptools-69.0.3/pytest.ini 2023-12-23 16:08:45.000000000 +0100
@@ -31,6 +31,9 @@
# pypa/build#615
ignore:'encoding' argument not specified::build.env
+ # dateutil/dateutil#1284
+
ignore:datetime.datetime.utcfromtimestamp:DeprecationWarning:dateutil.tz.tz
+
## end upstream
# https://github.com/pypa/setuptools/issues/1823
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-69.0.2/setup.cfg
new/setuptools-69.0.3/setup.cfg
--- old/setuptools-69.0.2/setup.cfg 2023-11-21 20:00:51.398863800 +0100
+++ new/setuptools-69.0.3/setup.cfg 2023-12-23 16:09:03.045497200 +0100
@@ -1,6 +1,6 @@
[metadata]
name = setuptools
-version = 69.0.2
+version = 69.0.3
author = Python Packaging Authority
author_email = distutils-...@python.org
description = Easily download, build, install, upgrade, and uninstall Python
packages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-69.0.2/setuptools/_normalization.py
new/setuptools-69.0.3/setuptools/_normalization.py
--- old/setuptools-69.0.2/setuptools/_normalization.py 2023-11-21
20:00:33.000000000 +0100
+++ new/setuptools-69.0.3/setuptools/_normalization.py 2023-12-23
16:08:45.000000000 +0100
@@ -12,7 +12,7 @@
# https://packaging.python.org/en/latest/specifications/core-metadata/#name
_VALID_NAME = re.compile(r"^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$", re.I)
-_UNSAFE_NAME_CHARS = re.compile(r"[^A-Z0-9.]+", re.I)
+_UNSAFE_NAME_CHARS = re.compile(r"[^A-Z0-9._-]+", re.I)
_NON_ALPHANUMERIC = re.compile(r"[^A-Z0-9]+", re.I)
_PEP440_FALLBACK = re.compile(r"^v?(?P<safe>(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)",
re.I)
@@ -35,6 +35,8 @@
'hello-world'
>>> safe_name("hello?world")
'hello-world'
+ >>> safe_name("hello_world")
+ 'hello_world'
"""
# See pkg_resources.safe_name
return _UNSAFE_NAME_CHARS.sub("-", component)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-69.0.2/setuptools.egg-info/PKG-INFO
new/setuptools-69.0.3/setuptools.egg-info/PKG-INFO
--- old/setuptools-69.0.2/setuptools.egg-info/PKG-INFO 2023-11-21
20:00:51.000000000 +0100
+++ new/setuptools-69.0.3/setuptools.egg-info/PKG-INFO 2023-12-23
16:09:02.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: setuptools
-Version: 69.0.2
+Version: 69.0.3
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
Home-page: https://github.com/pypa/setuptools
Author: Python Packaging Authority
@@ -75,7 +75,7 @@
.. image:: https://img.shields.io/pypi/pyversions/setuptools.svg
-.. image:: https://github.com/pypa/setuptools/workflows/tests/badge.svg
+.. image::
https://github.com/pypa/setuptools/actions/workflows/main.yml/badge.svg
:target:
https://github.com/pypa/setuptools/actions?query=workflow%3A%22tests%22
:alt: tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-69.0.2/tox.ini
new/setuptools-69.0.3/tox.ini
--- old/setuptools-69.0.2/tox.ini 2023-11-21 20:00:33.000000000 +0100
+++ new/setuptools-69.0.3/tox.ini 2023-12-23 16:08:45.000000000 +0100
@@ -6,7 +6,8 @@
# ^-- use dev version while we wait for the new release
setenv =
PYTHONWARNDEFAULTENCODING = 1
- SETUPTOOLS_ENFORCE_DEPRECATION = {env:SETUPTOOLS_ENFORCE_DEPRECATION:1}
+ SETUPTOOLS_ENFORCE_DEPRECATION = {env:SETUPTOOLS_ENFORCE_DEPRECATION:0}
+ # ^-- Temporarily disable enforcement so CI don't fail on due dates
commands =
pytest {posargs}
usedevelop = True
