<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/482b08681b4e714bff2477e85e214129661418ef">https://github.com/macports/macports-ports/commit/482b08681b4e714bff2477e85e214129661418ef</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 482b08681b4e714bff2477e85e214129661418ef
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Dec 15 21:59:32 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-spyder-devel: synchronize with py-spyder Portfile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove no_anti_alias variant
</span><span style='display:block; white-space:pre;color:#404040;'> - whitespace changes
</span><span style='display:block; white-space:pre;color:#404040;'> - add temporary reinplace as workaround for jedi restriction
</span>---
python/py-spyder-devel/Portfile | 142 ++++++++++-----------
.../patch-spyder_utils_syntaxhighlighters.py.diff | 13 --
2 files changed, 68 insertions(+), 87 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 05c0d4f..417ba48 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;'>@@ -7,106 +7,98 @@ PortGroup qt5 1.0
</span> PortGroup select 1.0
github.setup spyder-ide spyder cd645e8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+name py-spyder-devel
</span> version 3.99-20191206
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name py-spyder-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Preference on mailing list is to use small numbers for epoch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This is already a date code, so sticking with dates.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the epoch is here for historical reasons and cannot be removed
</span> epoch 20161005
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> categories-append devel
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {reneeotten @reneeotten} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span> license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.spyder-ide.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {reneeotten @reneeotten} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Spyder is the Scientific PYthon Development EnviRonment
long_description ${description}. \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Spyder provides a powerful interactive development \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- environment for the Python language with advanced \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- editing, interactive testing, debugging and introspection \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- features as well as a numerical computing environment \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thanks to the support of IPython (enhanced interactive \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Python interpreter) and popular Python libraries such as \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NumPy (linear algebra), SciPy (signal and image \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- processing) or matplotlib (interactive 2D/3D plotting) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- development environment with advanced editing, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- interactive testing, debugging and introspection features.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Spyder is a powerful scientific environment written in Python, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for Python, and designed by and for scientists, engineers and data \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ analysts. It offers a unique combination of the advanced editing, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ analysis, debugging, and profiling functionality of a comprehensive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ development tool with the data exploration, interactive execution, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deep inspection, and beautiful visualization capabilities of a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scientific package.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.spyder-ide.org/
</span>
checksums rmd160 52c2b1146acc47a2adcd82076431e3e977c9d2ea \
sha256 f88dc932b257b7d2456d0ef9e05f769e3a1251187776d4fa3937671e432da682 \
size 10774746
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py${python.version}-spyder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36 37
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:spyder_select
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-spyder
</span>
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-applaunchservices \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-atomicwrites \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-chardet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-cloudpickle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-diff-match-patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-intervaltree \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-keyring \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-language-server \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-nbconvert \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-numpydoc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pexpect \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pickleshare \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-psutil \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pygments \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pylint \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pympler \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt5-webengine \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-qdarkstyle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-qtawesome \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-qtconsole \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-qtpy \
</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;'>- port:py${python.version}-spyder-kernels-devel \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-watchdog \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-zmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-applaunchservices \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-atomicwrites \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-chardet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cloudpickle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-diff-match-patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-intervaltree \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-keyring \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-language-server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-nbconvert \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-numpydoc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pexpect \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pickleshare \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-psutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pygments \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pylint \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt5-webengine \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qdarkstyle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qtawesome \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qtconsole \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qtpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sphinx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-spyder-kernels-devel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-watchdog \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-zmq
</span>
variant small description "Remove all optional dependencies." {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant no_anti_alias description "Use non-anti-aliased fonts in editor." {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-spyder_utils_syntaxhighlighters.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {![ variant_isset small ]} {
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-cython \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-matplotlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pandas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-scipy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-sympy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cython \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-matplotlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pandas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-scipy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sympy
</span> }
variant docs description "Include offline Python and Qt documentation." {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-htmldocs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt5-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-htmldocs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-docs
</span> }
variant pil description "Support image objects in editor through PIL or Pillow." {
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${python.pkgd}/PIL:py${python.version}-Pillow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${python.pkgd}/PIL:py${python.version}-Pillow
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set WINPDB_BIN_NAME winpdb-${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PYLS_BIN_NAME pyls-${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-spyder_config_base.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-spyder_plugins_editor_plugin.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-spyder_app_start.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-spyder_app_mainwindow.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_config_base.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_plugins_editor_plugin.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_app_start.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_app_mainwindow.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set WINPDB_BIN_NAME winpdb-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYLS_BIN_NAME pyls-${python.branch}
</span>
post-patch {
reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,14 +114,13 @@ if {${name} ne ${subport}} {
</span> reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
${worksrcpath}/spyder/utils/programs.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary fix for py-language-server version, support also 0.30.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|<0.30.0|<=0.30.0|g" ${worksrcpath}/spyder/dependencies.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|<0.30.0|<=0.30|g" ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary workaround for jedi restriction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|JEDI_REQVER = '=0.14.1'|JEDI_REQVER = '>=0.14.1'|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;background:#ffe0e0;'>- delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/spyder_win_post_install.py-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/bin/spyder_win_post_install.py-${python.branch}
</span> delete ${destroot}${python.prefix}/bin/spyder_win_post_install.py
set docdir ${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,6 +130,9 @@ if {${name} ne ${subport}} {
</span> TROUBLESHOOTING.md ${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:spyder_select
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> select.group spyder
select.file ${filespath}/spyder-${python.version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,5 +143,5 @@ when you execute the commands without a version suffix, e.g. 'spyder', run:
</span> sudo port select --set ${select.group} [file tail ${select.file}]
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_utils_syntaxhighlighters.py.diff b/python/py-spyder-devel/files/patch-spyder_utils_syntaxhighlighters.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 03c84c8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/patch-spyder_utils_syntaxhighlighters.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,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/utils/syntaxhighlighters.py.orig 2018-09-07 10:34:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/syntaxhighlighters.py 2018-09-08 12:54:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -196,6 +196,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if bold:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- format.setFontWeight(QFont.Bold)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- format.setFontItalic(italic)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not italic and not bold:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ font = format.font()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ font.setStyleStrategy(QFont.NoAntialias)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ format.setFont(font)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.formats[name] = format
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def set_color_scheme(self, color_scheme):
</span></pre><pre style='margin:0'>
</pre>