<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/48e8142156bd792fb6ac274aa8f0d5634cff1a06">https://github.com/macports/macports-ports/commit/48e8142156bd792fb6ac274aa8f0d5634cff1a06</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 48e8142156bd792fb6ac274aa8f0d5634cff1a06
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Apr 5 22:52:38 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-spyder: update to 5.0.0, drop py27/py35 subports
</span>---
python/py-spyder/Portfile | 39 ++++++++++++------------------
python/py-spyder/files/patch-setup.py.diff | 24 ++++++++++++++++++
python/py-spyder/files/spyder-27 | 1 -
python/py-spyder/files/spyder-35 | 1 -
4 files changed, 40 insertions(+), 25 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 0d48315e14a..a20c8f53ee2 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;'>@@ -6,7 +6,7 @@ PortGroup python 1.0
</span> PortGroup qt5 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup spyder-ide spyder 4.2.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 5.0.0 v
</span> github.tarball_from archive
name py-spyder
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,11 @@ long_description ${description}. \
</span>
homepage https://www.spyder-ide.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d2790a1df9083eb14399d49155cd24815605906d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f84eb99505eaa489765b8d46273e564660f8947a376b72832e9ce982c9f44e1b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11539071
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b7a290dcb3198e4ee4cd03e79086a3f78933e053 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 49b0d42970f0bb114c7318b464bc70419327cf00c1d651821099ccf3d9ec6365 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19967667
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37 38 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 36 37 38 39
</span>
if {${name} ne ${subport}} {
if {${python.version} >= 36} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +47,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-atomicwrites \
port:py${python.version}-chardet \
port:py${python.version}-cloudpickle \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cookiecutter \
</span> port:py${python.version}-diff-match-patch \
port:py${python.version}-intervaltree \
port:py${python.version}-ipython \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +66,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pyqt5 \
port:py${python.version}-pyqt5-webengine \
port:py${python.version}-qdarkstyle \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qstylizer \
</span> port:py${python.version}-qtawesome \
port:py${python.version}-qtconsole \
port:py${python.version}-qtpy \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,23 +78,6 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-watchdog \
port:py${python.version}-zmq
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} in "27 35"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup spyder-ide spyder 4.1.6 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8979fc5d6884b40eaad38690e062e6d2f4384fd0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0e467dd48e13f2ecc34d3bf0eb62509d5be8419662eaa141a6737fd069480e21 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11705916
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-jsonschema \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyls-black \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyls-spyder \
</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}-textdistance \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-three-merge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant small description "Remove all optional dependencies." {}
if {![ variant_isset small ]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,7 +107,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-setup.py.diff
</span>
set WINPDB_BIN_NAME winpdb-${python.branch}
set PYLS_BIN_NAME pyls-${python.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,8 +132,15 @@ if {${name} ne ${subport}} {
</span> # temporary workaround for parso/jedi version restrictions
reinplace {s|PARSO_REQVER = '=0\.7\.0'|PARSO_REQVER = '>=0.7.0'|g} \
${worksrcpath}/spyder/dependencies.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|parso==0\.7\.0|parso>=0.7.0|g} ${worksrcpath}/setup.py
</span> reinplace {s|JEDI_REQVER = '=0\.17\.2'|JEDI_REQVER = '>=0.17.2'|g} \
${worksrcpath}/spyder/dependencies.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|jedi==0\.17\.2|jedi>=0.17.2|g} ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary fix for spyder-kernels version detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see: https://github.com/spyder-ide/spyder/commit/755c09cfe65df961bc3898d4ab55cc0336fcac61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|SPYDER_KERNELS_REQVER = '>=2.0.1,<2.1.0'|SPYDER_KERNELS_REQVER = '>=2.0.1;<2.1.0'|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/spyder/dependencies.py
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-setup.py.diff b/python/py-spyder/files/patch-setup.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bb914c15792
</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-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+These dependencies are added in the Portfile. However, the py-pyqt5{-webengine} and py-pybojc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ports do not install an .egg-info file, so it appears that the package isn't present.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Removing it here from the setup.py file assures that it doesn't end up in the requires.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+file and allows spyder to start. This is likely something that should be fixed in these ports,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+but for now just take the pragmatic approach in this -devel port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2021-03-06 18:58:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-03-06 19:00:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,7 +201,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install_requires = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'applaunchservices>=0.1.7;platform_system=="Darwin"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'atomicwrites>=1.2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'chardet>=2.0.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'cloudpickle>=0.5.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,8 +221,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'psutil>=5.3',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pygments>=2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pylint>=1.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'pyqt5<5.13',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'pyqtwebengine<5.13',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'python-language-server[all]>=0.36.2,<1.0.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pyls-black>=0.4.6',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pyls-spyder>=0.3.2',
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/spyder-27 b/python/py-spyder/files/spyder-27
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bf361f6cf95..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/spyder-27
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/spyder-2.7
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/spyder-35 b/python/py-spyder/files/spyder-35
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fc1e4efc086..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/spyder-35
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/spyder-3.5
</span></pre><pre style='margin:0'>
</pre>