- added missing patch (docs template file missing in sdist)

- updated dependencies
- build docs without tox wrapper and network-based venv creation

diff --git a/python3-setuptools.spec b/python3-setuptools.spec
index d584c862a3320c02f34576fa6bad9b231c408419..89ad5cf48ff654b4ac87cf05c673d7aee0a939a8 100644 (file)
--- a/python3-setuptools.spec
+++ b/python3-setuptools.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_without apidocs         # Sphinx based documentation
-%bcond_with    system_libs     # use system modules (appdirs, packaging, pyparsing, six) # TODO
+%bcond_with    system_libs     # use system modules (appdirs, packaging, pyparsing) # TODO
 %bcond_with    tests           # py.test tests (few failures)
 %bcond_with    bootstrap       # convenience alias for without: apidocs,system_libs,tests
 
@@ -24,53 +24,60 @@ Group:              Development/Languages/Python
 #Source0Download: https://pypi.org/simple/setuptools/
 Source0:       https://files.pythonhosted.org/packages/source/s/setuptools/%{pypi_name}-%{version}.tar.gz
 # Source0-md5: 09f693b5d5ca8bf4fdb1da82f8110a9c
+Patch0:                setuptools-missing.patch
 URL:           https://github.com/pypa/setuptools
 %if %(locale -a | grep -q '^C\.utf8$'; echo $?)
 BuildRequires: glibc-localedb-all
 %endif
-BuildRequires: python3-modules >= 1:3.4
+BuildRequires: python3-modules >= 1:3.6
 %if %{with system_libs}
 # versions from pkg_resources/_vendor/vendored.txt
 BuildRequires: python3-appdirs >= 1.4.3
-BuildRequires: python3-packaging >= 19.2
+BuildRequires: python3-packaging >= 20.4
 BuildRequires: python3-pyparsing >= 2.2.1
-BuildRequires: python3-six >= 1.10.0
 %endif
 BuildConflicts:        python3-distribute < 0.7
 %if %{with tests}
+BuildRequires: python3-Sphinx
 BuildRequires: python3-coverage >= 4.5.1
+BuildRequires: python3-flake8-2020
+BuildRequires: python3-jaraco.envs
+BuildRequires: python3-jaraco.path >= 3.2.0
 # FIXME: patch to use unittest.mock
 #BuildRequires:        python3-mock
-%if "%{py3_ver}" >= "3.6"
 BuildRequires: python3-paver
-%endif
 BuildRequires: python3-pip >= 19.1
-BuildRequires: python3-pytest >= 3.7
+BuildRequires: python3-pytest >= 4.6
+BuildRequires: python3-pytest-black >= 0.3.7
+BuildRequires: python3-pytest-checkdocs >= 2.4
 BuildRequires: python3-pytest-cov >= 2.5.1
-BuildRequires: python3-pytest-fixture-config
+BuildRequires: python3-pytest-enabler >= 1.0.1
 BuildRequires: python3-pytest-flake8
+BuildRequires: python3-pytest-mypy
 BuildRequires: python3-pytest-virtualenv >= 1.2.7
+BuildRequires: python3-pytest-xdist
 BuildRequires: python3-virtualenv >= 13.0.0
 BuildRequires: python3-wheel
 %endif
 %if %{with apidocs}
+BuildRequires: python3-Sphinx
 BuildRequires: python3-jaraco
-BuildRequires: python3-jaraco.packaging >= 6.1
+BuildRequires: python3-jaraco.packaging >= 8.2
 BuildRequires: python3-rst.linker >= 1.9
-BuildRequires: python3-setuptools >= 34
-BuildRequires: python3-tox
-BuildRequires: sphinx-pdg-3 >= 1.4
+# specified but not required(?)
+#BuildRequires:        python3-pygments-github-lexers >= 0.0.5
+BuildRequires: python3-setuptools >= 1:34
+BuildRequires: python3-sphinx_inline_tabs
 %endif
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.714
 BuildRequires: unzip
-Requires:      python3-modules
+Requires:      python3-modules >= 1:3.6
 %if %{with system_libs}
 # versions from pkg_resources/_vendor/vendored.txt
-Requires:      python3-appdirs >= 1.4.0
-Requires:      python3-packaging >= 16.8
-Requires:      python3-pyparsing >= 2.1.10
-Requires:      python3-six >= 1.10.0
+Requires:      python3-appdirs >= 1.4.3
+Requires:      python3-packaging >= 20.4
+Requires:      python3-pyparsing >= 2.2.1
 %endif
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -102,6 +109,7 @@ Dokumentacja API %{module}.
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
 
 %if %{with system_libs}
 exit 1 # TODO: unvendor modules from pkg_resources/_vendor
@@ -114,7 +122,8 @@ LC_ALL=C.UTF-8 \
 %{?with_tests:%{__python3} -m pytest pkg_resources/tests setuptools/tests tests}
 
 %if %{with apidocs}
-%{_bindir}/tox -e docs
+cd docs
+%{__python3} -m sphinx -W . build/html
 %endif
 
 %install
@@ -128,8 +137,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGES.rst LICENSE README.rst
-%{py3_sitescriptdir}//distutils-precedence.pth
 %{py3_sitescriptdir}/_distutils_hack
+%{py3_sitescriptdir}/distutils-precedence.pth
 %{py3_sitescriptdir}/pkg_resources
 %{py3_sitescriptdir}/setuptools
 %{py3_sitescriptdir}/%{module}-%{version}-py*.egg-info
@@ -137,5 +146,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%doc docs/build/html/{_static,*.html,*.js}
+%doc docs/build/html/{_static,deprecated,development,references,userguide,*.html,*.js}
 %endif

diff --git a/setuptools-missing.patch b/setuptools-missing.patch
new file mode 100644 (file)
index 0000000..27818d2
--- /dev/null
+++ b/setuptools-missing.patch
@@ -0,0 +1,9 @@
+--- setuptools-54.2.0/docs/_templates/tidelift-sidebar.html.orig       1970-01-01 01:00:00.000000000 +0100
++++ setuptools-54.2.0/docs/_templates/tidelift-sidebar.html    2021-12-16 22:44:13.068337307 +0100
+@@ -0,0 +1,6 @@
++<h3 class="donation">For Enterprise</h3>
++
++<p>
++Professionally-supported {{ project }} is available with the
++<a href="https://tidelift.com/subscription/pkg/pypi-{{ project }}?utm_source=pypi-{{ project }}&utm_medium=referral">Tidelift Subscription</a>.
++</p>