merge common

Former-commit-id: 23675e6919 [formerly e9f9b0eaa2] [formerly 821026e137 [formerly f47fc88253]] [formerly 8fef239859 [formerly 132ff158ab] [formerly 04bd6cd067 [formerly 4362bf1bb7]]] [formerly cd80b79247 [formerly e461e191c4] [formerly af85d7ee0c [formerly 6be7cb47d0]] [formerly e3a7897f28 [formerly 477b4e7f10] [formerly 5d1320f366 [formerly 082690e82b]]]] [formerly 2678c6cdca [formerly 16c8bbec8a] [formerly 7f2c500bef [formerly b237b8aa0e]] [formerly 01702377e0 [formerly 8efda3c15c] [formerly 54b32a974c [formerly c023304b55]]] [formerly 0b9e26b911 [formerly a7b1a0b272] [formerly 1281624b0e [formerly c07fed4d54]] [formerly 5e4bc5952b [formerly b3ebcaf2b7] [formerly efb215846c [formerly e4eb0cc5eb]]]]] [formerly d31a323501 [formerly e0d1a77b89] [formerly 4dbcc17dec [formerly f60ed7bc0f]] [formerly 1e3787537d [formerly f8749c5245] [formerly 21b5f3b82d [formerly b8be280d13]]] [formerly c2d644c43b [formerly 9e3969e76b] [formerly 1b44de0e01 [formerly b25c06ea90]] [formerly dd32706ad2 [formerly 2afed3da2f] [formerly 529244427e [formerly 34aedc9533]]]] [formerly 74bd080eaf [formerly c00898dba4] [formerly e09dec1d98 [formerly 35695e654d]] [formerly 3877bb0406 [formerly 129f14b0b0] [formerly 100627626d [formerly 88d2f3c0f0]]] [formerly 55c935a29e [formerly a5aa1ecd97] [formerly 4e3c8dd809 [formerly 9aed1ca716]] [formerly bd28ac9207 [formerly 318e60b9a2] [formerly 0edbe9964d [formerly ea0da51130]]]]]]
Former-commit-id: f56f105200 [formerly 94fcb4cad1] [formerly ef90a7c3d2 [formerly e3fe93f349]] [formerly fe78cff9bc [formerly fda0fa8f83] [formerly 0a02cf0dcc [formerly ac4e890666]]] [formerly cd9ace53b0 [formerly 6df2d61ea5] [formerly 68dfe4365a [formerly 964f21affb]] [formerly a086ad4992 [formerly 66d38deaaa] [formerly 4aef08c65f [formerly ef2d9658f5]]]] [formerly bd00b5531d [formerly 6765b81232] [formerly a069c68b6b [formerly e5c8a30d1b]] [formerly b1ab45c333 [formerly 4f92c4844f] [formerly 121f54e4ae [formerly 782a6f0a9f]]] [formerly 720034c400 [formerly c92cb05516] [formerly 6d23d784e3 [formerly eee60edf2a]] [formerly 077af133d1 [formerly 8d06c914d9] [formerly 0edbe9964d]]]]
Former-commit-id: e80134d5c4 [formerly e5a1f78ec7] [formerly 0b2328680b [formerly 620148bfa9]] [formerly 6daab9449c [formerly d6ae4d07ff] [formerly 70d55f9ec1 [formerly 88196fa0a3]]] [formerly 661c703154 [formerly c131191d81] [formerly bc085ec3d0 [formerly 4af58087cb]] [formerly 4c334c40b7 [formerly 9dbceedfa3] [formerly a88137d8af [formerly 12e6242ce6]]]]
Former-commit-id: e7d23849a5 [formerly 9157089815] [formerly 8542868311 [formerly e9204a263a]] [formerly ddfd399e9e [formerly e302a043f7] [formerly 0846529176 [formerly ac0d2af50e]]]
Former-commit-id: 4c66d5736c [formerly 5e2338ecc0] [formerly f79e3d80f1 [formerly 84c9ba12df]]
Former-commit-id: f9f00002e6 [formerly bda52e5f9e]
Former-commit-id: f833c7680e

setup.py

@@ -10,7 +10,7 @@ def read_file_entry_points(fname):
         return entry_points.read()
 
 def merge_entry_points():
-    entry_list = ['entry_points.ini', 'entry_points_common.ini']
+    entry_list = ['entry_points.ini']
     merge_entry = []
     for entry_name in entry_list:
         entry_point = read_file_entry_points(entry_name).replace(' ', '')