Accepting request 1105292 from devel:languages:python

revert, was breaking setuptools_scm and Sphinx

OBS-URL: https://build.opensuse.org/request/show/1105292
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=249

python-setuptools.changes

@@ -1,16 +1,3 @@
--------------------------------------------------------------------
-Wed Aug 16 07:53:31 UTC 2023 - Markéta Machová <mmachova@suse.com>
-
-- update to 68.1.0
-  * Removed code referencing bdist_wininst in install_scripts. 
-  * Promote pyproject.toml’s [tool.setuptools] out of beta.
-  * Automatically add files listed in Extension.depends to sdists, 
-    as long as they are contained in the project directory 
-  * Require Python 3.8 or later.
-  * Use default encoding to create .pth files with editable_wheel.
-  * Detects (and complain about) scripts and gui-scripts set via 
-    setup.py when pyproject.toml does not include them in dynamic.
-
 -------------------------------------------------------------------
 Sun Aug 13 18:25:04 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

python-setuptools.spec

@@ -38,7 +38,7 @@
 %define mypython python
 %{?sle15_python_module_pythons}
 Name:           python-setuptools%{psuffix}
-Version:        68.1.0
+Version:        68.0.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
@@ -61,7 +61,6 @@ BuildRequires:  %{python_module build}
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module filelock >= 3.4.0}
 BuildRequires:  %{python_module ini2toml-lite >= 0.9}
-BuildRequires:  %{python_module jaraco.develop >= 7.21}
 BuildRequires:  %{python_module jaraco.envs >= 2.2}
 BuildRequires:  %{python_module jaraco.path >= 3.2.0}
 BuildRequires:  %{python_module pip >= 19.1}
@@ -125,7 +124,7 @@ donttest+=" or test_pbr_integration"
 %files %{python_files}
 %if !%{with wheel}
 %license LICENSE
-%doc NEWS.rst README.rst
+%doc CHANGES.rst README.rst
 %{python_sitelib}/setuptools
 %{python_sitelib}/setuptools-%{version}*-info
 %dir %{python_sitelib}/pkg_resources

setuptools-68.0.0.tar.gz

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

setuptools-68.1.0.tar.gz

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

sort-for-reproducibility.patch

@@ -6,11 +6,9 @@
  setuptools/tests/test_wheel.py     |    8 ++++----
  5 files changed, 8 insertions(+), 8 deletions(-)
 
-Index: setuptools-68.1.0/setuptools/command/easy_install.py
+--- a/setuptools/command/easy_install.py
-===================================================================
++++ b/setuptools/command/easy_install.py
---- setuptools-68.1.0.orig/setuptools/command/easy_install.py
+@@ -419,7 +419,7 @@ class easy_install(Command):
-+++ setuptools-68.1.0/setuptools/command/easy_install.py
-@@ -441,7 +441,7 @@ class easy_install(Command):
              for spec in self.args:
                  self.easy_install(spec, not self.no_deps)
              if self.record:
@@ -19,24 +17,20 @@ Index: setuptools-68.1.0/setuptools/command/easy_install.py
                  if self.root:  # strip any package prefix
                      root_len = len(self.root)
                      for counter in range(len(outputs)):
-Index: setuptools-68.1.0/setuptools/command/egg_info.py
+--- a/setuptools/command/egg_info.py
-===================================================================
++++ b/setuptools/command/egg_info.py
---- setuptools-68.1.0.orig/setuptools/command/egg_info.py
+@@ -694,7 +694,7 @@ def _write_requirements(stream, reqs):
-+++ setuptools-68.1.0/setuptools/command/egg_info.py
+ 
-@@ -698,7 +698,7 @@ def _write_requirements(stream, reqs):
      def append_cr(line):
          return line + '\n'
- 
 -    lines = map(append_cr, lines)
 +    lines = map(append_cr, sorted(lines))
      stream.writelines(lines)
  
  
-Index: setuptools-68.1.0/setuptools/dist.py
+--- a/setuptools/dist.py
-===================================================================
++++ b/setuptools/dist.py
---- setuptools-68.1.0.orig/setuptools/dist.py
+@@ -221,7 +221,7 @@ def write_pkg_file(self, file):  # noqa:
-+++ setuptools-68.1.0/setuptools/dist.py
-@@ -215,7 +215,7 @@ def write_pkg_file(self, file):  # noqa:
      if self.long_description_content_type:
          write_field('Description-Content-Type', self.long_description_content_type)
      if self.provides_extras:
@@ -45,11 +39,9 @@ Index: setuptools-68.1.0/setuptools/dist.py
              write_field('Provides-Extra', extra)
  
      self._write_list(file, 'License-File', self.license_files or [])
-Index: setuptools-68.1.0/setuptools/tests/test_egg_info.py
+--- a/setuptools/tests/test_egg_info.py
-===================================================================
++++ b/setuptools/tests/test_egg_info.py
---- setuptools-68.1.0.orig/setuptools/tests/test_egg_info.py
+@@ -304,8 +304,8 @@ class TestEggInfo:
-+++ setuptools-68.1.0/setuptools/tests/test_egg_info.py
-@@ -353,8 +353,8 @@ class TestEggInfo:
              wheel>=0.5
              pytest
  
@@ -57,13 +49,11 @@ Index: setuptools-68.1.0/setuptools/tests/test_egg_info.py
          pytest
 +        wheel>=0.5
          ''',
+ 
          '''
-         install_requires_ordered
+--- a/setuptools/tests/test_wheel.py
-Index: setuptools-68.1.0/setuptools/tests/test_wheel.py
++++ b/setuptools/tests/test_wheel.py
-===================================================================
+@@ -423,30 +423,30 @@ WHEEL_INSTALL_TESTS = (
---- setuptools-68.1.0.orig/setuptools/tests/test_wheel.py
-+++ setuptools-68.1.0/setuptools/tests/test_wheel.py
-@@ -424,30 +424,30 @@ WHEEL_INSTALL_TESTS = (
      dict(
          id='requires_ensure_order',
          install_requires='''