[main] Adding `python-sphinxcontrib-serializinghtml` to fix `python-sphinxcontrib-websupport` dependency. (#2600)

* Adding 'python-sphinxcontrib-serializinghtml'.

* Reverting 'python-pytest-xdist' to 2.1.0

* Removing unused and unavailable BR from 'python-sqlalchemy'.

SPECS/LICENSES-AND-NOTICES/data/licenses.json

@@ -1881,6 +1881,7 @@
                 "python-sphinx_rtd_theme",
                 "python-sphinxcontrib-apidoc",
                 "python-sphinxcontrib-httpdomain",
+                "python-sphinxcontrib-serializinghtml",
                 "python-sqlalchemy",
                 "python-stestr",
                 "python-stevedore",

SPECS/python-pytest-xdist/python-pytest-xdist.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "pytest-xdist-2.5.0.tar.gz": "4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"
+  "pytest-xdist-2.1.0.tar.gz": "82d938f1a24186520e2d9d3a64ef7d9ac7ecdf1a0659e095d18e596b8cbd0672"
  }
 }

SPECS/python-pytest-xdist/python-pytest-xdist.spec

@@ -14,13 +14,13 @@ The pytest-xdist plugin extends py.test with some unique test execution modes:
   different platforms and run tests in parallel on all of them.}
 Summary:        py.test plugin for distributed testing and loop-on-failing modes
 Name:           python-%{pypi_name}
-Version:        2.5.0
+Version:        2.1.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://github.com/pytest-dev/pytest-xdist
-Source0:        https://files.pythonhosted.org/packages/5d/43/9dbc32d297d6eae85d6c05dc8e8d3371061bd6cbe56a2f645d9ea4b53d9b/%{pypi_name}-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/17/18/bb102b7131f1c08e5d9f0a6a5904e0b4cf02160bdde1645fc386461b5423/%{pypi_name}-%{version}.tar.gz
 BuildRequires:  python3-devel
 BuildRequires:  python3-execnet >= 1.1
 BuildRequires:  python3-filelock
@@ -68,15 +68,12 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \
     python%{python3_version} -m pytest -v  -k "not test_warning_captured_deprecated_in_pytest_6"
 
 %files -n python3-%{pypi_name}
-%doc README.rst
+%doc OVERVIEW.md README.rst
 %license LICENSE
 %{python3_sitelib}/pytest_xdist*
 %{python3_sitelib}/xdist/
 
 %changelog
-* Fri Mar 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.5.0-1
-- Updating to version 2.5.0.
-
 * Wed Jun 23 2021 Rachel Menge <rachelmenge@microsoft.com> - 2.1.0-3
 - Update check section to use pytest module
 - License verified

SPECS/python-sphinxcontrib-serializinghtml/python-sphinxcontrib-serializinghtml.signatures.json

@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "sphinxcontrib-serializinghtml-1.1.5.tar.gz": "aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"
+ }
+}

SPECS/python-sphinxcontrib-serializinghtml/python-sphinxcontrib-serializinghtml.spec

