<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/79d25538202170326c2a0f8e890dac731bbf9449">https://github.com/macports/macports-ports/commit/79d25538202170326c2a0f8e890dac731bbf9449</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 79d25538202170326c2a0f8e890dac731bbf9449
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Jun 9 22:14:11 2025 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-sphinxcontrib-versioning: remove obsolete port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - not compatible with newer Sphinx versions
</span>---
python/py-sphinxcontrib-versioning/Portfile | 50 ----------------------
.../patch-sphinxcontrib_versioning_sphinx_.py.diff | 19 --------
.../files/patch-tests_conftest.py.diff | 27 ------------
.../patch-tests_test_main_push_scenarios.py.diff | 23 ----------
4 files changed, 119 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sphinxcontrib-versioning/Portfile b/python/py-sphinxcontrib-versioning/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 435e5bf55f6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sphinxcontrib-versioning/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup sphinx-contrib sphinxcontrib-versioning 2.2.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Change github.tarball_from to 'releases' or 'archive' next update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from tarball
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name py-${github.project}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories-append devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms {darwin any}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Sphinx extension that allows building versioned \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- docs for self-hosting.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d8968af5f62fa35381c48979642092aefc248403 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7c38140e71ae2fc63b0668b7ec5671c7dbb4b41a1ac4ffe88acca980b960b87c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2378524
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-click \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-colorclass \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-sphinx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix for newer versions of Sphinx and pytest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-sphinxcontrib_versioning_sphinx_.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tests_conftest.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tests_test_main_push_scenarios.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # FIXME: even with the current upstream patches applied, the tests do not pass.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set docdir ${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} LICENSE README.rst \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${docdir}
</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;color:#808080;'>diff --git a/python/py-sphinxcontrib-versioning/files/patch-sphinxcontrib_versioning_sphinx_.py.diff b/python/py-sphinxcontrib-versioning/files/patch-sphinxcontrib_versioning_sphinx_.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7b17d344c89..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sphinxcontrib-versioning/files/patch-sphinxcontrib_versioning_sphinx_.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see PR 78
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/sphinx-contrib/sphinxcontrib-versioning/pull/78/commits/d6d0260e42223889aa1b14c742a3958279848a2d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sphinxcontrib/versioning/sphinx_.py.orig 2020-02-12 09:14:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sphinxcontrib/versioning/sphinx_.py 2020-02-12 09:15:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--from sphinx import application, build_main, locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from sphinx import application, locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from sphinx import build_main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Sphinx 1.7+ ImportError fix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from sphinx.cmd.build import build_main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from sphinx.builders.html import StandaloneHTMLBuilder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from sphinx.config import Config as SphinxConfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from sphinx.errors import SphinxError
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sphinxcontrib-versioning/files/patch-tests_conftest.py.diff b/python/py-sphinxcontrib-versioning/files/patch-tests_conftest.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 057b273f38f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sphinxcontrib-versioning/files/patch-tests_conftest.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see upstream commit:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/sphinx-contrib/sphinxcontrib-versioning/commit/91e97376559bb25199120ea1ece93e1b67e843aa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/conftest.py.orig 2020-02-12 09:24:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/conftest.py 2020-02-12 09:26:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,17 +45,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return run_command(str(directory), [str(i) for i in command], *args, **kwargs)
</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;'>--def pytest_namespace():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def pytest_configure():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Add objects to the pytest namespace. Can be retrieved by importing pytest and accessing pytest.<name>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- :return: Namespace dict.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- :rtype: dict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return dict(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- author_committer_dates=author_committer_dates,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ROOT_TS=ROOT_TS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run=run,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pytest.author_committer_dates = author_committer_dates
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pytest.ROOT_TS = ROOT_TS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pytest.run = run
</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;'>- @pytest.fixture
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sphinxcontrib-versioning/files/patch-tests_test_main_push_scenarios.py.diff b/python/py-sphinxcontrib-versioning/files/patch-tests_test_main_push_scenarios.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 06c0d401809..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sphinxcontrib-versioning/files/patch-tests_test_main_push_scenarios.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see upstream commit:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/sphinx-contrib/sphinxcontrib-versioning/commit/cf18bd40f3e6547a718670b8126796a6042746b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/test__main__/test_main_push_scenarios.py.orig 2020-02-12 09:31:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/test__main__/test_main_push_scenarios.py 2020-02-12 09:30:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,7 +235,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if remove:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with pytest.raises(CalledProcessError) as exc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pytest.run(local_docs_ghp, ['git', 'checkout', 'origin/gh-pages'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- assert "origin/gh-pages' did not match any file(s) known to git." in exc.value.output
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert "origin/gh-pages' did not match any file(s) known to git" in exc.value.output
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pytest.run(local_docs_ghp, ['git', 'checkout', 'origin/gh-pages'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pytest.run(local_docs_ghp, ['git', 'pull', 'origin', 'gh-pages'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -261,7 +261,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if remove:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with pytest.raises(CalledProcessError) as exc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pytest.run(local_docs_ghp, ['git', 'checkout', 'origin/gh-pages'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- assert "origin/gh-pages' did not match any file(s) known to git." in exc.value.output
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert "origin/gh-pages' did not match any file(s) known to git" in exc.value.output
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pytest.run(local_docs_ghp, ['git', 'checkout', 'origin/gh-pages'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pytest.run(local_docs_ghp, ['git', 'pull', 'origin', 'gh-pages'])
</span></pre><pre style='margin:0'>
</pre>