URL: https://github.com/freeipa/freeipa/pull/183
Author: tiran
Title: #183: Add __name__ == __main__ guards to setup.pys
Action: opened
PR body:
"""
Signed-off-by: Christian Heimes <chei...@redhat.com>
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/183/head:pr183
git checkout pr183
From 6dcab60458abb2d177dfe344aa00e1e9fcf74670 Mon Sep 17 00:00:00 2001
From: Christian Heimes <chei...@redhat.com>
Date: Mon, 24 Oct 2016 14:56:58 +0200
Subject: [PATCH] Add __name__ == __main__ guards to setup.pys
Signed-off-by: Christian Heimes <chei...@redhat.com>
---
ipaclient/setup.py | 38 ++++++++++++++---------------
ipalib/setup.py | 24 +++++++++----------
ipaplatform/setup.py | 32 ++++++++++++-------------
ipapython/setup.py | 23 +++++++++---------
ipaserver/setup.py | 37 ++++++++++++++---------------
ipatests/pytest.ini | 7 ++++++
ipatests/setup.py | 67 ++++++++++++++++++++++++++--------------------------
7 files changed, 118 insertions(+), 110 deletions(-)
diff --git a/ipaclient/setup.py b/ipaclient/setup.py
index 8b9dd58..6586848 100644
--- a/ipaclient/setup.py
+++ b/ipaclient/setup.py
@@ -23,23 +23,23 @@
import os
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(os.path.dirname(os.path.dirname(os.path.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 62a4499..92d518f 100644
--- a/ipalib/setup.py
+++ b/ipalib/setup.py
@@ -23,16 +23,16 @@
import os
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(os.path.dirname(os.path.dirname(os.path.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 8b2d75d..b8cc067 100644
--- a/ipaplatform/setup.py
+++ b/ipaplatform/setup.py
@@ -23,20 +23,20 @@
import os
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(os.path.dirname(os.path.dirname(os.path.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 81e032b..67d9520 100755
--- a/ipapython/setup.py
+++ b/ipapython/setup.py
@@ -28,14 +28,15 @@
from ipasetup import ipasetup # noqa: E402
-ipasetup(
- name="ipapython",
- doc=__doc__,
- package_dir={'ipapython': ''},
- packages=[
- "ipapython",
- "ipapython.dnssec",
- "ipapython.secrets",
- "ipapython.install"
- ],
-)
+if __name__ == '__main__':
+ 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 73afb70..af7c59b 100755
--- a/ipaserver/setup.py
+++ b/ipaserver/setup.py
@@ -25,23 +25,22 @@
import os
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(os.path.dirname(os.path.dirname(os.path.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 5b89942..b2497cb 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 86ee912..2c620d5 100644
--- a/ipatests/setup.py
+++ b/ipatests/setup.py
@@ -23,38 +23,39 @@
import os
import sys
-# include ../ for ipasetup.py
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from ipasetup import ipasetup # noqa: E402
+if __name__ == '__main__':
+ # include ../ for ipasetup.py
+ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+ 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/*'],
+ }
+ )
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
