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.

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

{bio,vis}[foss/2023a] CellProfiler v4.2.8, wxPython v4.2.1 #21949

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

WilleBell
Copy link
Contributor

@WilleBell WilleBell commented Dec 2, 2024

…foss-2023a.eb and patches: CellProfiler-4.2.8_deps.patch, cellprofiler-core-4.2.8_deps.patch, centrosome-1.2.3_deps.patch
Copy link

github-actions bot commented Dec 2, 2024

Updated software wxPython-4.2.1-foss-2023a.eb

Diff against wxPython-4.2.1-foss-2022a.eb

easybuild/easyconfigs/w/wxPython/wxPython-4.2.1-foss-2022a.eb

diff --git a/easybuild/easyconfigs/w/wxPython/wxPython-4.2.1-foss-2022a.eb b/easybuild/easyconfigs/w/wxPython/wxPython-4.2.1-foss-2023a.eb
index 65862ac1a8..3ca49103d2 100644
--- a/easybuild/easyconfigs/w/wxPython/wxPython-4.2.1-foss-2022a.eb
+++ b/easybuild/easyconfigs/w/wxPython/wxPython-4.2.1-foss-2023a.eb
@@ -8,7 +8,7 @@ API, enabling Python applications to have a native GUI on Windows, Macs or Unix
 and requiring very little (if any) platform specific code."""
 
 
-toolchain = {'name': 'foss', 'version': '2022a'}
+toolchain = {'name': 'foss', 'version': '2023a'}
 sources = ['%(name)s-%(version)s.tar.gz']
 patches = [
     'wxPython-4.1.1_fix_install_path.patch',
@@ -21,27 +21,26 @@ checksums = [
 ]
 
 builddependencies = [
-    ('pkgconf', '1.8.0'),
+    ('pkgconf', '1.9.5'),
 ]
 
 dependencies = [
-    ('Python', '3.10.4'),
-    ('SciPy-bundle', '2022.05'),
-    ('Pillow', '9.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.12'),
-    ('libjpeg-turbo', '2.1.3'),
-    ('LibTIFF', '4.3.0'),
-    ('expat', '2.4.8'),
-    ('GTK3', '3.24.33'),
-    ('GLib', '2.72.1'),
-    ('GConf', '3.2.6'),
-    ('GST-plugins-base', '1.20.2'),
-    ('Mesa', '22.0.3'),
-    ('libGLU', '9.0.2'),
-    ('LibSoup', '3.0.8'),
-    ('wxWidgets', '3.2.1'),  # wxPython 4.2 depends on wxWidgets >=3.2
-    ('WebKitGTK+', '2.40.4'),
+    ('Python', '3.11.3'),
+    ('SciPy-bundle', '2023.07'),
+    ('Pillow', '10.0.0'),
+    ('libpng', '1.6.39'),
+    ('zlib', '1.2.13'),
+    ('libjpeg-turbo', '2.1.5.1'),
+    ('LibTIFF', '4.5.0'),
+    ('expat', '2.5.0'),
+    ('GTK3', '3.24.37'),
+    ('GLib', '2.77.1'),
+    ('GST-plugins-base', '1.22.5'),
+    ('Mesa', '23.1.4'),
+    ('libGLU', '9.0.3'),
+    ('LibSoup', '3.6.1'),
+    ('wxWidgets', '3.2.2.1'),  # wxPython 4.2 depends on wxWidgets >=3.2
+    ('WebKitGTK+', '2.41.4'),
     ('attrdict3', '2.0.2'),
 ]
 
Diff against wxPython-4.2.0-foss-2021b.eb

easybuild/easyconfigs/w/wxPython/wxPython-4.2.0-foss-2021b.eb

diff --git a/easybuild/easyconfigs/w/wxPython/wxPython-4.2.0-foss-2021b.eb b/easybuild/easyconfigs/w/wxPython/wxPython-4.2.1-foss-2023a.eb
index 6a911f23dd..3ca49103d2 100644
--- a/easybuild/easyconfigs/w/wxPython/wxPython-4.2.0-foss-2021b.eb
+++ b/easybuild/easyconfigs/w/wxPython/wxPython-4.2.1-foss-2023a.eb
@@ -1,6 +1,6 @@
 # This easyconfig was created by the BEAR Software team at the University of Birmingham.
 name = 'wxPython'
-version = '4.2.0'
+version = '4.2.1'
 
 homepage = "https://www.wxpython.org/"
 description = """Wraps the wxWidgets C++ toolkit and provides access to the user interface portions of the wxWidgets 
