<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/d73e35c662b2e5bdc81b15df00dc7d46cbb4730d">https://github.com/macports/macports-ports/commit/d73e35c662b2e5bdc81b15df00dc7d46cbb4730d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d73e35c662b2e5bdc81b15df00dc7d46cbb4730d
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Sep 24 15:49:09 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-spyder-devel: update to 20210923-4bbe5384
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - change dependency types to depends_run
</span><span style='display:block; white-space:pre;color:#404040;'> - remove pylint version cap
</span>---
python/py-spyder-devel/Portfile | 30 ++++++++++++++--------
.../files/patch-pylint-version.diff | 22 ++++++++++++++++
python/py-spyder-devel/files/patch-setup.py.diff | 12 ++++-----
3 files changed, 47 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/Portfile b/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 77bcb5a0707..d9dfc820e97 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,9 +6,9 @@ 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 35600145153a64dd4de215945b0224450d756646
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup spyder-ide spyder 4bbe5384d15af286a34c59ee02fc156c6c818cfa
</span> name py-spyder-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20210814-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20210923-[string range ${github.version} 0 7]
</span> revision 0
# the epoch is here for historical reasons and cannot be removed
epoch 20161005
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,16 +31,24 @@ long_description ${description}. \
</span>
homepage https://www.spyder-ide.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2c02c7888d000f35208ce4208ae4489256163d83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d77028951ddf905c36f2c3ff838afb29a4b04cd19ae9f1f30eef60e7179441cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19780951
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2505068c9c3e18fd8d05b991abf92834eb6d1ab9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b6f1b3eb92308d341fb293199b4899be9637e623f3b941aecb64ecd486360225 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23852088
</span>
python.versions 36 37 38 39
if {${name} ne ${subport}} {
conflicts py${python.version}-spyder
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} < 38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-importlib-metadata
</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;'>+ depends_run-append \
</span> port:py${python.version}-applaunchservices \
port:py${python.version}-atomicwrites \
port:py${python.version}-chardet \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +77,6 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-qtconsole \
port:py${python.version}-qtpy \
port:py${python.version}-rtree \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-setuptools \
</span> port:py${python.version}-sphinx \
port:py${python.version}-spyder-kernels \
port:py${python.version}-textdistance \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +87,7 @@ if {${name} ne ${subport}} {
</span> variant small description "Remove all optional dependencies." {}
if {![ variant_isset small ]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span> port:py${python.version}-cython \
port:py${python.version}-matplotlib \
port:py${python.version}-numpy \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,13 +97,13 @@ if {${name} ne ${subport}} {
</span> }
variant docs description "Include offline Python and Qt documentation." {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span> port:py${python.version}-htmldocs \
port:qt5-docs
}
variant pil description "Support image objects in editor through Pillow." {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span> port:py${python.version}-Pillow
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +113,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-devel/files/patch-pylint-version.diff b/python/py-spyder-devel/files/patch-pylint-version.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c7f9edbafed
</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-devel/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'
</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',
</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-devel/files/patch-setup.py.diff b/python/py-spyder-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ea8ee89e5e6..108716feb97 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,22 +7,22 @@ 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:#e0ffe0;'>+--- setup.py.orig 2021-09-23 15:56:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-09-24 16:25:59.000000000 -0400
</span> @@ -201,7 +201,6 @@
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> install_requires = [
- 'applaunchservices>=0.1.7;platform_system=="Darwin"',
'atomicwrites>=1.2.0',
'chardet>=2.0.0',
'cloudpickle>=0.5.0',
@@ -224,8 +223,6 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pylint>=2.5.0',
</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',
</pre><pre style='margin:0'>
</pre>