From 5a6e350905c974202be2ad73859def154029f43a Mon Sep 17 00:00:00 2001 From: Daochen Zha Date: Sun, 20 Sep 2020 11:32:42 -0500 Subject: [PATCH] Fix dependency Former-commit-id: 15b52fa868d02ba2906d582c94745d4fe35ea497 [formerly cd8dc875b62e591c7e4367933bb6774c207e4423] [formerly 0bcfc2a6d233897b63ff5ea19c630c3a18e9000e [formerly 5e6d4dbe74c505b8411e940118d80af3c8c4bdf2]] [formerly d6c56756f2e79123e0ff557216b61ab9a64ee7c8 [formerly 94e86fbdd3affc4c3c96a943e7102c9008f7418e] [formerly 676763512153433e296c1c37da220240d27173f8 [formerly a5d987b5db57f5422e66adf3857a9843c141cda5]]] [formerly a12d6e94b178021df2a5bc48b1f760062ac39155 [formerly e7ef205adb5afc28d5249bb140b265be16c220ce] [formerly 2aae28249d4e33c793674764a499bc68d59bfc04 [formerly 96c19bee0be31e1c65b2cfd64881b92297ef8892]] [formerly 5abe70ab1a7d2dd439a3d8075a2e44a731657e68 [formerly b708a1b0bba4d6e6d4b83f3d1741bfd769cf7c79] [formerly 8132402333df668366d6b6055c80dccb37eb62a4 [formerly 1a2063e081e17fa637552357521337f30e0d9269]]]] [formerly 57181b8e05a58d1580ebe86c5d72149f6a185e64 [formerly 7af028486412dadc4ec951f6577dfc50172e5f9d] [formerly 901905c9ebcc8e2cfc367d73c7a01f512d67b9b9 [formerly f8dfbdbb86008a453abebed8326d47dadd7a1251]] [formerly 355bbd2a673e1100fd10e498d916f9ea7f65106d [formerly 5354aa551693e0920774b5025113a62282eecb1b] [formerly 00fe0a57fb777cd4456b4695fe79e47ed42e72cd [formerly e95f358b07171bbd4dea66559489d71a8b26648e]]] [formerly 4ccb3a68cc0a7fc40878dcb5d263da40f02633f7 [formerly c1fe9b19679aa81fe19c5514b8e6de3497dab48b] [formerly d1404b7377bf0ae2538cf3947d86aac5c55469fa [formerly efe117f181b41b8ca50153102b1fece6d34ba4f2]] [formerly c23a96b6e239d617355cbe50809b94f58254b655 [formerly 899c53e2f31ef3d1c70d4c1ebe6ee0040cd085e4] [formerly ed9df6e8fd900a6d704e02de8115b136a9edfb8e [formerly 7857a49f6950d4ecc607fe92326be961e33ced73]]]]] [formerly 1d578cbd28c696081a4ef67cdd0553fb10e1a73d [formerly c6fa2a524740f7de9e08333ea78c4a437c2b0a38] [formerly bb19d8f4503bfb6b80da569b6b4bec9eade6b8d1 [formerly aa3544af6673b4a3771001b1be99fb974815d061]] [formerly e66abc4fcaa69146e57011f53c2f5ce749b4604d [formerly 71e868fa5172f3b72863f3b392a8c62ecce58c1d] [formerly c58ed748386f93f2a104a2dc073b1eeeed98c4f4 [formerly 8b3b83edb917d7447e7c3dc86d75f7d4bd9c7d95]]] [formerly 09265d9caa7f4802a2e33e2142d56bdc5da60ab4 [formerly 56e3a63174656328962c0f46f8aa5e0eb38f3d29] [formerly 65ec4fccb67ad6bc112992f510eddbbd3cd65774 [formerly 19e2f251426e6bfcdaccacb411ec94c246070b5e]] [formerly 14cf7496d88cf5c42ce4d451547527e23a0556ec [formerly 0aa5b442ed81c54174606e0d8c8c2de4d0d73bdb] [formerly 64635ff998da06e07f3511cc2235484ab80b854d [formerly 252353939739830d2d17612ce7cc905100907703]]]] [formerly dc59b43ece7a0fad4eeb67ce70716c4d318ddb10 [formerly 4a79350bd91c8f29604dc63a758a377d075bba11] [formerly 2fdbd1ac8197bbf073924700b6fda9dbd4160f59 [formerly 0382ebd12d7d331e8637cc2380652ff1cba801b5]] [formerly 5ffafde0a85f6e1f08da9258973beb79e1ed1f9a [formerly 42c3b4477112db0f2dd4013125d6f88541dc7d76] [formerly 4182a4179fa5c434c864a7ed6203c1373502f57c [formerly 850074f1796bdd9cec7e92b2df2197f67d08d1a0]]] [formerly 7a65cc53823503636690f9789eaf2c5a9122fc48 [formerly 16a6c7c3d1f36291f2b2ef6507552a232ab39a65] [formerly 894f2ba6b40fe6f419359648bea325a7c982498c [formerly a09631b3d1bd88816a742517dbdb77020499c249]] [formerly ff4e4f36a4932198fe88bc7473aabe4a74310406 [formerly a5c35d573b18dd2b2876710e999fe1d125e6f3cf] [formerly b269cda0f84117394deb18c1dba17cb430f593fd [formerly 8f9dcf55067b66c16ee5d4153d22900c2d43e52f]]]]]] Former-commit-id: 76ad1909e9d326f209738fe44cadf01a23e45613 [formerly f05958577d2c51fe447da196ce89ccc643b26d69] [formerly 5806cf127f633f73b842422d3e7b79f63a8356de [formerly 5654d60bb79c06dd07ec9d85873a62ba1c6a20ad]] [formerly 3ada35d859e16b9cc437e9be051f8bf19187424b [formerly 3cb192bab59c2d0cd229996ecb2a96d387cbb20e] [formerly 04ba3973f5d2d3c9f5d63e675186dbab7ea9a011 [formerly e0ff9f974b3e19e75617e89893c4b00d8820c6d7]]] [formerly 39dd74970fbe2244c6d55df51fe6cc8f4e57d346 [formerly d6028b4233c46a111e0644ec7c069f4765dfdc76] [formerly 0ff58248ecb5b6a5e2626042a6ae40acccea740f [formerly 8fe361bd1e4d5f118b9a7d26bba346601fa84930]] [formerly 30d34687741463dbe3b65d4b19ddcfc65006f242 [formerly 24db2e2bf2fb8150da34749b1e5325e57d69a6fe] [formerly d8758d60d8a165bcc348cd28aa63aeb34fbdc841 [formerly e0810938880c9626a685d0968b704eb6e367c938]]]] [formerly cba7982c171f30b5910cf34a1b59dfe17375ed34 [formerly b346a85fdfe35025d10fc0fbb717445485e1b514] [formerly 043b44075397ef161999ff813560ee170d2e39a3 [formerly 7fd923d13fcc9434059ce2453ced429aca71ef01]] [formerly 0b049c3d3b2326aa4814eb2b4ab3ba5b93f97388 [formerly d64859a99c5911d1c3ce8e0afafb5e1a7408a5ef] [formerly 2f727256d8c3b7a348e2803449bc2db9be85fd55 [formerly 2c76823d635125f3fd67782a473083303874af96]]] [formerly 7abfee9c44fc6f5d5448d9b6abcdb15bc78f9bf2 [formerly d4267df63e1414dfd0ed95bd814d78ab8b92a47e] [formerly 800b9bdd15c34a471e45862d685cf693aa70e555 [formerly 5ebc3bcf153246298f866a18630695b94642659d]] [formerly 2e9f60f83b79f5c6e197f27bf8ea35d058981628 [formerly 499ca2f025eeaa257080a51a075da473655485e1] [formerly b269cda0f84117394deb18c1dba17cb430f593fd]]]] Former-commit-id: 5c56ed2a426452346504085a137e07599a9fd1f7 [formerly 619e609fd51903982231ad363b40a0c0ed186e0d] [formerly fc15d1c22b4044193631f961e5e7796657474ad1 [formerly 2b38b7b722b1d79b9d6d1086c77d5cd1bbb16eb5]] [formerly 0ddfbb8a36a38fa975a8fd3064f2125776d6b13e [formerly d2a34c749fe7519d75d8e7cecc3c2cecdca47b46] [formerly 7205f04eb5a663507aa4bb0654688c00a8842090 [formerly 407349ddce213ce151f5bbba088c4304bf4123d7]]] [formerly 2c409b308b2be91c3ff7de9b83ccab84b4018bce [formerly bd347f6ee5d0133ec65eb938d2829f03841b963e] [formerly 772fa30a694d8e92e5450d4da1b468b681fba516 [formerly a0a2d4db4f77e4c3556aa75db48ee1d10e199285]] [formerly 7ed7e4a47edf9a01ae0d1526de5c9eac3185e85e [formerly cb344915f78882bdf1db9d4db870b0b9a18d5a77] [formerly dfc82c0b9dd22dc367bc995565c69e4577992d40 [formerly 00f52053d0ce8db376d8883ba6ac39e96dd99d3a]]]] Former-commit-id: b236494d87098ca2d16080cce644427b4ceb3709 [formerly 98233a3d8a739370aa1fdafecb5ca8c205a50412] [formerly 12bb956ec426b334ad139d718b181e0f6fd90d6a [formerly fdc3ac22e1f72a32838c4cfc87c871dfdbd1ecf3]] [formerly c416c4d0589658e82f65a1a50a0ef798c10001ab [formerly a3b37f32863268bfe7e65dedc8665929379be5dd] [formerly 76a2b2f8057669521aec31a3de3f7ef61ae104c4 [formerly 3eb7fb3c9485bf82fab242973dd4ad1ce479694e]]] Former-commit-id: 9b771f7af67e8162f59b1b7e59e2aafbf589c271 [formerly bdeac837216b3a034daab14560cb015400105518] [formerly eb73299fc6adf877f0083240a5febe455f155ad3 [formerly aeae6a5534e7854162142b78a4a01f40ebc249d4]] Former-commit-id: 940094b0bb8e72a9c59a94c90e6ae35938fd93fd [formerly b2ea3798e202c93d9cfdd4f4118f086ee30707e3] Former-commit-id: aecd52f3098e8e56b745d8856b5b804b720b1c59 --- examples/run_pipeline.py | 2 +- requirements.txt | 31 ------------------------------- setup.py | 2 +- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/examples/run_pipeline.py b/examples/run_pipeline.py index ea36682..9d8b7cc 100644 --- a/examples/run_pipeline.py +++ b/examples/run_pipeline.py @@ -15,7 +15,7 @@ parser.add_argument('--target_index', type=int, default=6, help='Index of the ground truth (for evaluation)') parser.add_argument('--metric',type=str, default='F1_MACRO', help='Evaluation Metric (F1, F1_MACRO)') -parser.add_argument('--pipeline_path', default=os.path.join(this_path, '../tods/tods/resources/default_pipeline.json'), +parser.add_argument('--pipeline_path', default=os.path.join(this_path, '../tods/resources/default_pipeline.json'), help='Input the path of the pre-built pipeline description') args = parser.parse_args() diff --git a/requirements.txt b/requirements.txt index fa6a44c..3a55551 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,34 +1,3 @@ -scikit-learn==0.22.0 -pytypes==1.0b5 -frozendict==1.2 -numpy>=1.15.4,<=1.18.1 -jsonschema==2.6.0 -requests>=2.19.1,<=2.22.0 -strict-rfc3339==0.7 -rfc3987==1.3.8 -webcolors>=1.8.1,<=1.10 -dateparser>=0.7.0,<=0.7.2 -python-dateutil==2.8.1 -pandas==0.25.0 -typing-inspect==0.5.0 -GitPython>=2.1.11,<=3.0.5 -jsonpath-ng==1.4.3 -custom-inherit>=2.2.0,<=2.2.2 -PyYAML>=5.1,<=5.3 -pycurl>=7.43.0.2,<=7.43.0.3 -pyarrow==0.15.1 -gputil>=1.3.0,<=1.4.0 -pyrsistent>=0.14.11,<=0.15.7 -scipy>=1.2.1,<=1.4.1 -openml==0.10.1 -lightgbm>=2.2.2,<=2.3.0 -opencv-python-headless<=4.1.1.26,>=4.1 -imageio>=2.3.0,<=2.6.0 -pillow==6.2.1 -xgboost>=0.81,<=0.90 -Jinja2==2.9.4 -simplejson==3.12.0 -gitdb2==2.0.6 -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 589b997..b155e09 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ setup( 'nimfa==1.4.0', 'stumpy==1.4.0', 'more-itertools==8.5.0', - 'gitdb==0.6.4' + #'gitdb==0.6.4' ], entry_points = merge_entry_points()