@@ -0,0 +1,132 @@
+%global pypi_name sphinxcontrib-serializinghtml
+
+Summary:        Sphinx extension for serialized HTML
+Name:           python-%{pypi_name}
+Version:        1.1.5
+Release:        4%{?dist}
+License:        BSD
+Vendor:         Microsoft Corporation
+Distribution:   Mariner
+URL:            https://www.sphinx-doc.org/en/master/
+Source0:        https://files.pythonhosted.org/packages/b5/72/835d6fadb9e5d02304cf39b18f93d227cd93abd3c41ebf58e6853eeb1455/%{pypi_name}-%{version}.tar.gz
+
+BuildArch:      noarch
+
+BuildRequires:  gettext
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+
+%if %{with_check}
+BuildRequires:  python3-pytest
+BuildRequires:  python3-sphinx
+%endif
+
+%description
+sphinxcontrib-serializinghtml is a sphinx extension which outputs "serialized"
+HTML files (json and pickle).
+
+%package -n     python3-%{pypi_name}
+%{?python_provide:%python_provide python3-%{pypi_name}}
+Summary:        %{summary}
+
+%description -n python3-%{pypi_name}
+sphinxcontrib-serializinghtml is a sphinx extension which outputs "serialized"
+HTML files (json and pickle).
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+find -name '*.mo' -delete
+
+
+%build
+for po in $(find -name '*.po'); do
+  msgfmt --output-file=${po%.po}.mo ${po}
+done
+%py3_build
+
+
+%install
+%py3_install
+
+# Move language files to /usr/share
+pushd %{buildroot}%{python3_sitelib}
+for lang in `find sphinxcontrib/serializinghtml/locales -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
+do
+  test $lang == __pycache__ && continue
+  install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
+  mv sphinxcontrib/serializinghtml/locales/$lang/LC_MESSAGES/*.mo %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/
+done
+rm -rf sphinxcontrib/serializinghtml/locales
+ln -s %{_datadir}/locale sphinxcontrib/serializinghtml/locales
+popd
+
+
+%find_lang sphinxcontrib.serializinghtml
+
+
+%check
+%pytest
+
+%files -n python3-%{pypi_name} -f sphinxcontrib.serializinghtml.lang
+%license LICENSE
+%doc README.rst
+%{python3_sitelib}/sphinxcontrib/
+%{python3_sitelib}/sphinxcontrib_serializinghtml-%{version}-py%{python3_version}-*.pth
+%{python3_sitelib}/sphinxcontrib_serializinghtml-%{version}-py%{python3_version}.egg-info/
+
+%changelog
+* Sun Mar 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1.5-4
+- Initial CBL-Mariner import from Fedora 36 (license: MIT).
+- License verified.
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 11 2021 Karolina Surma <ksurma@redhat.com> - 1.1.5-1
+- Update to 1.1.5
+Resolves: rhbz#1963359
+
+* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.1.4-5
+- Rebuilt for Python 3.10
+
+* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 1.1.4-4
+- Bootstrap for Python 3.10
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.1.4-1
+- Update to 1.1.4 (#1808637)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-8
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-7
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-4
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-3
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon May 20 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-1
+- Update to 1.1.3 (#1697444)
+
+* Mon Mar 04 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-1
+- Initial package.

SPECS/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport.spec

@@ -2,7 +2,7 @@
 Summary:        Python API to integrate Sphinx into a web application
 Name:           python-%{pkgname}
 Version:        1.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -21,7 +21,9 @@ BuildRequires:  python3-xml
 %if %{with check}
 BuildRequires:  python3-pip
 %endif
+
 Requires:       python3
+Requires:       python3-sphinxcontrib-serializinghtml
 
 %description -n python3-%{pkgname}
 The python-sphinxcontrib-websupport package provides a Python API to easily integrate Sphinx documentation into your Web application.
@@ -48,6 +50,9 @@ tox
 %{python3_sitelib}/*.pth
 
 %changelog
+* Sun Mar 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.4-2
+- Adding a dependency on "python3-sphinxcontrib-serializinghtml".
+
 * Fri Mar 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.4-1
 - Updating to version 1.2.4.
 

SPECS/python-sqlalchemy/python-sqlalchemy.spec

@@ -32,7 +32,6 @@ BuildRequires:  python3-devel >= 3.6
 BuildRequires:  python3-execnet
 BuildRequires:  python3-greenlet >= 1.0
 BuildRequires:  python3-pip
-BuildRequires:  python3-pluggy
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-six
 
@@ -103,6 +102,7 @@ PYTHONPATH=. python3 -m pytest test --numprocesses=auto
 %changelog
 * Thu Mar 24 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.4.32-2
 - Initial CBL-Mariner import from Fedora 36 (license: MIT).
+- Removed unused BR on 'python3-pluggy'.
 - License verified.
 
 * Tue Mar 08 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.32-1

cgmanifest.json

@@ -23854,8 +23854,8 @@
         "type": "other",
         "other": {
           "name": "python-pytest-xdist",
-          "version": "2.5.0",
+          "version": "2.1.0",
-          "downloadUrl": "https://files.pythonhosted.org/packages/5d/43/9dbc32d297d6eae85d6c05dc8e8d3371061bd6cbe56a2f645d9ea4b53d9b/pytest-xdist-2.5.0.tar.gz"
+          "downloadUrl": "https://files.pythonhosted.org/packages/17/18/bb102b7131f1c08e5d9f0a6a5904e0b4cf02160bdde1645fc386461b5423/pytest-xdist-2.1.0.tar.gz"
         }
       }
     },
@@ -24299,6 +24299,16 @@
         }
       }
     },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "python-sphinxcontrib-serializinghtml",
+          "version": "1.1.5",
+          "downloadUrl": "https://files.pythonhosted.org/packages/b5/72/835d6fadb9e5d02304cf39b18f93d227cd93abd3c41ebf58e6853eeb1455/sphinxcontrib-serializinghtml-1.1.5.tar.gz"
+        }
+      }
+    },
     {
       "component": {
         "type": "other",