Permalink
Browse files

py-spyder: update to 3.3.3

- fix livecheck for only 3.x branch
  • Loading branch information...
reneeotten authored and mf2k committed Feb 10, 2019
1 parent 14efa5f commit c33577cd5ef9765d98790ed2bcbb5ff27108f9f0
@@ -7,8 +7,9 @@ PortGroup qt5 1.0
PortGroup active_variants 1.1
PortGroup select 1.0

github.setup spyder-ide spyder 3.3.2 v
github.setup spyder-ide spyder 3.3.3 v
name py-spyder
revision 0
# Preference on mailing list is to use small numbers for epoch.
# This is already a date code, so sticking with dates.
epoch 20111202
@@ -38,9 +39,9 @@ supported_archs noarch
#pyNN-scipy doesn't build universal
universal_variant no

checksums rmd160 94973e2faadc6e720ec3efec6dc8080e588da337 \
sha256 963f07d92748c0a5513ceac99a6203bdb15b8d032663841e01426a16ca0ee23a \
size 3946683
checksums rmd160 466bde67cee4632054b09b947736947578adaf44 \
sha256 15a319d3868c98fe3b2c8b2610b0ba63399110c52b963bfdb558e54300a369ef \
size 3946956

if {${name} ne ${subport}} {
require_active_variants py${python.version}-pyqt5 webengine
@@ -144,4 +145,6 @@ sudo port select --set ${select.group} [file tail ${select.file}]
"

livecheck.type none
} else {
github.livecheck.regex (3\\.\\d+\.\\d+)
}
@@ -1,6 +1,6 @@
--- spyder/app/mainwindow.py.orig 2018-05-19 23:02:14.000000000 -0400
+++ spyder/app/mainwindow.py 2018-05-19 23:02:56.000000000 -0400
@@ -206,7 +206,7 @@
--- spyder/app/mainwindow.py.orig 2019-02-09 15:30:57.000000000 -0500
+++ spyder/app/mainwindow.py 2019-02-10 10:25:26.000000000 -0500
@@ -212,7 +212,7 @@
return file_uri(osp.join(doc_path, python_chm[0]))
else:
vinf = sys.version_info
@@ -1,6 +1,6 @@
--- spyder/app/start.py.orig 2018-05-19 22:59:24.000000000 -0400
+++ spyder/app/start.py 2018-05-19 22:59:50.000000000 -0400
@@ -19,6 +19,9 @@
--- spyder/app/start.py.orig 2019-02-09 15:30:57.000000000 -0500
+++ spyder/app/start.py 2019-02-10 10:25:26.000000000 -0500
@@ -20,6 +20,9 @@
except:
pass

@@ -1,14 +1,14 @@
--- spyder/config/base.py.orig 2018-05-19 22:50:32.000000000 -0400
+++ spyder/config/base.py 2018-05-19 22:51:58.000000000 -0400
@@ -22,6 +22,7 @@
import sys
--- spyder/config/base.py.orig 2019-02-09 15:30:57.000000000 -0500
+++ spyder/config/base.py 2019-02-10 10:25:26.000000000 -0500
@@ -24,6 +24,7 @@
import tempfile

# Local imports
+from spyder import __version__
from spyder.utils import encoding
from spyder.py3compat import (is_unicode, TEXT_TYPES, INT_TYPES, PY3,
to_text_string, is_text_string)
@@ -83,10 +84,10 @@
@@ -85,10 +86,10 @@
# since 3.0+ we've reverted back to use .spyder to simplify major
# updates in version (required when we change APIs by Linux
# packagers)
@@ -23,7 +23,7 @@


# We can't have PY2 and PY3 settings in the same dir because:
@@ -94,8 +95,14 @@
@@ -96,8 +97,14 @@
# embed a PY2 interpreter in PY3)
# 2. We need to save the list of installed modules (for code
# completion) separately for each version
@@ -1,6 +1,6 @@
--- spyder/utils/programs.py.orig 2018-05-19 23:42:30.000000000 -0400
+++ spyder/utils/programs.py 2018-05-19 23:42:58.000000000 -0400
@@ -46,6 +46,11 @@
--- spyder/utils/programs.py.orig 2019-02-09 15:30:57.000000000 -0500
+++ spyder/utils/programs.py 2019-02-10 10:25:26.000000000 -0500
@@ -63,6 +63,11 @@
abspath = osp.join(path, basename)
if osp.isfile(abspath):
return abspath

0 comments on commit c33577c

Please sign in to comment.