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

Magix3d 2.4.0 and remove python2 #67

Merged
merged 2 commits into from
Dec 9, 2024
Merged

Magix3d 2.4.0 and remove python2 #67

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5d09c6
magix3d: remove python2
nicolaslg Dec 9, 2024
4408abc
magix3d: added version 2.4.0
nicolaslg Dec 9, 2024
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
16 changes: 4 additions & 12 deletions meshing/packages/magix3d/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -50,7 +51,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')
Expand All @@ -61,23 +62,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')
Expand All @@ -102,9 +96,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
Expand All @@ -123,7 +117,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'))
Expand All @@ -136,7 +129,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
Expand Down
Loading