Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies for Python 3 #9630

Merged
merged 5 commits into from
Jun 9, 2019
Merged

Update dependencies for Python 3 #9630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c3fea2
Update dependencies for Python 3
May 28, 2019
68b4e0c
Update dependency for py2exe to contain pywin32
Jun 4, 2019
b6349af
Merge remote-tracking branch 'origin/threshold_py3_staging' into depe…
Jun 8, 2019
334075d
Update submodule references to latest master branches
Jun 8, 2019
1612171
Update miscDeps to latest master.
michaelDCurran Jun 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion include/comtypes
Open in desktop
Submodule comtypes updated from 1d3d38 to 8c4558
1 change: 1 addition & 0 deletions include/py2exe
Open in desktop
Submodule py2exe added at 1b5d26
2 changes: 1 addition & 1 deletion include/wxPython
Open in desktop
Submodule wxPython updated 126 files
2 changes: 1 addition & 1 deletion miscDeps
Open in desktop
Submodule miscDeps updated 370 files
3 changes: 2 additions & 1 deletion source/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions source/sourceEnv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
)

Expand Down