From b1d5aeb646704342283dd3664ac46466a729d44d Mon Sep 17 00:00:00 2001 From: lhenry15 Date: Sun, 20 Sep 2020 18:31:52 -0500 Subject: [PATCH] 0.0.1 Former-commit-id: 1058f0f194f8031f06781352bbdb8e8456733da8 [formerly f6c630fe82df9ccc8cd49148b3d6fded932c6934] [formerly 14a95e6db1552201dea89dc928d02ea86003e4b7 [formerly daccc5b052b2c39a3cb55b249f90cea481041fe7]] [formerly 11288676cf2869055c386b2f7e87b70645274b98 [formerly 25b1a86a76e117c22164c29e1dbef4eda02239bb] [formerly d171a580f2f8bd545ab8800bc971d09861a2353e [formerly a672ed5d08295b20f5cc25eb78712a582f52ea4a]]] [formerly afd30d3ba4d9f77f21888cb4171a60b5e0357d52 [formerly 7690b2d4a97a593db8b782d8ee8359a049e98645] [formerly 78d00cdafb9230c6a9c094968840194db64c07c9 [formerly 78a02ea2254417b5fac5fa9b48bbc20bea5d19ec]] [formerly fb31a467e8de21725775d25819705117d9668784 [formerly 18d405292444a21e0f68f30aedc67520620f8e9f] [formerly 70b19ef68b17bb4654fc35e1e0d7809aaf3b972b [formerly 6d3c4ef48809aa36e961285239100ef25445f415]]]] [formerly 1119eeace5b538fc5f5550912a53ae14ff06f90e [formerly 807d4f7fdd4e1715252a08ce02b8283c64a00189] [formerly db0b982cc3e92bcf9b2df6b9e13164686a85fa97 [formerly 2f3b83bfb30e2677a83f92f5269bde8a51b4b40e]] [formerly 8554987fc972ed45a0c4476aa5f7feda1b17b171 [formerly 7798b592a2127cb054606ae7613deabb92691354] [formerly 188089842dfb371f8b52372ae91927ca5ed91104 [formerly d5748cdc0cdd29bf48de2db3633f514fb9b7a0e3]]] [formerly 300dea12d9067e2b185c234fda260326c786da2a [formerly d1321070bac31fef420781fd56386d50781b17af] [formerly ebd206e6c87c470ea035a502dff551a793c534cc [formerly 3e9186e86d40f183e17a45bf1d3112e2c4b23768]] [formerly ab28d546eea8cd678113adb157d5675ea9db61b0 [formerly dd759fe617ab307eea78391d402903844fee8dba] [formerly ea445c9d42fc3d465fc809f02d1090883185d769 [formerly 74261f0387563d41c4038235d69006ab031dcd0f]]]]] [formerly 765f30d954de5755d0773992b3ae2e02e56f76ad [formerly 941a4cbc197ff7b158da3498df1dc7687adb424a] [formerly 6c7a7e5ebf53f5fe41db12b9d9e0a7404eb8ec15 [formerly 9f759f733bee0215097365f3d7001f0bbfbf76fb]] [formerly 095f5fb3e8426ff0c4a888cb8cae31fcc6ee03c7 [formerly 52e2598fe0413df16b74b51363252d1da64e0ce2] [formerly effa873356dcd0cf2586d01f040c95c54c2c666e [formerly 76c13d4728af3c811f732f215c84073e6d6173f3]]] [formerly 4944dab012f1d089dfb20259960863d3654dd7a9 [formerly 0126c977d0995498ecea5c2ab47cc8866624455a] [formerly bb2ba9bf32c7eea6f3f1dc35da3ecac6852c56b3 [formerly 3441b8ac26797b08e6615edca1d0bbda9c5aa824]] [formerly c51b39351d09054dc9975e4f9414d4dcc5d24c29 [formerly eb643b8480ead84c68b7d687255772bf7a8029a9] [formerly 9e47fa1651e72415c43f0c80a5d0b9009087aa6f [formerly 8e5cb774621a03d6100cfa06991b64405854d346]]]] [formerly 06ab5acc41c8dfcf356f2eff1a6eccb4c3a87195 [formerly 17b788a5b57558081d7abba7ae182df41c31c884] [formerly e5348ffd0199ea43815cdc1a64eb545646d9d3fa [formerly 592cef128b388b70dbbc0c2d5488bead8d57732f]] [formerly 11c0b0cd7a55354bc2663a375688273a426c9075 [formerly 2e76c36fd7db962474662ce1604b46ebaeaba455] [formerly c9bd415b1b9e920acae9b9c5961d5508edef99fa [formerly ff8b1793b1f8f0672d91e01f28e1f9e8a9110890]]] [formerly ebc346bdf6abe2c24af02a7bbd79a62e65a12bc3 [formerly 97541f2febc5ec18104d40f689565a8c70b3132d] [formerly fba87c5e2e93332402f2ec4b0c703e0b1f549a24 [formerly 3169b68f7a3bab9e8fc1b9aa0a735946059b22eb]] [formerly 185dd022122d402a54520781024e0e97dcbce2e4 [formerly d39748eea875edeb250581017e1e2a30065e52e7] [formerly dea45ba532c99327967b7293316feb36e55f2dd2 [formerly 71d1e31c05f61850b85cd5e609db01eb1d862d11]]]]]] Former-commit-id: 16116eb46f75387f846393d2d2fdd7a058a686c2 [formerly b12035b3b5c354bd8610ef9d1a3be907d5144dae] [formerly 0cb52363162470344e6986f7276a4ec77667519d [formerly 6b83caf764a4f9ad31b46cd3ea80c638728d963b]] [formerly 0c3acde5fcc6cce7f90ed1e737cd1780e1f476ed [formerly 7de99a6c2626a96ac0030354a59f93794d713d42] [formerly a5502506fcb2a894cea1dd8da5c1a16e81db826d [formerly c4c5cfadf8a6abd0bf752045b572ce0070a4d070]]] [formerly 2666aaafcf762239ab7a525a02f0fd30c6affbf0 [formerly 159c6a222220c7a3df4f2106ee34c6bf5ee7d63b] [formerly b926a441bf4b004998f23d365739ba2833fae0d5 [formerly 0c749d76445aeb8469a6976ff2f8a1b5964dbd76]] [formerly 8e8d40e117d2ef58c05b3cd26ad7286a1625cea0 [formerly 0882e6be39ab58ed4731640ba22f251bf22cd63a] [formerly 7a47e63878e885dd82e2cd8623f568132d98725e [formerly d502eb31f5e77c4456c098970ef267aafa5de085]]]] [formerly 45b99ac2b6a5c43f83f69692100f6101fd371a0c [formerly 2856cae0f02f752c2fd838aaf82191b55d53fd07] [formerly 8dbe316c597c2cf4aa8042c855749b8676f82caf [formerly 26da6ba8ede8934a732c2a38b4e6d90bc9f32bcf]] [formerly 177f698f755a65bba4f36f66e60003f42a7abcf1 [formerly 135daa4ff1f705c5de54b5e36a2a6c222ebdfcf8] [formerly 24ec0f88438e8b046af044f8c4b2e4e343913753 [formerly bacd0189cb3c966d8c0f8ff179aae4a555757c77]]] [formerly 078d2b73d09f98a2034f221b4c35b358db9af61f [formerly 742f9642ff6f76c5118164fed33e1e8d78d1ae2f] [formerly 25ae833f70468187026ea56eb43d47043169f3a6 [formerly a239156ef20dec354e73550b4eed0aa178bf4d3e]] [formerly 9756ab79e28809b45807f667aea6cca37507dcb4 [formerly 57c8ba69f97c6b253b1fc92c557b08ba2f317b5d] [formerly dea45ba532c99327967b7293316feb36e55f2dd2]]]] Former-commit-id: 078ec7841afeb75a5088f569b11a0d0bc6869766 [formerly 8400512a9ae8d42d19e8dfcd8ee3d804a17700c9] [formerly d7a9cab337d0af9caddb18c6ca9429039fe63b06 [formerly 00af530827cdf0ac94671a37a05e3ed693002652]] [formerly 218cb65e4360141ee0368dc69c70c2b6430fee16 [formerly 2d6cb373ccd2a29d1b8a2b7d6bb438a38515a76e] [formerly a1fbf0ff0cc7ed6235b809f7b5b00f5dfb85190b [formerly 9e527457b35aec62d10402788fcfbab30519feaf]]] [formerly a263a64092c160fa171a4acddad70bde823d8d2c [formerly a3c4463ad95120a5f85d1f75a7ca7d8d755aebd8] [formerly 8f64e0a91db8303872e5d8bcbf8a88162bd87cbb [formerly 925fa28dd3a63c82b9c4be7a7608fc748174f966]] [formerly 7fc1146665024bb58447e4e07b865bc08b21bcdb [formerly 6d0dd7e79b2ea5881a21276d747c1ec2485f3c07] [formerly 435f6af97e3e20116165cf29998c490b64a06881 [formerly 56d45f759e860b99963f6488f07923d338dfdf1c]]]] Former-commit-id: 7d77ccda7253aa97ea9fd05175f0a063c0988043 [formerly 452ab36c640be4588ef8857ab04cf1c9d9f09bef] [formerly b876a473d60b52dcf6fa5566d11b950c5ca83f3a [formerly 6c9429a32febb5de0452edd291a129a77e6b2f33]] [formerly 950747049dfb46ca918a8bbb4b25a2d8d4064012 [formerly c37dcf343df32e6ab46d1a91574187e6693eff67] [formerly 0b06e3285886534eac3138a9afcb497ba86109ab [formerly e4523996a5f0ecb5b752e81fb22d1cc74434ba5a]]] Former-commit-id: 1f198d28e1ed15b09bc8ef64a1a5287f09a33294 [formerly 72bf681af8ddbcab65e2508ae56c3054b195ed5d] [formerly 28ad2a62bfaa202fa03aef0ef3f80ce5d0e3c10e [formerly 524b713981fe3dfc2954b44892e6f4022a8b5e96]] Former-commit-id: 04b6cf827c7df11b60d49fc85f07c9606382595a [formerly 23718f5137bfae578c22efe5dc08bf5d52135cdd] Former-commit-id: 98ff2e718115878c7383ea29c5b73cbfc62ef070 --- requirements.txt | 3 --- setup.py | 9 ++++++--- tods/{ => resources}/.entry_points.ini | 0 tods/{ => resources}/.requirements.txt | 0 tods/resources/__init__.py | 0 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 requirements.txt rename tods/{ => resources}/.entry_points.ini (100%) rename tods/{ => resources}/.requirements.txt (100%) create mode 100644 tods/resources/__init__.py diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 3a55551..0000000 --- a/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ --e git+https://github.com/tods-doc/d3m@70aeefed6b7307941581357c4b7858bb3f88e1da#egg=d3m --e git+https://github.com/tods-doc/axolotl@af54e6970476a081bf0cd65990c9f56a1200d8a2#egg=axolotl --e git+https://gitlab.com/datadrivendiscovery/common-primitives.git@046b20d2f6d4543dcbe18f0a1d4bcbb1f61cf518#egg=common_primitives diff --git a/setup.py b/setup.py index 456de0d..f1748f1 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 = ['tods/.entry_points.ini'] + entry_list = ['tods/resources/.entry_points.ini'] merge_entry = [] for entry_name in entry_list: entry_point = read_file_entry_points(entry_name).replace(' ', '') @@ -29,7 +29,10 @@ setup( url='https://tods-doc.github.io', packages=find_packages(exclude=['contrib', 'docs', 'tests*']), package_data={ - 'tods': ['.entry_points.ini'] + 'tods': ['resources/.entry_points.ini', + 'resources/.requirements.txt', + 'resources/default_pipeline.json' + ] }, install_requires=[ 'd3m', @@ -52,7 +55,7 @@ setup( ) try: - subprocess.run(['pip', 'install', '-r', 'requirements.txt']) + subprocess.run(['pip', 'install', '-r', 'tods/resources/.requirements.txt']) except Exception as e: print(e) diff --git a/tods/.entry_points.ini b/tods/resources/.entry_points.ini similarity index 100% rename from tods/.entry_points.ini rename to tods/resources/.entry_points.ini diff --git a/tods/.requirements.txt b/tods/resources/.requirements.txt similarity index 100% rename from tods/.requirements.txt rename to tods/resources/.requirements.txt diff --git a/tods/resources/__init__.py b/tods/resources/__init__.py new file mode 100644 index 0000000..e69de29