From 7c3fea2e71bc5b9ce37a46b95a7fd23aaeebb8fe Mon Sep 17 00:00:00 2001 From: Leonard de Ruijter Date: Tue, 28 May 2019 08:44:38 +0200 Subject: [PATCH 1/4] Update dependencies for Python 3 --- .gitmodules | 6 ++++-- include/comtypes | 2 +- include/py2exe | 1 + include/wxPython | 2 +- miscDeps | 2 +- source/core.py | 3 ++- source/sourceEnv.py | 1 + 7 files changed, 11 insertions(+), 6 deletions(-) create mode 160000 include/py2exe diff --git a/.gitmodules b/.gitmodules index 95d46bf3d50..561e130e4c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,8 +21,7 @@ ignore = untracked [submodule "include/comtypes"] path = include/comtypes - url = https://github.com/enthought/comtypes.git - ignore = untracked + url = https://github.com/nvaccess/comtypes-bin [submodule "include/scons"] path = include/scons url = https://github.com/SConsProject/scons @@ -38,3 +37,6 @@ [submodule "include/cldr-emoji-annotation"] path = include/cldr-emoji-annotation url = https://github.com/fujiwarat/cldr-emoji-annotation +[submodule "include/py2exe"] + path = include/py2exe + url = https://github.com/nvaccess/py2exe-bin diff --git a/include/comtypes b/include/comtypes index 1d3d38b2a61..1c12fae235f 160000 --- a/include/comtypes +++ b/include/comtypes @@ -1 +1 @@ -Subproject commit 1d3d38b2a616674309e7eabe6b5c581042caf32a +Subproject commit 1c12fae235ffcf753ce5f2704b64fcd66897cd48 diff --git a/include/py2exe b/include/py2exe new file mode 160000 index 00000000000..7cb516ee67f --- /dev/null +++ b/include/py2exe @@ -0,0 +1 @@ +Subproject commit 7cb516ee67f117f7b14800edda8139a5069766b1 diff --git a/include/wxPython b/include/wxPython index 5d878c302f9..abd4d3af44b 160000 --- a/include/wxPython +++ b/include/wxPython @@ -1 +1 @@ -Subproject commit 5d878c302f91caaa8970826e9c16d714efec50bd +Subproject commit abd4d3af44b707cc28001748b1692ee232969ad1 diff --git a/miscDeps b/miscDeps index 3a0065301ec..187e8ceee43 160000 --- a/miscDeps +++ b/miscDeps @@ -1 +1 @@ -Subproject commit 3a0065301ec91c52ae5bebf2c4403ce429db078c +Subproject commit 187e8ceee437f843c7bb46e97d0eb86a791c1879 diff --git a/source/core.py b/source/core.py index e880dc7b653..0f9945621da 100644 --- a/source/core.py +++ b/source/core.py @@ -255,7 +255,8 @@ def main(): # wxPython 4 no longer has either of these constants (despite the documentation saying so), some add-ons may rely on # them so we add it back into wx. https://wxpython.org/Phoenix/docs/html/wx.Window.html#wx.Window.Centre wx.CENTER_ON_SCREEN = wx.CENTRE_ON_SCREEN = 0x2 - log.info("Using wx version %s"%wx.version()) + import six + log.info("Using wx version %s with six version %s"%(wx.version(), six.__version__)) class App(wx.App): def OnAssert(self,file,line,cond,msg): message="{file}, line {line}:\nassert {cond}: {msg}".format(file=file,line=line,cond=cond,msg=msg) diff --git a/source/sourceEnv.py b/source/sourceEnv.py index 2bc646538c7..87335de57b8 100644 --- a/source/sourceEnv.py +++ b/source/sourceEnv.py @@ -19,6 +19,7 @@ os.path.join(TOP_DIR, "include", "comtypes"), os.path.join(TOP_DIR, "include", "configobj", "src"), os.path.join(TOP_DIR, "include", "wxPython"), + os.path.join(TOP_DIR, "include", "py2exe"), os.path.join(TOP_DIR, "miscDeps", "python"), ) From 68b4e0cd2f9e09e92d7c4d6f96d93c7f254c27e1 Mon Sep 17 00:00:00 2001 From: Leonard de Ruijter Date: Tue, 4 Jun 2019 13:39:45 +0200 Subject: [PATCH 2/4] Update dependency for py2exe to contain pywin32 --- include/py2exe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/py2exe b/include/py2exe index 7cb516ee67f..27d8cd7af9f 160000 --- a/include/py2exe +++ b/include/py2exe @@ -1 +1 @@ -Subproject commit 7cb516ee67f117f7b14800edda8139a5069766b1 +Subproject commit 27d8cd7af9ff74e5a62d03c2a70d4eb7491075be From 334075dbdbc9b91551f5f4d9c8b329d7229ce834 Mon Sep 17 00:00:00 2001 From: Leonard de Ruijter Date: Sat, 8 Jun 2019 11:00:50 +0200 Subject: [PATCH 3/4] Update submodule references to latest master branches --- include/comtypes | 2 +- include/py2exe | 2 +- include/wxPython | 2 +- miscDeps | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/comtypes b/include/comtypes index 1c12fae235f..8c45582fe49 160000 --- a/include/comtypes +++ b/include/comtypes @@ -1 +1 @@ -Subproject commit 1c12fae235ffcf753ce5f2704b64fcd66897cd48 +Subproject commit 8c45582fe497269594f127f93d1a786d6bc868fb diff --git a/include/py2exe b/include/py2exe index 27d8cd7af9f..1b5d26a168a 160000 --- a/include/py2exe +++ b/include/py2exe @@ -1 +1 @@ -Subproject commit 27d8cd7af9ff74e5a62d03c2a70d4eb7491075be +Subproject commit 1b5d26a168a27e7a02151c0be206dd253ff30618 diff --git a/include/wxPython b/include/wxPython index abd4d3af44b..11de9371b6b 160000 --- a/include/wxPython +++ b/include/wxPython @@ -1 +1 @@ -Subproject commit abd4d3af44b707cc28001748b1692ee232969ad1 +Subproject commit 11de9371b6b737673ad5ea2703d214ada69a158a diff --git a/miscDeps b/miscDeps index 187e8ceee43..37f957a49e9 160000 --- a/miscDeps +++ b/miscDeps @@ -1 +1 @@ -Subproject commit 187e8ceee437f843c7bb46e97d0eb86a791c1879 +Subproject commit 37f957a49e9365703730a03dc3ca9af2dd0dca5f From 1612171e1adb2c0b9cf491f9df7b78f854d7f1dc Mon Sep 17 00:00:00 2001 From: Michael Curran Date: Mon, 10 Jun 2019 06:31:49 +1000 Subject: [PATCH 4/4] Update miscDeps to latest master. --- miscDeps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miscDeps b/miscDeps index 37f957a49e9..c7c55f98d8c 160000 --- a/miscDeps +++ b/miscDeps @@ -1 +1 @@ -Subproject commit 37f957a49e9365703730a03dc3ca9af2dd0dca5f +Subproject commit c7c55f98d8cff0f12816af7e0ff92487a34db001