<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/5b0b8e359f1d0ee950ff7f2dc6354b28f96ac8e3">https://github.com/macports/macports-ports/commit/5b0b8e359f1d0ee950ff7f2dc6354b28f96ac8e3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5b0b8e359f1d0ee950ff7f2dc6354b28f96ac8e3
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Sep 2 16:37:10 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-spyder: update to 5.1.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove version restriction for pylint
</span>---
python/py-spyder/Portfile | 11 ++++++-----
python/py-spyder/files/patch-pylint-version.diff | 22 ++++++++++++++++++++++
python/py-spyder/files/patch-setup.py.diff | 18 +++++-------------
.../py-spyder/files/patch-spyder_app_start.py.diff | 6 +++---
.../py-spyder/files/patch-spyder_app_utils.py.diff | 6 +++---
.../files/patch-spyder_config_base.py.diff | 6 +++---
.../files/patch-spyder_utils_programs.py.diff | 6 +++---
7 files changed, 45 insertions(+), 30 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 0d2e4d53942..0820f6d5ae8 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 5.1.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 5.1.2 v
</span> github.tarball_from archive
name py-spyder
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@ long_description ${description}. \
</span>
homepage https://www.spyder-ide.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 47f1ed406a03f9a5c8854d97096997e734bd6457 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5b84d2feb210ded547fac4689c00f3cb9f955f692ca617466cfa1a229bb1810a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19782262
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f32df92a4af55ffa6c95876362f3cefc3bcb1f2d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7c2a59416601b54b13658f215b1451f64b26b5de46a3fe5686655ed50f94ce62 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23847766
</span>
python.versions 36 37 38 39
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +106,8 @@ if {${name} ne ${subport}} {
</span> patch-spyder_app_utils.py.diff \
patch-spyder_utils_programs.py.diff \
patch-spyder_config_lsp.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-setup.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pylint-version.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-pylint-version.diff b/python/py-spyder/files/patch-pylint-version.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dc3ca3ee41b
</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-pylint-version.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;'>+--- spyder/dependencies.py.orig 2021-09-04 13:40:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/dependencies.py 2021-09-04 13:40:40.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PICKLESHARE_REQVER = '>=0.4'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PSUTIL_REQVER = '>=5.3'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYGMENTS_REQVER = '>=2.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PYLINT_REQVER = '>=2.5.0;<2.10.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PYLINT_REQVER = '>=2.5.0;<2.11.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYLSP_REQVER = '>=1.2.2;<1.3.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYLSP_BLACK_REQVER = '>=1.0.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYLS_SPYDER_REQVER = '>=0.4.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2021-09-04 13:43:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-09-04 13:43:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -220,7 +220,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pickleshare>=0.4',
</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>=2.5.0,<2.10.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'pylint>=2.5.0,<2.11.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'python-lsp-black>=1.0.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pyls-spyder>=0.4.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'python-lsp-server[all]>=1.2.2,<1.3.0',
</span><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><span style='display:block; white-space:pre;color:#808080;'>index ea8ee89e5e6..5b853595559 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-setup.py.diff
</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;'>@@ -7,22 +7,14 @@ ports do not install an .egg-info file, so it appears that the package isn't pre
</span> Removing it here from the setup.py file assures that it doesn't end up in the requires.txt
file and allows spyder to start. This is likely something that should be fixed in these ports,
but for now just take the pragmatic approach.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2021-08-05 08:44:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2021-08-05 08:44:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,7 +201,6 @@
</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;'>- install_requires = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'applaunchservices>=0.1.7;platform_system=="Darwin"',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'atomicwrites>=1.2.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'chardet>=2.0.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'cloudpickle>=0.5.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -224,8 +223,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pylint>=2.5.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2021-09-04 13:42:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-09-04 13:42:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -223,8 +223,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pylint>=2.5.0,<2.10.0',
</span> 'python-lsp-black>=1.0.0',
'pyls-spyder>=0.4.0',
- 'pyqt5<5.13',
- 'pyqtwebengine<5.13',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 'python-lsp-server[all]>=1.2.1,<1.3.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'python-lsp-server[all]>=1.2.2,<1.3.0',
</span> 'pyxdg>=0.26;platform_system=="Linux"',
'pyzmq>=17',
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_app_start.py.diff b/python/py-spyder/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 42c3808649a..f5e0c5184e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/app/start.py.orig 2018-10-19 15:04:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/start.py 2018-10-20 11:20:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,6 +27,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/start.py.orig 2021-09-02 00:24:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/start.py 2021-09-04 13:44:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +40,9 @@
</span> except:
pass
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_app_utils.py.diff b/python/py-spyder/files/patch-spyder_app_utils.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9526feee42f..aeec7d79967 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_app_utils.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_app_utils.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/app/utils.py.orig 2021-05-10 00:29:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/utils.py 2021-05-12 21:51:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/utils.py.orig 2021-09-02 00:24:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/utils.py 2021-09-04 13:45:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +76,7 @@
</span> return file_uri(osp.join(doc_path, python_chm[0]))
else:
vinf = sys.version_info
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_config_base.py.diff b/python/py-spyder/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ea020369bb0..fa5ae7271bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/config/base.py.orig 2021-05-10 00:29:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/base.py 2021-05-12 21:15:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,23 +125,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/base.py.orig 2021-09-02 00:24:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/base.py 2021-09-04 13:44:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,23 +130,29 @@
</span> #==============================================================================
def get_conf_subfolder():
"""Return the configuration subfolder for different ooperating systems."""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/files/patch-spyder_utils_programs.py.diff b/python/py-spyder/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b7d30a7419..ead092882c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/utils/programs.py.orig 2021-05-10 00:29:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/programs.py 2021-05-12 21:52:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,6 +123,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/programs.py.orig 2021-09-02 00:24:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/programs.py 2021-09-04 13:45:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,6 +122,11 @@
</span> abspath = osp.join(path, basename)
if osp.isfile(abspath):
return abspath
</pre><pre style='margin:0'>
</pre>