@@ -8,40 +8,39 @@ API, enabling Python applications to have a native GUI on Windows, Macs or Unix
 and requiring very little (if any) platform specific code."""
 
 
-toolchain = {'name': 'foss', 'version': '2021b'}
+toolchain = {'name': 'foss', 'version': '2023a'}
 sources = ['%(name)s-%(version)s.tar.gz']
 patches = [
     'wxPython-4.1.1_fix_install_path.patch',
     'wxPython-4.1.1_use_bang_env_python.patch',
 ]
 checksums = [
-    {'wxPython-4.2.0.tar.gz': '663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7'},
+    {'wxPython-4.2.1.tar.gz': 'e48de211a6606bf072ec3fa778771d6b746c00b7f4b970eb58728ddf56d13d5c'},
     {'wxPython-4.1.1_fix_install_path.patch': 'f13743877deddbf525bbb3f81c8f7a6b0c2dbf1333595926f653f696999e31ce'},
     {'wxPython-4.1.1_use_bang_env_python.patch': 'c355c60a8cce3018fc0c30ffc78623efd2481e9baf33673e22a57863e1a3ac87'},
 ]
 
 builddependencies = [
-    ('pkgconf', '1.8.0'),
+    ('pkgconf', '1.9.5'),
 ]
 
 dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('Pillow', '8.3.2'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-    ('libjpeg-turbo', '2.0.6'),
-    ('LibTIFF', '4.3.0'),
-    ('expat', '2.4.1'),
-    ('GTK3', '3.24.31'),
-    ('GLib', '2.69.1'),
-    ('GConf', '3.2.6'),
-    ('GST-plugins-base', '1.18.5'),
-    ('Mesa', '21.1.7'),
-    ('libGLU', '9.0.2'),
-    ('LibSoup', '3.0.7'),
-    ('wxWidgets', '3.2.0'),  # wxPython 4.2 depends on wxWidgets >=3.2
-    ('WebKitGTK+', '2.37.1'),
+    ('Python', '3.11.3'),
+    ('SciPy-bundle', '2023.07'),
+    ('Pillow', '10.0.0'),
+    ('libpng', '1.6.39'),
+    ('zlib', '1.2.13'),
+    ('libjpeg-turbo', '2.1.5.1'),
+    ('LibTIFF', '4.5.0'),
+    ('expat', '2.5.0'),
+    ('GTK3', '3.24.37'),
+    ('GLib', '2.77.1'),
+    ('GST-plugins-base', '1.22.5'),
+    ('Mesa', '23.1.4'),
+    ('libGLU', '9.0.3'),
+    ('LibSoup', '3.6.1'),
+    ('wxWidgets', '3.2.2.1'),  # wxPython 4.2 depends on wxWidgets >=3.2
+    ('WebKitGTK+', '2.41.4'),
     ('attrdict3', '2.0.2'),
 ]
 
Diff against wxPython-4.1.1-foss-2021a.eb

easybuild/easyconfigs/w/wxPython/wxPython-4.1.1-foss-2021a.eb

diff --git a/easybuild/easyconfigs/w/wxPython/wxPython-4.1.1-foss-2021a.eb b/easybuild/easyconfigs/w/wxPython/wxPython-4.2.1-foss-2023a.eb
index 0af1145425..3ca49103d2 100644
--- a/easybuild/easyconfigs/w/wxPython/wxPython-4.1.1-foss-2021a.eb
+++ b/easybuild/easyconfigs/w/wxPython/wxPython-4.2.1-foss-2023a.eb
@@ -1,6 +1,6 @@
 # This easyconfig was created by the BEAR Software team at the University of Birmingham.
 name = 'wxPython'
-version = '4.1.1'
+version = '4.2.1'
 
 homepage = "https://www.wxpython.org/"
 description = """Wraps the wxWidgets C++ toolkit and provides access to the user interface portions of the wxWidgets 
