From b5d09c61bb3be620af24ad7242d3a550139a7e35 Mon Sep 17 00:00:00 2001 From: nicolas le goff Date: Mon, 9 Dec 2024 14:07:00 +0100 Subject: [PATCH 1/2] magix3d: remove python2 --- meshing/packages/magix3d/package.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/meshing/packages/magix3d/package.py b/meshing/packages/magix3d/package.py index 36d1466..4e3dcd1 100644 --- a/meshing/packages/magix3d/package.py +++ b/meshing/packages/magix3d/package.py @@ -50,7 +50,7 @@ class Magix3d(CMakePackage): depends_on('mesquite') depends_on('python') depends_on('qt') - depends_on('doxygen') + depends_on('doxygen', type=('build')) depends_on('lima') depends_on('pkgconfig', type=('build')) depends_on('nlohmann-json') @@ -61,23 +61,16 @@ class Magix3d(CMakePackage): # depends_on('separatrice3d +shared', type=('build', 'link'), when='+sepa3d') # depends_on('experimentalroom') - # the limitations on the version number comes - # when we are in python2 depends_on('py-numpy', when='+pythonaddon') - depends_on('py-numpy@:1.16.2', when='+pythonaddon ^python@2') depends_on('py-matplotlib', when='+pythonaddon') - depends_on('py-matplotlib@:2.2.3', when='+pythonaddon ^python@2') depends_on('py-scipy', when='+pythonaddon') - depends_on('py-scipy@:1.1.0', when='+pythonaddon ^python@2') depends_on('py-cycler', when='+pythonaddon') depends_on('py-kiwisolver', when='+pythonaddon') depends_on('py-pillow', when='+pythonaddon') - depends_on('py-pillow@:6.2.2', when='+pythonaddon ^python@2') depends_on('py-pyparsing', when='+pythonaddon') depends_on('py-python-dateutil', when='+pythonaddon') depends_on('py-pytz', when='+pythonaddon') depends_on('py-setuptools', when='+pythonaddon') - depends_on('py-setuptools@:44.1.0', when='+pythonaddon ^python@2') depends_on('py-setuptools-scm', when='+pythonaddon') depends_on('py-six', when='+pythonaddon') depends_on('py-packaging', when='+pythonaddon') @@ -102,9 +95,9 @@ def setup_build_environment(self, env): env.prepend_path('PYTHONPATH', sphinx_pythonpath) def cmake_args(self): - return self.fill_cmake_args(False, 'undefined', 'undefined', 'undefined', 'undefined', 'unavailable') + return self.fill_cmake_args(False, 'undefined', 'undefined', 'undefined', 'unavailable') - def fill_cmake_args(self, batch, t_ext, erd_ext, team, dox_path, dkoc_lic): + def fill_cmake_args(self, batch, t_ext, erd_ext, team, dkoc_lic): args = [] args.append('-DBUILD_SHARED_LIBS:BOOL=ON') # Toujours en mode shared, pour le scripting @@ -123,7 +116,6 @@ def fill_cmake_args(self, batch, t_ext, erd_ext, team, dox_path, dkoc_lic): args.append(self.define('T_INTERNAL_EXTENSION', t_ext)) args.append(self.define('ERD_INTERNAL_EXTENSION', erd_ext)) args.append(self.define('USER_TEAM', team)) - args.append(self.define('DOXYGEN_PATH', dox_path)) args.append(self.define('DKOC_LICENCE', dkoc_lic)) args.append(self.define('URL_WIKI', 'url_wiki')) args.append(self.define('URL_TUTORIAL', 'url_tuto')) @@ -136,7 +128,6 @@ def fill_cmake_args(self, batch, t_ext, erd_ext, team, dox_path, dkoc_lic): args.append('-DSPHINX_WARNINGS_AS_ERRORS=OFF') args.append(self.define('USE_PYTHON_3', int(self.spec['python'].version[0]) >= 3)) - args.append(self.define('USE_PYTHON_2', int(self.spec['python'].version[0]) < 3)) # only py-numpy py-matplotlib py-scipy are necessary # the rest are here because we are not in an environment From 4408abc5fb344fbcab7fc4793b302f45afb47b39 Mon Sep 17 00:00:00 2001 From: nicolas le goff Date: Mon, 9 Dec 2024 14:07:42 +0100 Subject: [PATCH 2/2] magix3d: added version 2.4.0 --- meshing/packages/magix3d/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meshing/packages/magix3d/package.py b/meshing/packages/magix3d/package.py index 4e3dcd1..3d55b53 100644 --- a/meshing/packages/magix3d/package.py +++ b/meshing/packages/magix3d/package.py @@ -20,6 +20,7 @@ class Magix3d(CMakePackage): variant('pythonaddon', default=False, description='Additional python modules to enrich PYTHONPATH') variant('doc', default=False, description='Installation de la documentation utilisateur') + version('2.4.0', sha256='c2b0644355025f35f6dda29fe14ab72e0375f0aef67cd300d89b8050dd698232') version('2.3.5', sha256='28808a4c5893f84e2de43c8913c6609f97b1a6b213b3bb2d7dd37a8a6c8f8d39') version('2.3.4', sha256='934475f0738f7f6d48eb3e33336b4ce6625811722aebc5a566b7327d9dbdd255') version('2.3.3', sha256='fd1fbbde688dcfd2ab5e7f102d3209c0e1da7c8bdc8cb0691a5701f9c382f4de')