Skip to content
Permalink
Browse files

Update dependencies for Python 3 (#9630)

* Update dependencies for Python 3

* Update dependency for py2exe to contain pywin32

* Update submodule references to latest master branches

* Update miscDeps to latest master.
  • Loading branch information...
leonardder authored and michaelDCurran committed Jun 9, 2019
1 parent 5f0be63 commit 6506bc78c124207bd21d2ce6bc49af976acfc57d
Showing with 11 additions and 6 deletions.
  1. +4 −2 .gitmodules
  2. +1 −1 include/comtypes
  3. +1 −0 include/py2exe
  4. +1 −1 include/wxPython
  5. +1 −1 miscDeps
  6. +2 −1 source/core.py
  7. +1 −0 source/sourceEnv.py
@@ -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
Submodule py2exe added at 1b5d26
Submodule wxPython updated 126 files
Submodule miscDeps updated 370 files
@@ -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)
@@ -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"),
)

0 comments on commit 6506bc7

Please sign in to comment.
You can’t perform that action at this time.