DISPATCH-2035 Reduce number of configure_file calls in CMake build (#1225)

This is possible thanks to supporting only Python 3 now.

Author: jiridanek

.gitignore

@@ -7,11 +7,6 @@ install
 .pydevproject
 tests/system_test.dir/
 tests/policy-1/policy-*.json
-tests/authservice.py
-tests/failoverserver.py
-tests/system_tests_authz_service_plugin.py
-tests/system_tests_handle_failover.py
-tests/system_tests_topology_disposition.py
 tests/system_tests_http.py
 python/qpid_dispatch_internal/management/agent.py
 *.iml
@@ -21,8 +16,6 @@ python/qpid_dispatch_internal/management/agent.py
 .history/
 .tox
 .vscode
-tools/qdmanage
-tools/qdstat
 console/react/node_modules/
 console/react/build/
 console/react/coverage/

CMakeLists.txt

@@ -142,13 +142,6 @@ if (LIBWEBSOCKETS_FOUND AND LIBWEBSOCKETS_VERSION_STRING)
 
 endif(LIBWEBSOCKETS_FOUND AND LIBWEBSOCKETS_VERSION_STRING)
 
-# Python
-if (Python_VERSION_MAJOR STREQUAL 3)
-    set(PY_STRING "python3")
-elseif(Python_VERSION_MAJOR STREQUAL 2)
-    set(PY_STRING "python")
-endif()
-
 if (NOT DEFINED DISPATCH_TEST_TIMEOUT)
     set(DISPATCH_TEST_TIMEOUT "600")
 endif (NOT DEFINED DISPATCH_TEST_TIMEOUT)
@@ -264,9 +257,6 @@ install(FILES include/qpid/dispatch.h DESTINATION ${INCLUDE_INSTALL_DIR}/qpid)
 install(FILES etc/qdrouterd.conf DESTINATION ${SYSCONF_INSTALL_DIR}/qpid-dispatch)
 install(FILES etc/sasl2/qdrouterd.conf DESTINATION ${SYSCONF_INSTALL_DIR}/sasl2)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tools/qdstat.in ${CMAKE_CURRENT_SOURCE_DIR}/tools/qdstat)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tools/qdmanage.in ${CMAKE_CURRENT_SOURCE_DIR}/tools/qdmanage)
-
 
 # Tools
 install(PROGRAMS
@@ -285,12 +275,7 @@ add_subdirectory(src) # Build src first so other subdirs can use QPID_DISPATCH_L
 # run.py environment runner script - needs QPID_DISPATCH_LIB
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/run.py.in ${CMAKE_CURRENT_BINARY_DIR}/run.py)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/run.py.in ${CMAKE_CURRENT_BINARY_DIR}/tests/run.py)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/authservice.py.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/authservice.py)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/failoverserver.py.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/failoverserver.py)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/system_tests_authz_service_plugin.py.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/system_tests_authz_service_plugin.py)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/system_tests_handle_failover.py.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/system_tests_handle_failover.py)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/system_tests_http.py.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/system_tests_http.py)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/system_tests_topology_disposition.py.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/system_tests_topology_disposition.py)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/python/qpid_dispatch_internal/management/agent.py.in ${CMAKE_CURRENT_SOURCE_DIR}/python/qpid_dispatch_internal/management/agent.py)
 execute_process(COMMAND ${RUN} --sh OUTPUT_FILE config.sh)
 

python/setup.py.in

@@ -1,4 +1,4 @@
-#!/usr/bin/env ${PY_STRING}
+#!/usr/bin/env python3
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

run.py.in

@@ -1,4 +1,4 @@
-#!/usr/bin/env ${PY_STRING}
+#!/usr/bin/env python3
 ##
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

tests/authservice.py.in renamed to tests/authservice.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env ${PY_STRING}
+#!/usr/bin/env python3
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -18,18 +18,14 @@
 # under the License.
 #
 
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from __future__ import print_function
-
-import sys
-import signal
 import optparse
+import signal
+import sys
+
+from cproton import pn_sasl_config_path
+from proton import Array, Data, symbol, UNDESCRIBED
 from proton.handlers import MessagingHandler
 from proton.reactor import Container
-from proton import Array, Data, symbol, UNDESCRIBED
-from cproton import pn_sasl_config_path
 
 
 class AuthService(MessagingHandler):

tests/failoverserver.py.in renamed to tests/failoverserver.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env ${PY_STRING}
+#!/usr/bin/env python3
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -18,18 +18,13 @@
 # under the License.
 #
 
-
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from __future__ import print_function
-
-import signal
 import optparse
+import signal
 import sys
+
+from proton import symbol
 from proton.handlers import MessagingHandler
 from proton.reactor import Container
-from proton import symbol
 
 
 class FailoverServer(MessagingHandler):

tests/system_tests_authz_service_plugin.py.in renamed to tests/system_tests_authz_service_plugin.py

@@ -17,19 +17,17 @@
 # under the License.
 #
 
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from __future__ import print_function
-
 import os
+import sys
 from subprocess import PIPE, Popen
-from system_test import TestCase, Qdrouterd, main_module, DIR, Process, SkipIfNeeded
-from system_test import unittest
+
 from proton import Message, SASL
 from proton.handlers import MessagingHandler
 from proton.reactor import Container
 
