Skip to content

update wxPython easyblock to support wxPython v4.1 #2689

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

Merged
boegel merged 4 commits into from
Mar 2, 2022
Merged

update wxPython easyblock to support wxPython v4.1 #2689

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05fb80c
lib filenames for wxpython 4.1.x
orbsmiv Feb 24, 2022
5edd174
linter happiness
orbsmiv Feb 24, 2022
af1e122
handle version mods to lib filenames in check
orbsmiv Feb 24, 2022
1b94636
only add symbolic links for libwx_*so.* for wxPython >= 4.0
boegel Mar 2, 2022
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
27 changes: 16 additions & 11 deletions easybuild/easyblocks/w/wxpython.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,10 @@ def install_step(self):
pyver = pyver[0] + pyver[2]

cmd = "pip install --no-deps --prefix=%(prefix)s dist/wxPython-%(version)s-cp%(pyver)s*.whl" % {
'prefix': self.installdir,
'version': self.version,
'pyver': pyver}
'prefix': self.installdir,
'version': self.version,
'pyver': pyver
}
else:
script = os.path.join('wxPython', 'build-wxpython.py')
cmd = INSTALL_CMD % {
Expand All @@ -105,14 +106,15 @@ def install_step(self):

run_cmd(cmd, log_all=True, simple=True)

# add symbolic links for libwx_*so.0 files
# add symbolic links for libwx_*so.* files
# (which are created automatically by 'build.py install', but not by 'pip install *.whl')
wx_lib_dir = os.path.join(self.installdir, self.pylibdir, 'wx')
cwd = change_dir(wx_lib_dir)
lib_so_files = glob.glob('libwx*.so.0')
for lib_so_file in lib_so_files:
symlink(lib_so_file, lib_so_file[:-2])
change_dir(cwd)
if LooseVersion(self.version) >= LooseVersion("4"):
wx_lib_dir = os.path.join(self.installdir, self.pylibdir, 'wx')
cwd = change_dir(wx_lib_dir)
lib_so_files = glob.glob('libwx*.so.*')
for lib_so_file in lib_so_files:
symlink(lib_so_file, lib_so_file[:-2])
change_dir(cwd)

def sanity_check_step(self):
"""Custom sanity check for wxPython."""
Expand All @@ -125,7 +127,10 @@ def sanity_check_step(self):
files.extend([os.path.join('bin', 'wxrc')])
dirs.extend(['include', 'share'])
py_bins.extend(['alacarte', 'alamode', 'wrap'])
else:
elif LooseVersion(self.version) >= LooseVersion("4.1"):
majver = '3.1' # this is 3.1 in ver 4.1.x
py_bins.extend(['slices', 'slicesshell'])
elif LooseVersion(self.version) >= LooseVersion("4.0"):
majver = '3.0' # for some reason this is still 3.0 in ver 4.0.x
py_bins.extend(['slices', 'slicesshell'])

Expand Down