Skip to content

Commit 82aa95b

Browse files
nicolaslgnicolaslg
committed
fixed flake8 checks in the recipes
1 parent b746c4d commit 82aa95b

File tree

9 files changed

+40
-41
lines changed

9 files changed

+40
-41
lines changed

‎meshing/packages/gmds/package.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class Gmds(CMakePackage):
2727
"""GMDS: Generic Mesh Data and Services."""
2828

2929
homepage = "https://github.com/LIHPC-Computational-Geometry/gmds"
30-
url = "https://github.com/LIHPC-Computational-Geometry/gmds/archive/refs/tags/0.0.0.tar.gz"
31-
git = "https://github.com/LIHPC-Computational-Geometry/gmds.git"
30+
url = "https://github.com/LIHPC-Computational-Geometry/gmds/archive/refs/tags/0.0.0.tar.gz"
31+
git = "https://github.com/LIHPC-Computational-Geometry/gmds.git"
3232

3333
version('main', branch='main')
3434
version('1.3.3', sha256='a8387dfb4e023877a271dd862aa2a6ec301623daccc4aef1455861368e90daea')
@@ -42,10 +42,10 @@ class Gmds(CMakePackage):
4242
variant('kmds', default=False, description='Build with Kokkos')
4343
variant('elg3d', default=False, description='Build Elg3D')
4444
variant('blocking', default=False, description='Build the blocking component')
45-
variant('lima',default=False, description='Provide Lima IO')
46-
variant('python',default=False, description='Provide GMDS Python API')
45+
variant('lima', default=False, description='Provide Lima IO')
46+
variant('python', default=False, description='Provide GMDS Python API')
4747
variant('cgns', default=False, description='Provide CGNS blocking export')
48-
48+
4949
depends_on('glpk')
5050
# necessary to build the internal glpk
5151
depends_on('libtool', type='build')
@@ -59,8 +59,7 @@ class Gmds(CMakePackage):
5959

6060
depends_on('cgns', when='+cgns')
6161

62-
conflicts('+elg3d', when='~kmds',
63-
msg='elg3d cannot be built without kmds.')
62+
conflicts('+elg3d', when='~kmds', msg='elg3d cannot be built without kmds.')
6463

6564
depends_on('cgal', when='+blocking')
6665
depends_on('py-pybind11', when='+python')
@@ -70,7 +69,7 @@ class Gmds(CMakePackage):
7069
depends_on('lcov')
7170
depends_on('googletest')
7271
depends_on('py-pytest', when='+python')
73-
72+
7473
def cmake_args(self):
7574
args = []
7675
args.append(self.define_from_variant('ENABLE_KMDS', 'kmds'))

‎meshing/packages/lima/package.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ class Lima(CMakePackage):
1515

1616
homepage = 'https://github.com/LIHPC-Computational-Geometry/lima'
1717
url = 'https://github.com/LIHPC-Computational-Geometry/lima/archive/refs/tags/0.0.0.tar.gz'
18-
git = 'https://github.com/LIHPC-Computational-Geometry/lima.git'
18+
git = 'https://github.com/LIHPC-Computational-Geometry/lima.git'
1919
maintainers = ['meshing_team']
2020

2121
extends("python", when='+scripting') # For the PYTHONPATH in the generated modules
22-
22+
2323
# depends_on('sumesh +shared', type=('build', 'link'))
2424
depends_on('swig', type=('build'), when='+scripting')
2525
depends_on('python +shared', type=('build', 'link'), when='+scripting')
@@ -33,10 +33,10 @@ class Lima(CMakePackage):
3333
description='Build xlmlima tool (converts and prepares meshes, necessary for non-regression tests)')
3434
variant('i4', default=False, description="int_type=int32 instead of int64")
3535
variant('r4', default=False, description="real=float instead of double")
36-
variant('tests', default=True,
36+
variant('tests', default=True,
3737
description="Builds the mesh comparison tool (necessary for non-regression tests)")
38-
variant('disable_mli_warning', default=False,
39-
description="Disables warning messages displayed when reading or writing a file in mli format (obsolete)")
38+
variant('disable_mli_warning',
39+
default=False, description="Disables warning messages displayed when reading or writing a file in mli format (obsolete)")
4040

4141
patch('cmake.patch', when='@7.4.3')
4242
patch('cmake-7.6.0.patch', when='@7.6.0')
@@ -65,8 +65,7 @@ def cmake_args(self):
6565
self.define_from_variant('BUILD_SCRIPTING', 'scripting'),
6666
self.define_from_variant('BUILD_XLMLIMA', 'xlmlima'),
6767
self.define_from_variant('BUILD_TESTS', 'tests'),
68-
self.define_from_variant('DISABLE_MLI_WARNING', 'disable_mli_warning'),
69-
]
68+
self.define_from_variant('DISABLE_MLI_WARNING', 'disable_mli_warning')]
7069

