#22 Update to 3.2.1
Merged 3 years ago by churchyard. Opened 3 years ago by churchyard.
rpms/ churchyard/python-sphinx 3.2.1  into  master

file modified
+1
@@ -24,3 +24,4 @@ 

  /Sphinx-2.2.2.tar.gz

  /Sphinx-3.1.1.tar.gz

  /Sphinx-3.1.2.tar.gz

+ /Sphinx-3.2.1.tar.gz

file modified
+8 -9
@@ -21,7 +21,7 @@ 

  %global upstream_name Sphinx

  

  Name:       python-sphinx

- %global     general_version 3.1.2

+ %global     general_version 3.2.1

  #global     prerel ...

  %global     upstream_version %{general_version}%{?prerel}

  Version:    %{general_version}%{?prerel:~%{prerel}}
@@ -294,12 +294,10 @@ 

  %install

  %py3_install

  

- # For backwards compatibility. Remove around Fedora 33 (with care)

- install -d %{buildroot}%{_libexecdir}/python%{python3_pkgversion}-sphinx

+ # For backwards compatibility. Remove with care, if at all

  for i in sphinx-{apidoc,autogen,build,quickstart}; do

      ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}

      ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-3

-     ln -s %{_bindir}/$i %{buildroot}%{_libexecdir}/python%{python3_pkgversion}-sphinx/$i

  done

  

  # Clean up non-python files
@@ -353,11 +351,8 @@ 

  

  %if %{with tests}

  %check

- export PYTHONPATH=%{buildroot}%{python3_sitelib}

- export PATH=%{buildroot}%{_bindir}:$PATH

- 

  # Currently, all linkcheck tests and test_latex_images need internet

- %{__python3} -m pytest \

+ %pytest \

  %if %{without internet}

      -k "not linkcheck and not test_latex_images" \

  %endif
