diff --git a/.gitattributes b/.gitattributes index 9b03811..37a8eaa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ -## Default LFS +*.changes merge=merge-changes *.7z filter=lfs diff=lfs merge=lfs -text *.bsp filter=lfs diff=lfs merge=lfs -text *.bz2 filter=lfs diff=lfs merge=lfs -text @@ -12,6 +12,7 @@ *.pdf filter=lfs diff=lfs merge=lfs -text *.png filter=lfs diff=lfs merge=lfs -text *.rpm filter=lfs diff=lfs merge=lfs -text +*.tar filter=lfs diff=lfs merge=lfs -text *.tbz filter=lfs diff=lfs merge=lfs -text *.tbz2 filter=lfs diff=lfs merge=lfs -text *.tgz filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 57affb6..8b731c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -.osc +*.obscpio +*.osc +_build.* +.pbuild diff --git a/python-setuptools.changes b/python-setuptools.changes index c70d54b..d4bbe4e 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,70 @@ +------------------------------------------------------------------- +Thu Jan 29 14:55:29 UTC 2026 - Daniel Garcia + +- Fix suse_version check to make sure that primary builds for SLE-16 + series +- Add pythons_for_pypi macro. This macro will help to build the python + minimal stack for different python versions. + +------------------------------------------------------------------- +Thu Jan 1 12:37:12 UTC 2026 - Ben Greiner + +- Update to v80.9.0 + * Set a deadline for the removal of pkg_resources later this year + (December). (#3085) + * Removed reliance on pkg_resources in test_wheel. (#3085) +- Release v80.8.0 + * Replaced more references to pkg_resources with importlib + equivalents in wheel module. (#3085) + * Restore explicit LICENSE file. (#5001) +- Release v80.7.1 + * Only attempt to fetch eggs for unsatisfied requirements. + (#4998) + * In installer, when discovering egg dists, let metadata + discovery search each egg. (#4998) +- Release v80.7.0 + * Removed usage of pkg_resources from installer. Set an official + deadline on the installer deprecation to 2025-10-31. (#4997) +- Release v80.5.0 + * Replaced more references to pkg_resources with importlib + equivalents. (#3085) +- Release v80.4.0 + * Simplified the error reporting in editable installs. (#4984) +- Release v80.3.0 + * Removed easy_install and package_index modules. (#917) +- Release v80.2.0 + * Restored support for install_scripts --executable (and classic + behavior for the executable for those invocations). Instead, + build_editable provides the portable form of the executables + for downstream installers to rewrite. (#4934) +- Release v80.1.0 + * Added a deadline of Oct 31 to the setup.py install deprecation. + * With setup.py install --prefix=..., fall back to distutils + install rather than failing. Note that running setup.py install + is deprecated. (#3143) +- Release v80.0.1 + * Fixed index_url logic in develop compatibility shim. (#4966) + - Release v80.0.0 + ## Deprecations and Removals + * Removed support for the easy_install command including the + sandbox module. (#2908) + * Develop command no longer uses easy_install, but instead defers + execution to pip (which then will re-invoke Setuptools via PEP + 517 to build the editable wheel). Most of the options to + develop are dropped. This is the final warning before the + command is dropped completely in a few months. Use-cases + relying on 'setup.py develop' should pin to older Setuptools + version or migrate to modern build tooling. (#4955) +- Release v79.0.0 + * Removed support for 'legacy-editable' installs. (#917) +- Add python-setuptools.rpmlintrc for false positives on + requirements + +------------------------------------------------------------------- +Thu Nov 6 15:00:11 UTC 2025 - John Paul Adrian Glaubitz + +- Remove python-rpm-packaging from BuildRequires on SLE-15 + ------------------------------------------------------------------- Mon Oct 27 11:27:05 UTC 2025 - Daniel Garcia diff --git a/python-setuptools.rpmlintrc b/python-setuptools.rpmlintrc new file mode 100644 index 0000000..31b97af --- /dev/null +++ b/python-setuptools.rpmlintrc @@ -0,0 +1,13 @@ +# These are false positives from the importlib call of rpmlint finding setuptools/_vendor/ +addFilter("python-missing-require autocommand") +addFilter("python-missing-require backports.tarfile") +addFilter("python-missing-require inflect") +addFilter("python-missing-require jaraco.context") +addFilter("python-missing-require jaraco.functools") +addFilter("python-missing-require jaraco.text") +addFilter("python-missing-require more-itertools") +addFilter("python-missing-require typeguard") +addFilter("python-missing-require typing-extensions") +addFilter("python-missing-require zipp") +# empty test files +addFilter("zero-length .*/tests/") \ No newline at end of file diff --git a/python-setuptools.spec b/python-setuptools.spec index ce50c37..2ddbd61 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -1,7 +1,7 @@ # # spec file for package python-setuptools # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ %global flavor @BUILD_FLAVOR@%{nil} -%if 0%{?suse_version} >= 1650 +%if 0%{?suse_version} >= 1600 %if "%{flavor}" == "primary" # this one is goes into Ring0: Bootstrap for primary python stack %define pprefix %{primary_python} @@ -51,20 +51,35 @@ ExclusiveArch: do-not-build # in order to avoid rewriting for subpackage generator %define mypython python + +%if "%{flavor}" == "" +%{?pythons_for_pypi} +%endif %{?sle15_python_module_pythons} + +%if "%{flavor}" == "" && "%{shrink:%{pythons}}" == "" +# Exclude for local osc build: unresolvable +%define python_module() empty-python-buildset +# Exclude for obs server +ExclusiveArch: do-not-build +%endif + Name: %{pprefix}-setuptools%{psuffix} -Version: 78.1.1 +Version: 80.9.0 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 +Source99: python-setuptools.rpmlintrc Patch0: sort-for-reproducibility.patch # Bootstrap: Don't BuildRequire pip here! BuildRequires: %{python_module base >= 3.9} BuildRequires: fdupes BuildRequires: python-rpm-macros +%if 0%{?suse_version} > 1500 BuildRequires: python-rpm-packaging +%endif BuildArch: noarch %if %{with test} BuildRequires: %{python_module build} diff --git a/setuptools-78.1.1.tar.gz b/setuptools-78.1.1.tar.gz deleted file mode 100644 index 5a9b4f9..0000000 --- a/setuptools-78.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fcc17fd9cd898242f6b4adfaca46137a9edef687f43e6f78469692a5e70d851d -size 1368163 diff --git a/setuptools-80.9.0.tar.gz b/setuptools-80.9.0.tar.gz new file mode 100644 index 0000000..f215695 --- /dev/null +++ b/setuptools-80.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c +size 1319958 diff --git a/sort-for-reproducibility.patch b/sort-for-reproducibility.patch index bf50513..5cf2812 100644 --- a/sort-for-reproducibility.patch +++ b/sort-for-reproducibility.patch @@ -1,19 +1,6 @@ --- - setuptools/command/easy_install.py | 2 +- setuptools/tests/test_wheel.py | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) ---- a/setuptools/command/easy_install.py -+++ b/setuptools/command/easy_install.py -@@ -436,7 +436,7 @@ class easy_install(Command): - for spec in self.args: - self.easy_install(spec, not self.no_deps) - if self.record: -- outputs = self.outputs -+ outputs = list(sorted(self.outputs)) - if self.root: # strip any package prefix - root_len = len(self.root) - for counter in range(len(outputs)): --- a/setuptools/tests/test_wheel.py +++ b/setuptools/tests/test_wheel.py @@ -417,30 +417,30 @@ WHEEL_INSTALL_TESTS: tuple[dict[str, Any