<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/64f358934319323294ae31808c840f5f0a3ce360">https://github.com/macports/macports-ports/commit/64f358934319323294ae31808c840f5f0a3ce360</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 64f358934319323294ae31808c840f5f0a3ce360
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Oct 1 21:42:47 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-spyder: remove jedi versioning cap, remove py37 subport
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/68244
</span>---
 python/py-spyder/Portfile                          | 12 ++++--------
 python/py-spyder/files/patch-jedi-version-cap.diff | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/Portfile b/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 756cf45341e..75646e28649 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup           select 1.0
</span> github.setup        spyder-ide spyder 5.4.5 v
 github.tarball_from archive
 name                py-spyder
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> # the epoch is here for historical reasons and cannot be removed
 epoch               20111202
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ checksums           rmd160  f7f942b576a14b78554104306686bf8bebd2970c \
</span>                     sha256  ab50960bfe496c475e78336fd614eb4ebef485ea4e18fc3eb5130228ec2eb2d1 \
                     size    16214117
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions     37 38 39 310 311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions     38 39 310 311
</span> 
 if {${name} ne ${subport}} {
     conflicts       py${python.version}-spyder-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,11 +43,6 @@ if {${name} ne ${subport}} {
</span>     depends_build-append \
                     port:py${python.version}-setuptools
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${python.version} < 38} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_run-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-importlib-metadata
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     depends_run-append \
                     port:py${python.version}-applaunchservices \
                     port:py${python.version}-atomicwrites \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +109,8 @@ if {${name} ne ${subport}} {
</span>                     patch-spyder_app_start.py.diff \
                     patch-spyder_app_utils.py.diff \
                     patch-spyder_utils_programs.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-spyder_config_lsp.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-spyder_config_lsp.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-jedi-version-cap.diff
</span> 
     set PYLS_BIN_NAME   pyls-${python.branch}
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-jedi-version-cap.diff b/python/py-spyder/files/patch-jedi-version-cap.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..184a2515473
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-jedi-version-cap.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig  2023-10-01 21:38:15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2023-10-01 21:38:24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,7 +210,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'diff-match-patch>=20181111',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'intervaltree>=3.0.2',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'ipython>=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    'jedi>=0.17.2,<0.19.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    'jedi>=0.17.2',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'jellyfish>=0.7',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'jsonschema>=3.2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'keyring>=17.0.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/dependencies.py.orig    2023-10-01 21:40:30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/dependencies.py 2023-10-01 21:40:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INTERVALTREE_REQVER = None if is_pynsist() else '>=3.0.2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IPYTHON_REQVER = (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ">=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JEDI_REQVER = '>=0.17.2,<0.19.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++JEDI_REQVER = '>=0.17.2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JELLYFISH_REQVER = '>=0.7'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JSONSCHEMA_REQVER = '>=3.2.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ KEYRING_REQVER = '>=17.0.0'
</span></pre><pre style='margin:0'>

</pre>