<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/04326beda85f59299fa46b9f5a8c8452a3043769">https://github.com/macports/macports-ports/commit/04326beda85f59299fa46b9f5a8c8452a3043769</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 04326beda85f59299fa46b9f5a8c8452a3043769
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Apr 5 15:03:23 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-simpy: create separate subport for documentation
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> There is no reason to keep the `doc` variant for compatibility.
</span><span style='display:block; white-space:pre;color:#404040;'> Since it prevented installation of the port, nobody used it.
</span>---
python/py-simpy/Portfile | 61 ++++++++++++++++++++++++++++--------------------
1 file changed, 36 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-simpy/Portfile b/python/py-simpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9547b20e707..5b9882ba3c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-simpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-simpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,22 +27,11 @@ python.versions 36 37 38
</span>
if {${name} eq ${subport}} {
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {![string match *-docs ${subport}]} {
</span> revision 0
depends_build-append port:py${python.version}-setuptools_scm
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant docs description {Install Sphinx-generated docs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py${python.version}-sphinx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-sphinx_rtd_theme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset docs]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/docs "make SPHINXBUILD=${prefix}/bin/sphinx-build-${python.branch} html man"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_test-append port:py${python.version}-pytest
test.run yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,20 +40,42 @@ if {${name} eq ${subport}} {
</span> test.target
test.env PYTHONPATH=${worksrcpath}/build/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset docs]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set doc_build_dir ${worksrcpath}/docs/_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${doc_build_dir}/html/.buildinfo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${doc_build_dir}/html/_sources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${doc_build_dir}/html \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/share/doc/${subport}/examples \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/examples/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${doc_build_dir}/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${python.prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set no_doc_subport [string trimright ${subport} -docs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:${no_doc_subport} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sphinx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sphinx_rtd_theme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${worksrcpath}/docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target html man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args SPHINXBUILD=${prefix}/bin/sphinx-build-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set doc_build_dir ${worksrcpath}/docs/_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${doc_build_dir}/html/.buildinfo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${doc_build_dir}/html/_sources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${doc_build_dir}/html \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/doc/${no_doc_subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${python.prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${doc_build_dir}/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${python.prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/docs/examples \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/examples/${no_doc_subport}
</span> }
livecheck.type none
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v ${python.versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport py${v}[string trimleft $name py]-docs {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>