From 91e0ce9ac34089098e6227797b4b9494d8033eae Mon Sep 17 00:00:00 2001 From: lhenry15 Date: Sun, 20 Sep 2020 09:24:58 -0500 Subject: [PATCH] merge common Former-commit-id: 23675e6919058abb4384eb7ced7db64e81755066 [formerly e9f9b0eaa27fa3ecc091442b2ccc1b70d2c00014] [formerly 821026e137b671bba345b0de6303d3ba776a2a47 [formerly f47fc882533eb376606dbc7cb4227867147efc70]] [formerly 8fef239859f34b60e9ddd9a19cba8e27eaa8d7e8 [formerly 132ff158ab538b866bb4d4512e2bf7b5a9e81ff4] [formerly 04bd6cd0671d8f9ca42680a8fe5950971d3f66de [formerly 4362bf1bb758dac8237afe397f6bd25ca87f9a35]]] [formerly cd80b79247aba8f27537c8e43b6f6a23ade72a46 [formerly e461e191c43a243be15c8ced1858e20d9815f2fb] [formerly af85d7ee0c04f648738dac43bce51bdadcf76417 [formerly 6be7cb47d066cbc2a1d39a9d1c398cd66ddb511f]] [formerly e3a7897f284c169edc254252afdb60d7443ae7f6 [formerly 477b4e7f106be3c322828500cd470eda3ee48d17] [formerly 5d1320f366b0d0ffd89d3027b7450e819151a706 [formerly 082690e82bae19639910dd021bac488c9b7ba2df]]]] [formerly 2678c6cdcac14e449f1352c03e2b8eaa81675eb6 [formerly 16c8bbec8a3833ee85a4913fb4332b57580e6f59] [formerly 7f2c500bef660982780122ebbc8fb32dcecca041 [formerly b237b8aa0ece579c8741ecd61fe0dc33623a5484]] [formerly 01702377e050b06dda9c426b774fe3d02363ba87 [formerly 8efda3c15c80abd50da289b950a4bf9cf397dcd7] [formerly 54b32a974ce530da897d79e43ec99adafc1ce9b5 [formerly c023304b55b6bda6c232810be2044e4103a8064b]]] [formerly 0b9e26b911ef2bebe41190c709fd4e353a54857b [formerly a7b1a0b27203a6a268d3116eddd97f69768db702] [formerly 1281624b0ecccc8231f7d6e97e81016fefb21722 [formerly c07fed4d54a6b9053281d66fc180b9352477b27a]] [formerly 5e4bc5952b11a020a7fca105a0cfd5b8c5dc59fa [formerly b3ebcaf2b73b031f670c34c7feea8c3db9aca822] [formerly efb215846c21f1b60d2ea5db04677d230730c09f [formerly e4eb0cc5eb4907ca5a508ef610b35c8814251fde]]]]] [formerly d31a3235010a7fcee77cc19cb502b0097353ae25 [formerly e0d1a77b89ef3134709df248f95b55a378945063] [formerly 4dbcc17dec5f8fee965cfaa1e147bdfa8208084e [formerly f60ed7bc0ff2ddcf38b0f4dfd2ba5d9fedefc288]] [formerly 1e3787537da748626d5f63031130c6979d3e9fec [formerly f8749c52455fa250a26920f2f1fd4244d3ae9f40] [formerly 21b5f3b82ddc53dd44124f2fe63b9f2363ebff7f [formerly b8be280d13311b4d506a939550c9b90e34208747]]] [formerly c2d644c43bccf337b621faafe9ad9cfac6cd3bfa [formerly 9e3969e76b8872459c8b474a37431b7961f200ad] [formerly 1b44de0e01e54fb097ed3d25fd9fbefce15a5951 [formerly b25c06ea909100c8fd87b10c5af93784f58c3234]] [formerly dd32706ad24bc1a4192907671fcfefcaf81c2a88 [formerly 2afed3da2f87adae02088f720b4dcd4176a194a5] [formerly 529244427ee1756f2b7af2327695cfa0fba90485 [formerly 34aedc95330659eaef75e779336a8013d3e0b9ce]]]] [formerly 74bd080eafb3cd5319d36c49d16e6edf74525005 [formerly c00898dba45cbd354d0cd93dce11bcdd97a60ed3] [formerly e09dec1d98c943f2691f0458ad22606e84fb3740 [formerly 35695e654d58e69cae9d0688b242ba70b53e6125]] [formerly 3877bb0406f0bfae57ece0733a19b90e63ac2ee3 [formerly 129f14b0b044e4d28c05890dbe2f95f1efd4632e] [formerly 100627626db44a965a1d120cf3cff8a6c34dd409 [formerly 88d2f3c0f075c99fc0cd397c74023de2d379890e]]] [formerly 55c935a29e749443ce197fca8152cd577e71f645 [formerly a5aa1ecd973ed137553e8132f7ef99bcdd8dd075] [formerly 4e3c8dd8091cde065e5dd62aeace9c7ee9b07a95 [formerly 9aed1ca7162dd8edc413c9db14a0cc45427ee3e6]] [formerly bd28ac9207e9aadb18a5e3d3b49b482e3ba6ae39 [formerly 318e60b9a26993cae4c23d3bf393f59bd31f633c] [formerly 0edbe9964d4f08fb63d2c363fbf95e4414d55a06 [formerly ea0da511302a19c9cf4ec9f886cc10176e8f329b]]]]]] Former-commit-id: f56f105200585785ca43c3590e38ef71d4a01386 [formerly 94fcb4cad18371653b7b785a9697c87c3c9e32e8] [formerly ef90a7c3d29e113f6b2b640e70363d64ebae8406 [formerly e3fe93f3494313b45defb33318aedff9e215d078]] [formerly fe78cff9bc20e23c3098baf34d04ed2e8d6bc666 [formerly fda0fa8f8322a59f1e81e12f259cdbf02fa8bb2b] [formerly 0a02cf0dccff2e3456c47872f276263e625b7c77 [formerly ac4e8906669a214d6230c8491ba112e57d12443c]]] [formerly cd9ace53b05296b014796a757c1f21c69c37788d [formerly 6df2d61ea567411d1ec7ecec2ff52edde4b47df9] [formerly 68dfe4365a032f34e82c28776452e5a3fc6e2b05 [formerly 964f21affb9b26d58186921930f7d62c430bf958]] [formerly a086ad4992a22b5a0e751862083bc6ba6233584e [formerly 66d38deaaaf2f7a5ca2974b88cf97971c75106c9] [formerly 4aef08c65fd64eaf1b6fdd21dd5d7f24b359aa27 [formerly ef2d9658f5d4a01bf4520423e10a1bf8929ed2a2]]]] [formerly bd00b5531d471bdc581b993e5461f6d87348a7d6 [formerly 6765b8123283c4275bf3dc6d72bf659d7b22fdcf] [formerly a069c68b6b2743a3f675dee84cb2257c4913ed49 [formerly e5c8a30d1baaaae9c6469dbd862a8d3c9dc0860b]] [formerly b1ab45c33392a99756281672b0f822ae86f585d6 [formerly 4f92c4844fc58ca4a7ac90495fd4d087ba32df85] [formerly 121f54e4ae694fabd01154f122f53c24da1b3682 [formerly 782a6f0a9f6e177e898c8ccff7086a51b4bd1913]]] [formerly 720034c400efab393375c1812063d5f80906a172 [formerly c92cb05516ad7c22fa18a471d201489d5dac44b7] [formerly 6d23d784e37917bd65d8c0f1c80c49d055a98dcc [formerly eee60edf2a48329b4541eef4e89ffd06ca53dc80]] [formerly 077af133d18418981995520e8f57a1fac854c2f5 [formerly 8d06c914d96f5c85eec80f20849e46d96f1ac9df] [formerly 0edbe9964d4f08fb63d2c363fbf95e4414d55a06]]]] Former-commit-id: e80134d5c46b30856f15387b6197e14b7a056aef [formerly e5a1f78ec7036c69b5e0dceab8219ca53f497aac] [formerly 0b2328680bdb133893a8951aa208cedea10234a2 [formerly 620148bfa9e9d037f18c6591cf01d0a9e863d230]] [formerly 6daab9449c7cfd8556cad527ad09f3145585d985 [formerly d6ae4d07ffd1cff324566c3187b5304f443a3b08] [formerly 70d55f9ec12185778257492990a24c711e23e415 [formerly 88196fa0a3794609972d9032fdcaf00edf7ea15d]]] [formerly 661c7031540e088670ba8a8ef8f8bc70f29b8ef1 [formerly c131191d816551844dfbd0029a13aad1f3aa526e] [formerly bc085ec3d0f1e9af4064e532b4ce3b562690a0d9 [formerly 4af58087cb12da60c25e8c1cd6b1622908c7ff81]] [formerly 4c334c40b76ae77d30c52db02b50235ccc320e87 [formerly 9dbceedfa39b319b4426df8a206b950fc2d5954a] [formerly a88137d8af5bd0b063ac7e1264d9886bdb7e0f2e [formerly 12e6242ce6bd5c9a0269cdec3a949f1e3cb57540]]]] Former-commit-id: e7d23849a534311ce04ca3f6a33ea2c8f72aa740 [formerly 91570898154b6a703b8ac1cd8b94bd2211e6cfe4] [formerly 85428683114276cf6409a6b5cd99b8a3d137a958 [formerly e9204a263ad120731f0200beb0a09c21df680514]] [formerly ddfd399e9e9d8d607f7e0d972a22b2591b53001b [formerly e302a043f7a0840f8558fafea2342c1bfa388ef1] [formerly 0846529176f1b58e27438561a0ff5b94de8007c6 [formerly ac0d2af50eaae542c0f02e54ff31e83136f66d2f]]] Former-commit-id: 4c66d5736c0713bba33c2fd6f8cd4c42d88887e0 [formerly 5e2338ecc0651961d224352158cf45cdae917d8e] [formerly f79e3d80f12abe9f4563105d5384a798fa23bbfa [formerly 84c9ba12dfdc0f4e118957149aaec54b880f8879]] Former-commit-id: f9f00002e6ead1349d7b8d86a8cb2a5e5fc831e5 [formerly bda52e5f9eb2406cf1efb88248fcee01dc0e0cdc] Former-commit-id: f833c7680e24f627131905e114ee672a2bebaf6d --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0843b23..678df86 100644 --- a/setup.py +++ b/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(' ', '')