7170
args.append(self.define('MACHINE_TYPES', False))
7271
args.append(self.define('FORMAT_MLI', False))

‎meshing/packages/magix3d/package.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
from spack import *
44
import os
55

6+
67
class Magix3d(CMakePackage):
78
"""Mailleur 3D"""
89

910
homepage = 'https://github.com/LIHPC-Computational-Geometry/magix3d'
1011
url = 'https://github.com/LIHPC-Computational-Geometry/magix3d/archive/refs/tags/0.0.0.tar.gz'
1112
git = 'https://github.com/LIHPC-Computational-Geometry/magix3d.git'
1213
maintainers = ['meshing_team']
13-
14+
1415
variant('dkoc', default=False, description='Utilisation du lecteur Catia DKOC pour OpenCascade')
1516
variant('mdlparser', default=False, description='Utilisation du lecteur du format mdl')
1617
variant('meshgems', default=False, description='Utilisation de la bibliotheque de maillage volumique MeshGems')
@@ -149,6 +150,6 @@ def fill_cmake_args(self, batch, t_ext, erd_ext, team, dox_path, dkoc_lic):
149150
python_path.append(os.path.join(self.spec[py_dep].prefix, 'lib',
150151
'python' + str(python_version),
151152
'site-packages'))
152-
args.append('-DADDPYTHONPACKAGES='+':'.join(python_path)+':')
153+
args.append('-DADDPYTHONPACKAGES=' + ':'.join(python_path) + ':')
153154

154155
return args

‎meshing/packages/pythonutil/package.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ def cmake_args(self):
3535
# Fix cmake taking python3 even if `which python` is python2
3636
py = self.spec['python']
3737
args.extend([
38-
# find_package(PythonInterp) # Deprecated, but used by pybind11
39-
self.define('PYTHON_EXECUTABLE', py.command.path),
40-
# find_package(Python) under cmake_minimum_required < 3.15 (CMP0094)
41-
self.define('Python_EXECUTABLE', py.command.path),
42-
# find_package(Python2/3) under cmake_minimum_required < 3.15 (CMP0094)
43-
self.define('Python{}_EXECUTABLE'.format(py.version[0]), py.command.path),
38+
# find_package(PythonInterp) # Deprecated, but used by pybind11
39+
self.define('PYTHON_EXECUTABLE', py.command.path),
40+
# find_package(Python) under cmake_minimum_required < 3.15 (CMP0094)
41+
self.define('Python_EXECUTABLE', py.command.path),
42+
# find_package(Python2/3) under cmake_minimum_required < 3.15 (CMP0094)
43+
self.define('Python{}_EXECUTABLE'.format(py.version[0]), py.command.path),
4444
])
4545

4646
return args

‎meshing/packages/qtpython/package.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ def cmake_args(self):
5757
# Fix cmake taking python3 even if `which python` is python2
5858
py = self.spec['python']
5959
args.extend([
60-
# find_package(PythonInterp) # Deprecated, but used by pybind11
61-
self.define('PYTHON_EXECUTABLE', py.command.path),
62-
# find_package(Python) under cmake_minimum_required < 3.15 (CMP0094)
63-
self.define('Python_EXECUTABLE', py.command.path),
64-
# find_package(Python2/3) under cmake_minimum_required < 3.15 (CMP0094)
65-
self.define('Python{}_EXECUTABLE'.format(py.version[0]), py.command.path),
60+
# find_package(PythonInterp) # Deprecated, but used by pybind11
61+
self.define('PYTHON_EXECUTABLE', py.command.path),
62+
# find_package(Python) under cmake_minimum_required < 3.15 (CMP0094)
63+
self.define('Python_EXECUTABLE', py.command.path),
64+
# find_package(Python2/3) under cmake_minimum_required < 3.15 (CMP0094)
65+
self.define('Python{}_EXECUTABLE'.format(py.version[0]), py.command.path),
6666
])
6767

6868
return args

‎meshing/packages/qtutil/package.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Qtutil(CMakePackage):
4141