+from system_test import TestCase, Qdrouterd, main_module, DIR, Process, SkipIfNeeded
+from system_test import unittest
+
 
 class AuthServicePluginAuthzTest(TestCase):
     @classmethod
@@ -70,7 +68,7 @@ def setUpClass(cls):
         cls.createSaslFiles()
 
         cls.auth_service_port = cls.tester.get_port()
-        cls.tester.popen(['/usr/bin/env', '${PY_STRING}', os.path.join(os.path.dirname(os.path.abspath(__file__)), 'authservice.py'),
+        cls.tester.popen([sys.executable, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'authservice.py'),
                           '-a', 'amqps://127.0.0.1:%d' % cls.auth_service_port, '-c', os.getcwd()], expect=Process.RUNNING)
 
         policy_config_path = os.path.join(DIR, 'policy-authz')
@@ -155,7 +153,7 @@ def setUpClass(cls):
         cls.createSaslFiles()
 
         cls.auth_service_port = cls.tester.get_port()
-        cls.tester.popen(['/usr/bin/env', '${PY_STRING}', os.path.join(os.path.dirname(os.path.abspath(__file__)), 'authservice.py'),
+        cls.tester.popen([sys.executable, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'authservice.py'),
                           '-a', 'amqps://127.0.0.1:%d' % cls.auth_service_port, '-c', os.getcwd()], expect=Process.RUNNING)
 
         cls.router_port = cls.tester.get_port()

tests/system_tests_handle_failover.py.in renamed to tests/system_tests_handle_failover.py

@@ -17,19 +17,16 @@
 # under the License.
 #
 
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from __future__ import print_function
-
-import os
-from threading import Timer
 import json
+import os
 import re
-from system_test import main_module, TIMEOUT
+import sys
+from subprocess import PIPE, STDOUT
+from threading import Timer
+
 from system_test import TestCase, Qdrouterd, Process, TIMEOUT
+from system_test import main_module
 from system_test import unittest
-from subprocess import PIPE, STDOUT
 
 
 class FailoverTest(TestCase):
@@ -288,7 +285,7 @@ def test_4_remove_router_B_connect_to_my_server(self):
 
         # Start MyServer
         proc = FailoverTest.tester.popen(
-            ['/usr/bin/env', '${PY_STRING}', os.path.join(os.path.dirname(os.path.abspath(__file__)), 'failoverserver.py'), '-a',
+            [sys.executable, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'failoverserver.py'), '-a',
              'amqp://127.0.0.1:%d' % FailoverTest.my_server_port], expect=Process.RUNNING)
 
         # Kill the router B again

tests/system_tests_topology_disposition.py.in renamed to tests/system_tests_topology_disposition.py

@@ -17,22 +17,18 @@
 # under the License.
 #
 
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from __future__ import print_function
-
-import unittest
 import os
+import sys
+import time
+import unittest
 from subprocess import PIPE, STDOUT
+
 from proton import Message, Timeout
-from system_test import TestCase, Qdrouterd, main_module
 from proton.handlers import MessagingHandler
 from proton.reactor import Container
 from qpid_dispatch_internal.compat import UNICODE
 
-import time
-import sys
+from system_test import TestCase, Qdrouterd, main_module
 
 
 # ================================================
@@ -422,7 +418,7 @@ def test_04_scraper_tool(self):
         files = []
         for router in [self.router_A, self.router_B, self.router_C, self.router_D]:
             files.append(router.logfile_path)
-        p = self.popen(['/usr/bin/env', '${PY_STRING}', scraper_path, '-f'] + files,
+        p = self.popen([sys.executable, scraper_path, '-f'] + files,
                        stdin=PIPE, stdout=PIPE, stderr=STDOUT,
                        universal_newlines=True)
         out = p.communicate(None)[0]
@@ -438,7 +434,7 @@ def test_04_scraper_tool(self):
         self.assertIn('</body>', out)
 
         # split A.log
-        p = self.popen(['/usr/bin/env', '${PY_STRING}', scraper_path, '--split', '-f', self.router_A.logfile_path],
+        p = self.popen([sys.executable, scraper_path, '--split', '-f', self.router_A.logfile_path],
                        stdin=PIPE, stdout=PIPE, stderr=STDOUT,
                        universal_newlines=True)
         out = p.communicate(None)[0]

tools/qdmanage.in renamed to tools/qdmanage

@@ -1,4 +1,4 @@
-#!/usr/bin/env ${PY_STRING}
+#!/usr/bin/env python3
 
 #
 # Licensed to the Apache Software Foundation (ASF) undeugr one
@@ -19,11 +19,6 @@
 # under the License.
 #
 
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from __future__ import print_function
-
 import sys
 import json
 import re

tools/qdstat.in renamed to tools/qdstat

@@ -1,4 +1,4 @@
-#!/usr/bin/env ${PY_STRING}
+#!/usr/bin/env python3
 
 #
 # Licensed to the Apache Software Foundation (ASF) under one
@@ -19,11 +19,6 @@
 # under the License.
 #
 
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from __future__ import print_function
-
 import sys
 from datetime import datetime
 from time import ctime, strftime, gmtime