@@ -372,7 +367,6 @@ 

  %{python3_sitelib}/sphinx/

  %dir %{python3_sitelib}/sphinxcontrib/

  %{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/

- %{_libexecdir}/python%{python3_pkgversion}-sphinx/

  %dir %{_datadir}/sphinx/

  %dir %{_datadir}/sphinx/locale

  %dir %{_datadir}/sphinx/locale/*
@@ -389,6 +383,11 @@ 

  

  

  %changelog

+ * Tue Aug 18 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.2.1-1

+ - Update to 3.2.1

+ - Remove compatibility symbolic links from /usr/libexec/

+ - Fixes rhbz#1867294

+ 

  * Fri Aug 07 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.1.2-1

  - Update to 3.1.2

  - Fixes rhbz#1853901

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (Sphinx-3.1.2.tar.gz) = d1b55a603ea4a76d2315e170b8ba7858caf1658660e9983034918bd265c505f0e5157ab9d9cebc970261646ae0959e1cf75562b01b73bf3a380e712393a735b9

+ SHA512 (Sphinx-3.2.1.tar.gz) = 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb

rebased onto 5bf9c06

3 years ago

I've accidentally also removed /usr/bin/sphinx-build-3 which is widely used everywhere. Rebased and will restart all failed builds.

https://copr.fedorainfracloud.org/coprs/g/python/sphinx-3.2.x/package/libgpuarray/

Error: 
 Problem: package python3-breathe-4.19.2-2.fc33.noarch requires (python3.9dist(sphinx) < 3.2 with python3.9dist(sphinx) >= 3), but none of the providers can be installed
  - cannot install both python3-sphinx-1:3.1.2-1.fc33.noarch and python3-sphinx-1:3.2.1-1.fc34.noarch
  - cannot install the best candidate for the job

@defolos Is this fixable? Can breathe work with Sphinx 3.2?

https://copr.fedorainfracloud.org/coprs/g/python/sphinx-3.2.x/package/python-graphql-core/

+ sphinx-build-3 docs html
Running Sphinx v3.2.1
making output directory... done
building [mo]: targets for 0 po files that are out of date
building [html]: targets for 23 source files that are out of date
updating environment: [new config] 23 added, 0 changed, 0 removed
reading sources... [  4%] diffs
reading sources... [  8%] index
reading sources... [ 13%] intro
reading sources... [ 17%] modules/error

Exception occurred:
  File "/usr/lib/python3.9/site-packages/sphinx/ext/autodoc/__init__.py", line 97, in members_option
    return [x.strip() for x in arg.split(',') if x.strip()]
AttributeError: 'bool' object has no attribute 'split'

cc @fab

https://copr.fedorainfracloud.org/coprs/g/python/sphinx-3.2.x/package/python-fslpy/

It appears that the tests fail with this with new Sphinx:

==================================== ERRORS ====================================
__________ ERROR collecting tests/test_scripts/test_fsl_convert_x5.py __________
ImportError while importing test module '/builddir/build/BUILD/fslpy-3.2.0/tests/test_scripts/test_fsl_convert_x5.py'.
Hint: make sure your test modules/packages have valid Python names.
Traceback:
/usr/lib64/python3.9/importlib/__init__.py:127: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
tests/test_scripts/test_fsl_convert_x5.py:14: in <module>
    import fsl.transform.x5     as x5
fsl/transform/x5.py:329: in <module>
    import h5py
/usr/lib64/python3.9/site-packages/h5py/__init__.py:49: in <module>
    from .h5z import _register_lzf
E   ImportError: liblzf.so.1: cannot open shared object file: No such file or directory
_______________ ERROR collecting tests/test_transform/test_x5.py _______________
ImportError while importing test module '/builddir/build/BUILD/fslpy-3.2.0/tests/test_transform/test_x5.py'.
Hint: make sure your test modules/packages have valid Python names.
Traceback:
/usr/lib64/python3.9/importlib/__init__.py:127: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
tests/test_transform/test_x5.py:13: in <module>
    import h5py
/usr/lib64/python3.9/site-packages/h5py/__init__.py:49: in <module>
    from .h5z import _register_lzf
E   ImportError: liblzf.so.1: cannot open shared object file: No such file or directory

However that is only happening with the newly built python3-h5py from that very copr. CCing @terjeros in casa I've uncovered some unrelated problem in there and in the meantime, deleting the h5py build from the test copr and resubmitting python-fslpy.

This also affects:

https://copr.fedorainfracloud.org/coprs/g/python/sphinx-3.2.x/package/libgpuarray/

Error: Problem: package python3-breathe-4.19.2-2.fc33.noarch requires (python3.9dist(sphinx) < 3.2 with python3.9dist(sphinx) >= 3), but none of the providers can be installed - cannot install both python3-sphinx-1:3.1.2-1.fc33.noarch and python3-sphinx-1:3.2.1-1.fc34.noarch - cannot install the best candidate for the job

@defolos Is this fixable? Can breathe work with Sphinx 3.2?

Yes it is, breathe should work out of the box with sphinx 3.2. I can push a patch to breathe later today, is it sufficient if I rebuild it in rawhide?

I was thinking of pushing this to f33 as well, but that depends on the amount of breakage. I have not yet evaluated it all.

I was thinking of pushing this to f33 as well, but that depends on the amount of breakage. I have not yet evaluated it all.

I have pushed a fix to Rawhide and f33. breathe should be rebuild in the next few minutes.

OK, the only package affected is python-graphql-core now. I think that is fine and we can ship this. @fab I can help you fix the package if you want to.

Pull-Request has been merged by churchyard

3 years ago

I've reported the failure to Sphinx upstream. Hopefully they will be able to debug this more. https://github.com/sphinx-doc/sphinx/issues/8143

I was thinking of pushing this to f33 as well, but that depends on the amount of breakage. I have not yet evaluated it all.

I would say that F34 and F33 have not diverged significantly, so I would be in favor of pushing the update to F33.

I would say that F34 and F33 have not diverged significantly, so I would be in favor of pushing the update to F33.

I have pushed breathe to f33 as well, so there shouldn't be any issues from that side (I hope).

I was thinking of pushing this to f33 as well, but that depends on the amount of breakage. I have not yet evaluated it all.

I would say that F34 and F33 have not diverged significantly, so I would be in favor of pushing the update to F33.

Yes, this was already done.