-
Notifications
You must be signed in to change notification settings - Fork 38
docutils update to new upstream. #1174
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sth0
wants to merge
4
commits into
fink:master
Choose a base branch
from
sth0:sth-docutils-py
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0f5defb
docutils update to new upstream. Split version for old/new build system
sth0 6be838e
Added pygments-py to test depends.
sth0 6f4a057
More cleanup and patch for scripts to use correct python version in d…
sth0 759088e
Updated docutils to version 0.19 for python <= 3.8, fixed PYTHONPATH …
sth0 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
111 changes: 111 additions & 0 deletions
111
10.9-libcxx/stable/main/finkinfo/text/docutils-0181-py.info
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,111 @@ | ||||||
| Info2: << | ||||||
| Package: docutils-py%type_pkg[python] | ||||||
| Type: python (2.7 3.4 3.5 3.6 3.7 3.8) | ||||||
| Version: 0.18.1 | ||||||
| Revision: 1 | ||||||
| Distribution: << | ||||||
| (%type_pkg[python] = 34 ) 10.9, | ||||||
| (%type_pkg[python] = 34 ) 10.10, | ||||||
| (%type_pkg[python] = 34 ) 10.11, | ||||||
| (%type_pkg[python] = 34 ) 10.12, | ||||||
| (%type_pkg[python] = 34 ) 10.13, | ||||||
| (%type_pkg[python] = 34 ) 10.14, | ||||||
| (%type_pkg[python] = 34 ) 10.14.5, | ||||||
| (%type_pkg[python] = 34 ) 10.15, | ||||||
| (%type_pkg[python] = 35 ) 10.9, | ||||||
| (%type_pkg[python] = 35 ) 10.10, | ||||||
| (%type_pkg[python] = 35 ) 10.11, | ||||||
| (%type_pkg[python] = 35 ) 10.12, | ||||||
| (%type_pkg[python] = 35 ) 10.13, | ||||||
| (%type_pkg[python] = 35 ) 10.14, | ||||||
| (%type_pkg[python] = 35 ) 10.14.5, | ||||||
| (%type_pkg[python] = 35 ) 10.15, | ||||||
| (%type_pkg[python] = 36 ) 10.9, | ||||||
| (%type_pkg[python] = 36 ) 10.10, | ||||||
| (%type_pkg[python] = 36 ) 10.11, | ||||||
| (%type_pkg[python] = 36 ) 10.12, | ||||||
| (%type_pkg[python] = 36 ) 10.13, | ||||||
| (%type_pkg[python] = 36 ) 10.14, | ||||||
| (%type_pkg[python] = 36 ) 10.14.5, | ||||||
| (%type_pkg[python] = 36 ) 10.15 | ||||||
| << | ||||||
| Source: https://files.pythonhosted.org/packages/source/d/docutils/docutils-%v.tar.gz | ||||||
| Source-Checksum: SHA256(679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06) | ||||||
|
|
||||||
| Depends: python%type_pkg[python] | ||||||
|
|
||||||
| Conflicts: docutils (<= 0.4-2) | ||||||
| Replaces: docutils (<= 0.4-2) | ||||||
| Provides: docutils | ||||||
|
|
||||||
| CompileScript: << | ||||||
| %p/bin/python%type_raw[python] setup.py build | ||||||
| << | ||||||
|
|
||||||
| InstallScript: << | ||||||
| #!/bin/sh -ev | ||||||
| %p/bin/python%type_raw[python] setup.py install --root %d | ||||||
|
|
||||||
| for i in *.txt ; do | ||||||
| htmldoc=${i%%txt}html | ||||||
| echo "Making $htmldoc" | ||||||
| PYTHONPATH=.:docutils/utils tools/rst2html.py $i $htmldoc | ||||||
| done | ||||||
|
|
||||||
| cd docs | ||||||
| for i in `find . -name '*.txt'` ; do | ||||||
| destdir="%i/share/doc/%n/html/"${i%%/*} | ||||||
| htmldoc=${i%%txt}html | ||||||
| echo "Making $htmldoc" | ||||||
| PYTHONPATH=..:../docutils/utils ../tools/rst2html.py $i $htmldoc | ||||||
| mkdir -p "$destdir" | ||||||
| cp $htmldoc $destdir | ||||||
| done | ||||||
|
|
||||||
| cd %i/bin | ||||||
| for i in rst2* rstpep2html.py; do | ||||||
| mv $i ${i%%.py}-%type_raw[python].py | ||||||
| done | ||||||
| << | ||||||
|
|
||||||
| PostInstScript: << | ||||||
| for i in rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html; do | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| # link name path (source) priority | ||||||
| update-alternatives --install %p/bin/$i $i %p/bin/$i-%type_raw[python].py %type_pkg[python] \ | ||||||
| --slave %p/bin/$i.py $i-py %p/bin/$i-%type_raw[python].py | ||||||
| done | ||||||
| << | ||||||
|
|
||||||
| PreRmScript: << | ||||||
| if [ $1 != "upgrade" ]; then | ||||||
| for i in rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html; do | ||||||
|
sth0 marked this conversation as resolved.
Outdated
|
||||||
| update-alternatives --remove $i %p/bin/$i-%type_raw[python].py | ||||||
| update-alternatives --remove $i-py %p/bin/$i-%type_raw[python].py | ||||||
| done | ||||||
| fi | ||||||
| << | ||||||
|
|
||||||
| DocFiles: README.html BUGS.html COPYING.html HISTORY.html FAQ.html THANKS.html | ||||||
|
|
||||||
| Description: Python-approved WYSIWYG text markup toolkit | ||||||
| DescDetail: << | ||||||
| Docutils is an open-source text processing system for processing | ||||||
| plaintext documentation into useful formats, such as HTML or LaTeX. It | ||||||
| includes reStructuredText, the easy to read, easy to use, | ||||||
| what-you-see-is-what-you-get plaintext markup language. | ||||||
|
|
||||||
| Converters included: | ||||||
|
|
||||||
| * rst2html | ||||||
| * rst2latex | ||||||
| * rst2s5 | ||||||
| ... etc. | ||||||
| << | ||||||
|
|
||||||
| License: GPL | ||||||
| Homepage: http://docutils.sourceforge.net/ | ||||||
| #Maintainer: Brendan Cully <bcully@users.sourceforge.net> | ||||||
| Maintainer: Charles Lepple <clepple+fink@ghz.cc> | ||||||
|
|
||||||
| # closes Info2: | ||||||
| << | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Ah, that is python version not a spoken language version that is the problem.
should the line
cp %b/tools/rstpep2html.py %i/binalso be python versioned? Something like this to be consistent?
cp %b/tools/rstpep2html.py %i/bin/rstpep2html-%type_raw[python].py(This is only in the docutils-py.info since version 0.21.2 build rstpep2html in a different directory.)
So now the only error is that the mathematics.html docs file has all this unknown TeX/LaTeX symbols. Should TeX be a prerequisite? At the moment I can't build TeXLive due to errors and test.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yes, I missed there are two distribution versions. Since it's also installed into
%i/bin, it should need to be python-versioned or validation should fail as well.TeXLive would be a quite heavy dependency, though probably a recommendation, as one of the principal outputs is to LaTeX format. It would seem like it has its own TeX parser if it gets that far though, just having problems with some mathtex commands.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, TeXLive would be a heavy lift. But if it has its own TeX parser why is the building of the documentation failing like that? If I can get TeXLive built and installed, I will see if the errors go away. Probably but something in the build notes that the mathematics documentation doesn't build unless you have it installed?
But still baffled by inability to get TeXLive-texmf to install.