@@ -8,40 +8,40 @@ API, enabling Python applications to have a native GUI on Windows, Macs or Unix
 and requiring very little (if any) platform specific code."""
 
 
-toolchain = {'name': 'foss', 'version': '2021a'}
+toolchain = {'name': 'foss', 'version': '2023a'}
 sources = ['%(name)s-%(version)s.tar.gz']
 patches = [
     'wxPython-4.1.1_fix_install_path.patch',
     'wxPython-4.1.1_use_bang_env_python.patch',
 ]
 checksums = [
-    '00e5e3180ac7f2852f342ad341d57c44e7e4326de0b550b9a5c4a8361b6c3528',  # wxPython-4.1.1.tar.gz
-    'f13743877deddbf525bbb3f81c8f7a6b0c2dbf1333595926f653f696999e31ce',  # wxPython-4.1.1_fix_install_path.patch
-    'c355c60a8cce3018fc0c30ffc78623efd2481e9baf33673e22a57863e1a3ac87',  # wxPython-4.1.1_use_bang_env_python.patch
+    {'wxPython-4.2.1.tar.gz': 'e48de211a6606bf072ec3fa778771d6b746c00b7f4b970eb58728ddf56d13d5c'},
+    {'wxPython-4.1.1_fix_install_path.patch': 'f13743877deddbf525bbb3f81c8f7a6b0c2dbf1333595926f653f696999e31ce'},
+    {'wxPython-4.1.1_use_bang_env_python.patch': 'c355c60a8cce3018fc0c30ffc78623efd2481e9baf33673e22a57863e1a3ac87'},
 ]
 
-dependencies = [
-    ('Python', '3.9.5'),
-    ('SciPy-bundle', '2021.05'),
-    ('Pillow', '8.2.0'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-    ('libjpeg-turbo', '2.0.6'),
-    ('LibTIFF', '4.2.0'),
-    ('expat', '2.2.9'),
-    ('GTK3', '3.24.29'),
-    ('GLib', '2.68.2'),
-    ('GConf', '3.2.6'),
-    ('GST-plugins-base', '1.18.4'),
-    ('pkg-config', '0.29.2'),
-    ('Mesa', '21.1.1'),
-    ('libGLU', '9.0.1'),
-    ('LibSoup', '2.74.0'),
-    # ('wxWidgets', '3.1.5'),  # this version is incompatible with with 4.1.1 so excluding to enable internal build
-    ('WebKitGTK+', '2.27.4'),
+builddependencies = [
+    ('pkgconf', '1.9.5'),
 ]
 
-# needed because wxWidgets is built as part of wxPython (not added as a dependency)
-modextrapaths = {'LD_LIBRARY_PATH': 'lib/python%(pyshortver)s/site-packages/wx'}
+dependencies = [
+    ('Python', '3.11.3'),
+    ('SciPy-bundle', '2023.07'),
+    ('Pillow', '10.0.0'),
+    ('libpng', '1.6.39'),
+    ('zlib', '1.2.13'),
+    ('libjpeg-turbo', '2.1.5.1'),
+    ('LibTIFF', '4.5.0'),
+    ('expat', '2.5.0'),
+    ('GTK3', '3.24.37'),
+    ('GLib', '2.77.1'),
+    ('GST-plugins-base', '1.22.5'),
+    ('Mesa', '23.1.4'),
+    ('libGLU', '9.0.3'),
+    ('LibSoup', '3.6.1'),
+    ('wxWidgets', '3.2.2.1'),  # wxPython 4.2 depends on wxWidgets >=3.2
+    ('WebKitGTK+', '2.41.4'),
+    ('attrdict3', '2.0.2'),
+]
 
 moduleclass = 'vis'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant