github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2605 from angeloc/0.11 

Fixing --withouth-test install option
pull/2607/head
Sergey G. Brester 2020-01-16 13:45:49 +01:00 committed by GitHub
parent 50fbcda8b6 5fa1f69264
commit d2d3762ba9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
setup.py
View File

@ -134,28 +134,13 @@ class install_command_f2b(install):
cmdclass = self.distribution.cmdclass cmdclass = self.distribution.cmdclass
cmdclass['build_py'] = build_py_2to3 cmdclass['build_py'] = build_py_2to3
cmdclass['build_scripts'] = build_scripts_2to3 cmdclass['build_scripts'] = build_scripts_2to3
if not self.without_tests: if self.without_tests:
self.distribution.scripts += [ self.distribution.scripts.remove('bin/fail2ban-testcases')
'bin/fail2ban-testcases',
]
self.distribution.packages += [ self.distribution.packages.remove('fail2ban.tests')
'fail2ban.tests', self.distribution.packages.remove('fail2ban.tests.action_d')
'fail2ban.tests.action_d',
]
self.distribution.package_data = { del self.distribution.package_data['fail2ban.tests']
'fail2ban.tests':
[ join(w[0], f).replace("fail2ban/tests/", "", 1)
for w in os.walk('fail2ban/tests/files')
for f in w[2]] +
[ join(w[0], f).replace("fail2ban/tests/", "", 1)
for w in os.walk('fail2ban/tests/config')
for f in w[2]] +
[ join(w[0], f).replace("fail2ban/tests/", "", 1)
for w in os.walk('fail2ban/tests/action_d')
for f in w[2]]
}
install.finalize_options(self) install.finalize_options(self)
def run(self): def run(self):
install.run(self) install.run(self)
@ -239,13 +224,28 @@ setup(
'bin/fail2ban-client', 'bin/fail2ban-client',
'bin/fail2ban-server', 'bin/fail2ban-server',
'bin/fail2ban-regex', 'bin/fail2ban-regex',
'bin/fail2ban-testcases',
# 'bin/fail2ban-python', -- link (binary), will be installed via install_scripts_f2b wrapper # 'bin/fail2ban-python', -- link (binary), will be installed via install_scripts_f2b wrapper
], ],
packages = [ packages = [
'fail2ban', 'fail2ban',
'fail2ban.client', 'fail2ban.client',
'fail2ban.server', 'fail2ban.server',
'fail2ban.tests',
'fail2ban.tests.action_d',
], ],
package_data = {
'fail2ban.tests':
[ join(w[0], f).replace("fail2ban/tests/", "", 1)
for w in os.walk('fail2ban/tests/files')
for f in w[2]] +
[ join(w[0], f).replace("fail2ban/tests/", "", 1)
for w in os.walk('fail2ban/tests/config')
for f in w[2]] +
[ join(w[0], f).replace("fail2ban/tests/", "", 1)
for w in os.walk('fail2ban/tests/action_d')
for f in w[2]]
},
data_files = [ data_files = [
('/etc/fail2ban', ('/etc/fail2ban',
glob("config/*.conf") glob("config/*.conf")