4242
def cmake_args(self):
4343
args = []
44-
args += [self.define_from_variant('BUILD_SHARED_LIBS', 'shared')]
45-
args += [self.define_from_variant('USE_QT_TEXT_BROWSER', 'qtbrowser')]
44+
args += [self.define_from_variant('BUILD_SHARED_LIBS', 'shared')]
45+
args += [self.define_from_variant('USE_QT_TEXT_BROWSER', 'qtbrowser')]
4646

4747
return args

‎meshing/packages/smooth3d/package.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Smooth3d(CMakePackage):
2323
version('3.3.0', sha256='2b392a2a4ed7b58ea503b423335369edf727e7c8e8054b2a321d4a2160b95a64')
2424
version('3.2.1', sha256='e26fde58bebdf64134ae52fb6d1d1e95490c725a479370038c3093a46de4c837')
2525
version('3.2.0', sha256='5e0132a5a6c75d18247db1fccfd7d64cdca7d9a8bb44c246616527a92fe809ea')
26-
version('3.0.2')#, sha256='0be62f149fa154621dbdeefdf00d026bb2bd26ff7bd88c8560bce652ff209038')
26+
version('3.0.2', sha256='0be62f149fa154621dbdeefdf00d026bb2bd26ff7bd88c8560bce652ff209038')
2727
version('3.0.1', sha256='534f067951629e5697a04d7965487193659877b0ec8dbdd1ed0200a01d60907d')
2828
version('3.0.0', sha256='9ef4b2e380c507cc14883a6233c1df933bf3fc49549fd7e3f87630ae2abb6c82')
2929

‎meshing/packages/tkutil/package.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ def cmake_args(self):
5656
# Fix cmake taking python3 even if `which python` is python2
5757
py = self.spec['python']
5858
args.extend([
59-
# find_package(PythonInterp) # Deprecated, but used by pybind11
60-
self.define('PYTHON_EXECUTABLE', py.command.path),
61-
# find_package(Python) under cmake_minimum_required < 3.15 (CMP0094)
62-
self.define('Python_EXECUTABLE', py.command.path),
63-
# find_package(Python2/3) under cmake_minimum_required < 3.15 (CMP0094)
64-
self.define('Python{}_EXECUTABLE'.format(py.version[0]), py.command.path),
59+
# find_package(PythonInterp) # Deprecated, but used by pybind11
60+
self.define('PYTHON_EXECUTABLE', py.command.path),
61+
# find_package(Python) under cmake_minimum_required < 3.15 (CMP0094)
62+
self.define('Python_EXECUTABLE', py.command.path),
63+
# find_package(Python2/3) under cmake_minimum_required < 3.15 (CMP0094)
64+
self.define('Python{}_EXECUTABLE'.format(py.version[0]), py.command.path),
6565
])
6666

6767
return args

‎meshing/packages/vtkcontrib/package.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Vtkcontrib(CMakePackage):
1313

1414
homepage = 'https://github.com/LIHPC-Computational-Geometry/vtkcontrib'
1515
url = 'https://github.com/LIHPC-Computational-Geometry/vtkcontrib/archive/refs/tags/0.0.0.tar.gz'
16-
git = 'https://github.com/LIHPC-Computational-Geometry/vtkcontrib.git'
16+
git = 'https://github.com/LIHPC-Computational-Geometry/vtkcontrib.git'
1717
maintainers = ['meshing_team']
1818

1919
# Rem : peu de variants pour VTK au regard de ce qui pourrait etre fait : opengl2, python, xdmf, qt, mpi, ffmpeg
@@ -22,13 +22,13 @@ class Vtkcontrib(CMakePackage):
2222
# depends_on('[email protected]', type=('build', 'link'))
2323
depends_on('guitoolkitsvariables', type=('build'))
2424
depends_on('vtk-maillage', type=('build', 'link'))
25-
# depends_on('mpi', type=('build', 'link'))
25+
# depends_on('mpi', type=('build', 'link'))
2626

2727
# for undefined reference in util-linux/libmount to intl_....
2828
# depends_on('gettext')
2929

3030
patch('vtkcontrib-4.6.0_calc_mpi.patch', when='@4.6.0')
31-
31+
3232
version('5.6.0', sha256='848c2576f870b3e3dc5cb1d84d3f073f676497d865109642c7ab05f355d5a4c4')
3333
version('5.5.0', sha256='cb3056a9448fed7e738febc1382a5d1b6ae9ed29c0e1340f99dd03d0af913eba')
3434
version('5.4.3', sha256='80f8b6e2f29f8d79e16f96874d4b5b336ca7e16e86d21f69376b285a0cd70469')

0 commit comments

Comments
 (0)