[pytango] 06/25: Simplify get_script_files in setup

Sandor Bodo-Merle sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:17:15 UTC 2017


This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to tag v8.1.9
in repository pytango.

commit ca67e9ccd95507b037f914277b0de0d28052f285
Author: Vincent Michel <vincent.michel at maxlab.lu.se>
Date:   Wed Apr 6 13:06:54 2016 +0200

    Simplify get_script_files in setup
---
 setup.py | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/setup.py b/setup.py
index 9899bfb..8c5842a 100644
--- a/setup.py
+++ b/setup.py
@@ -121,31 +121,10 @@ def has_numpy(with_src=True):
 
 
 def get_script_files():
-
-    FILTER_OUT = []  # "winpostinstall.py",
-
-    if os.name != "nt":
-        FILTER_OUT.append("pytango_winpostinstall.py")
-
-    scripts_dir = abspath("scripts")
-    scripts = []
-    items = os.listdir(scripts_dir)
-    for item in items:
-        # avoid hidden files
-        if item.startswith("."):
-            continue
-        abs_item = os.path.join(scripts_dir, item)
-        # avoid non files
-        if not os.path.isfile(abs_item):
-            continue
-        if item.endswith('c') and item[:-1] in items:
-            continue
-        # avoid any core dump... of course there isn't any :-) but just in case
-        if item.startswith('core'):
-            continue
-        if item in FILTER_OUT:
-            continue
-        scripts.append('scripts/' + item)
+    major = platform.python_version_tuple()[0]
+    scripts = ['scripts/itango3' if major == 3 else 'scripts/itango']
+    if os.name == "nt":
+        scripts.append("scripts/pytango_winpostinstall.py")
     return scripts
 
 
@@ -171,7 +150,7 @@ def add_lib(name, dirs, sys_libs, env_name=None, lib_name=None, inc_suffix=None)
             if os.path.isdir(lib64_dir):
                 lib_dirs.insert(0, lib64_dir)
         dirs['library_dirs'].extend(lib_dirs)
-        
+
         if lib_name.startswith('lib'):
             lib_name = lib_name[3:]
         dirs['libraries'].append(lib_name)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git



More information about the debian-science-commits mailing list