summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <cheimes@redhat.com>2016-10-24 14:56:58 +0200
committerMartin Basti <mbasti@redhat.com>2016-10-25 18:11:31 +0200
commit91920e7cb48cbf143ae281c9c073df14b2c2dddf (patch)
tree69c1f0e8996d5036df289e5e3401129808890895
parent9b0b97073304ba6bfdd6292b07533ab3e7fe8bcb (diff)
downloadfreeipa-91920e7cb48cbf143ae281c9c073df14b2c2dddf.tar.gz
freeipa-91920e7cb48cbf143ae281c9c073df14b2c2dddf.tar.xz
freeipa-91920e7cb48cbf143ae281c9c073df14b2c2dddf.zip
Add __name__ == __main__ guards to setup.pys
Signed-off-by: Christian Heimes <cheimes@redhat.com> Reviewed-By: Petr Spacek <pspacek@redhat.com> Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Lenka Doudova <ldoudova@redhat.com>
-rw-r--r--ipaclient/setup.py40
-rw-r--r--ipalib/setup.py26
-rw-r--r--ipaplatform/setup.py34
-rwxr-xr-xipapython/setup.py32
-rwxr-xr-xipaserver/setup.py39
-rw-r--r--ipatests/pytest.ini7
-rw-r--r--ipatests/setup.py70
7 files changed, 127 insertions, 121 deletions
diff --git a/ipaclient/setup.py b/ipaclient/setup.py
index 8b9dd582a..32778b0f9 100644
--- a/ipaclient/setup.py
+++ b/ipaclient/setup.py
@@ -20,26 +20,26 @@
FreeIPA is a server for identity, policy, and audit.
"""
-import os
+from os.path import abspath, dirname
import sys
-# include ../ for ipasetup.py
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+if __name__ == '__main__':
+ # include ../ for ipasetup.py
+ sys.path.append(dirname(dirname(abspath(__file__))))
+ from ipasetup import ipasetup # noqa: E402
-from ipasetup import ipasetup # noqa: E402
-
-ipasetup(
- name="ipaclient",
- doc=__doc__,
- scripts=['../ipa'],
- package_dir={'ipaclient': ''},
- packages=[
- "ipaclient",
- "ipaclient.plugins",
- "ipaclient.remote_plugins",
- "ipaclient.remote_plugins.2_49",
- "ipaclient.remote_plugins.2_114",
- "ipaclient.remote_plugins.2_156",
- "ipaclient.remote_plugins.2_164",
- ],
-)
+ ipasetup(
+ name="ipaclient",
+ doc=__doc__,
+ scripts=['../ipa'],
+ package_dir={'ipaclient': ''},
+ packages=[
+ "ipaclient",
+ "ipaclient.plugins",
+ "ipaclient.remote_plugins",
+ "ipaclient.remote_plugins.2_49",
+ "ipaclient.remote_plugins.2_114",
+ "ipaclient.remote_plugins.2_156",
+ "ipaclient.remote_plugins.2_164",
+ ],
+ )
diff --git a/ipalib/setup.py b/ipalib/setup.py
index 62a44997a..982a783e5 100644
--- a/ipalib/setup.py
+++ b/ipalib/setup.py
@@ -20,19 +20,19 @@
FreeIPA is a server for identity, policy, and audit.
"""
-import os
+from os.path import abspath, dirname
import sys
-# include ../ for ipasetup.py
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+if __name__ == '__main__':
+ # include ../ for ipasetup.py
+ sys.path.append(dirname(dirname(abspath(__file__))))
+ from ipasetup import ipasetup # noqa: E402
-from ipasetup import ipasetup # noqa: E402
-
-ipasetup(
- name="ipalib",
- doc=__doc__,
- package_dir={'ipalib': ''},
- packages=[
- "ipalib",
- ],
-)
+ ipasetup(
+ name="ipalib",
+ doc=__doc__,
+ package_dir={'ipalib': ''},
+ packages=[
+ "ipalib",
+ ],
+ )
diff --git a/ipaplatform/setup.py b/ipaplatform/setup.py
index 8b2d75d87..82499da21 100644
--- a/ipaplatform/setup.py
+++ b/ipaplatform/setup.py
@@ -20,23 +20,23 @@
FreeIPA is a server for identity, policy, and audit.
"""
-import os
+from os.path import abspath, dirname
import sys
-# include ../ for ipasetup.py
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+if __name__ == '__main__':
+ # include ../ for ipasetup.py
+ sys.path.append(dirname(dirname(abspath(__file__))))
+ from ipasetup import ipasetup # noqa: E402
-from ipasetup import ipasetup # noqa: E402
-
-ipasetup(
- name="ipaplatform",
- doc=__doc__,
- package_dir={'ipaplatform': ''},
- packages=[
- "ipaplatform",
- "ipaplatform.base",
- "ipaplatform.fedora",
- "ipaplatform.redhat",
- "ipaplatform.rhel"
- ],
-)
+ ipasetup(
+ name="ipaplatform",
+ doc=__doc__,
+ package_dir={'ipaplatform': ''},
+ packages=[
+ "ipaplatform",
+ "ipaplatform.base",
+ "ipaplatform.fedora",
+ "ipaplatform.redhat",
+ "ipaplatform.rhel"
+ ],
+ )
diff --git a/ipapython/setup.py b/ipapython/setup.py
index 81e032b23..47acdd6f2 100755
--- a/ipapython/setup.py
+++ b/ipapython/setup.py
@@ -20,22 +20,22 @@
FreeIPA is a server for identity, policy, and audit.
"""
-import os
+from os.path import abspath, dirname
import sys
-# include ../ for ipasetup.py
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+if __name__ == '__main__':
+ # include ../ for ipasetup.py
+ sys.path.append(dirname(dirname(abspath(__file__))))
+ from ipasetup import ipasetup # noqa: E402
-from ipasetup import ipasetup # noqa: E402
-
-ipasetup(
- name="ipapython",
- doc=__doc__,
- package_dir={'ipapython': ''},
- packages=[
- "ipapython",
- "ipapython.dnssec",
- "ipapython.secrets",
- "ipapython.install"
- ],
-)
+ ipasetup(
+ name="ipapython",
+ doc=__doc__,
+ package_dir={'ipapython': ''},
+ packages=[
+ "ipapython",
+ "ipapython.dnssec",
+ "ipapython.secrets",
+ "ipapython.install"
+ ],
+ )
diff --git a/ipaserver/setup.py b/ipaserver/setup.py
index 73afb7096..e24e1971d 100755
--- a/ipaserver/setup.py
+++ b/ipaserver/setup.py
@@ -22,26 +22,25 @@
"""
Python-level packaging using setuptools
"""
-import os
+from os.path import abspath, dirname
import sys
-# include ../ for ipasetup.py and ipalib
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+if __name__ == '__main__':
+ # include ../ for ipasetup.py
+ sys.path.append(dirname(dirname(abspath(__file__))))
+ from ipasetup import ipasetup # noqa: E402
-from ipasetup import ipasetup # noqa: E402
-
-
-ipasetup(
- name='freeipa',
- doc=__doc__,
- package_dir={'ipaserver': ''},
- packages=[
- 'ipaserver',
- 'ipaserver.advise',
- 'ipaserver.advise.plugins',
- 'ipaserver.plugins',
- 'ipaserver.install',
- 'ipaserver.install.plugins',
- 'ipaserver.install.server',
- ],
-)
+ ipasetup(
+ name='freeipa',
+ doc=__doc__,
+ package_dir={'ipaserver': ''},
+ packages=[
+ 'ipaserver',
+ 'ipaserver.advise',
+ 'ipaserver.advise.plugins',
+ 'ipaserver.plugins',
+ 'ipaserver.install',
+ 'ipaserver.install.plugins',
+ 'ipaserver.install.server',
+ ],
+ )
diff --git a/ipatests/pytest.ini b/ipatests/pytest.ini
index 5b8994288..b2497cb45 100644
--- a/ipatests/pytest.ini
+++ b/ipatests/pytest.ini
@@ -15,7 +15,14 @@ addopts = --doctest-modules
-p ipatests.pytest_plugins.additional_config
# Ignore files for doc tests.
# TODO: ideally, these should all use __name__=='__main__' guards
+ --ignore=ipasetup.py
--ignore=setup.py
+ --ignore=ipaclient/setup.py
+ --ignore=ipalib/setup.py
+ --ignore=ipaplatform/setup.py
+ --ignore=ipapython/setup.py
+ --ignore=ipaserver/setup.py
+ --ignore=ipatests/setup.py
--ignore=checks/check-ra.py
--ignore=daemons/ipa-otpd/test.py
--ignore=doc/examples/python-api.py
diff --git a/ipatests/setup.py b/ipatests/setup.py
index 86ee9129a..32a520796 100644
--- a/ipatests/setup.py
+++ b/ipatests/setup.py
@@ -20,41 +20,41 @@
FreeIPA is a server for identity, policy, and audit.
"""
-import os
+from os.path import abspath, dirname
import sys
-# include ../ for ipasetup.py
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+if __name__ == '__main__':
+ # include ../ for ipasetup.py
+ sys.path.append(dirname(dirname(abspath(__file__))))
+ from ipasetup import ipasetup # noqa: E402
-from ipasetup import ipasetup # noqa: E402
-
-ipasetup(
- name="ipatests",
- doc=__doc__,
- package_dir={'ipatests': ''},
- packages=[
- "ipatests",
- "ipatests.pytest_plugins",
- "ipatests.test_cmdline",
- "ipatests.test_install",
- "ipatests.test_integration",
- "ipatests.test_ipalib",
- "ipatests.test_ipapython",
- "ipatests.test_ipaserver",
- "ipatests.test_ipaserver.test_install",
- "ipatests.test_pkcs10",
- "ipatests.test_webui",
- "ipatests.test_xmlrpc",
- "ipatests.test_xmlrpc.tracker"
- ],
- scripts=['ipa-run-tests', 'ipa-test-config', 'ipa-test-task'],
- package_data={
- 'ipatests': ['pytest.ini'],
- 'ipatests.test_install': ['*.update'],
- 'ipatests.test_integration': ['scripts/*'],
- 'ipatests.test_ipalib': ['data/*'],
- 'ipatests.test_pkcs10': ['*.csr'],
- "ipatests.test_ipaserver": ['data/*'],
- 'ipatests.test_xmlrpc': ['data/*'],
- }
-)
+ ipasetup(
+ name="ipatests",
+ doc=__doc__,
+ package_dir={'ipatests': ''},
+ packages=[
+ "ipatests",
+ "ipatests.pytest_plugins",
+ "ipatests.test_cmdline",
+ "ipatests.test_install",
+ "ipatests.test_integration",
+ "ipatests.test_ipalib",
+ "ipatests.test_ipapython",
+ "ipatests.test_ipaserver",
+ "ipatests.test_ipaserver.test_install",
+ "ipatests.test_pkcs10",
+ "ipatests.test_webui",
+ "ipatests.test_xmlrpc",
+ "ipatests.test_xmlrpc.tracker"
+ ],
+ scripts=['ipa-run-tests', 'ipa-test-config', 'ipa-test-task'],
+ package_data={
+ 'ipatests': ['pytest.ini'],
+ 'ipatests.test_install': ['*.update'],
+ 'ipatests.test_integration': ['scripts/*'],
+ 'ipatests.test_ipalib': ['data/*'],
+ 'ipatests.test_pkcs10': ['*.csr'],
+ "ipatests.test_ipaserver": ['data/*'],
+ 'ipatests.test_xmlrpc': ['data/*'],
+ }
+ )