Skip to content

Commit 24518e0

Browse files
committed
Get rid of GPL code
1 parent 7dc2f1b commit 24518e0

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

setup.py

+6-24
Original file line numberDiff line numberDiff line change
@@ -39,30 +39,12 @@ def run(self):
3939
self.run_command('build_ext')
4040
self.do_egg_install()
4141

42-
class Build_Ext_find_swig3(build_ext):
42+
class Swig3Ext(build_ext):
4343
def find_swig(self):
44-
return get_swig_executable()
45-
46-
def get_swig_executable():
47-
# stolen from https://github.com/FEniCS/ffc/blob/master/setup.py
48-
"Get SWIG executable"
49-
50-
# Find SWIG executable
51-
swig_executable = None
52-
swig_minimum_version = "3.0.2"
53-
for executable in ["swig", "swig3.0"]:
54-
swig_executable = find_executable(executable)
55-
if swig_executable is not None:
56-
# Check that SWIG version is ok
57-
output = subprocess.check_output([swig_executable, "-version"]).decode('utf-8')
58-
swig_version = re.findall(r"SWIG Version ([0-9.]+)", output)[0]
59-
if LooseVersion(swig_version) >= LooseVersion(swig_minimum_version):
60-
break
61-
swig_executable = None
62-
if swig_executable is None:
63-
raise OSError("Unable to find SWIG version %s or higher." % swig_minimum_version)
64-
print("Found SWIG: %s (version %s)" % (swig_executable, swig_version))
65-
return swig_executable
44+
swigBinary = find_executable('swig3.0') or find_executable('swig')
45+
assert swigBinary is not None
46+
assert subprocess.check_output([swigBinary, "-version"]).find('SWIG Version 3') != -1
47+
return swigBinary
6648

6749
VERSION = '0.0.5'
6850

@@ -86,7 +68,7 @@ def get_swig_executable():
8668
cmdclass={
8769
'build': CustomBuild,
8870
'install': CustomInstall,
89-
'build_ext': Build_Ext_find_swig3,
71+
'build_ext': Swig3Ext,
9072
},
9173
include_package_data=True,
9274
)

0 commit comments

Comments
 (0)