Merge branch 'clean' into dev

Former-commit-id: 95d1f1db7d [formerly 8366470822] [formerly c7930acd51 [formerly 448588dedb]] [formerly 1fdda5e05c [formerly a68c771a78] [formerly af552326e3 [formerly 799c2603ab]]] [formerly f353370b9c [formerly 57b75d0b4f] [formerly bf51001938 [formerly 467c59c1e8]] [formerly 5710b152f4 [formerly 4ce546f70f] [formerly a8f37062ef [formerly e5f98a6795]]]] [formerly fe563db9eb [formerly 8c7549e72b] [formerly 3d12f091b2 [formerly bef2a8834f]] [formerly bce17037de [formerly 834f14d0ca] [formerly 6e5ff2e57e [formerly 20827c7796]]] [formerly 3ad2c250e6 [formerly 2cee19140f] [formerly 22f9e02a91 [formerly 6a86d3f584]] [formerly 73428d23ae [formerly 07bad4b778] [formerly 58fab44505 [formerly 3d4df512f6]]]]] [formerly 83371f01ee [formerly 414f599596] [formerly 7c0df742a3 [formerly 2d007cf2b0]] [formerly 9568a4228f [formerly e1488dc907] [formerly f757d2c60c [formerly 4bf60abef0]]] [formerly 13c4234d7a [formerly 47ce81f7e3] [formerly b5b33b4d6d [formerly 09ef2971bc]] [formerly 1b9cc17db5 [formerly 1e6d154800] [formerly f91f4be2bc [formerly e9194b3f51]]]] [formerly 0c7de3d2a4 [formerly 58d4d50cda] [formerly b2d722844d [formerly 97feb85893]] [formerly 573ee5ef78 [formerly b71212b467] [formerly 0c93ab75ba [formerly c64271f985]]] [formerly abe0bdeca7 [formerly 6e78ea84c4] [formerly a5fe38a6ad [formerly 7db4a09f8f]] [formerly 52ebf9adcc [formerly 765907fea5] [formerly c871c20362 [formerly 60bfc10393]]]]]]
Former-commit-id: 645b689fec [formerly 5919656937] [formerly 01dd4e94ff [formerly 47421a7edb]] [formerly 99d19a1a81 [formerly e02ef94a03] [formerly b6d0a856ec [formerly 3fd8df0a31]]] [formerly c160cea43e [formerly 78a9db6a0c] [formerly 1c150f14a8 [formerly f24cf77596]] [formerly e6d55d6403 [formerly 4a9e89730c] [formerly 92e3780334 [formerly 9375641d14]]]] [formerly c22859c3ef [formerly 442631aac8] [formerly 19e15c5a9b [formerly e804eadd13]] [formerly b573d33dd6 [formerly afe6b73afe] [formerly 3115c9867e [formerly 0bcb0d92c6]]] [formerly 684041934a [formerly 71b2145c54] [formerly 209f914009 [formerly eaf1c8098a]] [formerly 40d8dd7521 [formerly 077902d47f] [formerly c871c20362]]]]
Former-commit-id: 448e4458d2 [formerly 707f36691e] [formerly 771697232e [formerly e26fa001cd]] [formerly 7cc3e926e8 [formerly 603a617da8] [formerly fdb5cce537 [formerly ddf272aebc]]] [formerly cebab66d25 [formerly d418779596] [formerly e7f8e74575 [formerly 02004e773b]] [formerly eefab0da1b [formerly 43a6c36b27] [formerly bdf633d48c [formerly 59b7479050]]]]
Former-commit-id: a8fd66112d [formerly 7939ff96b8] [formerly 9b35bdd857 [formerly 4411fc5019]] [formerly 211e61d0a3 [formerly 3d04be2aee] [formerly 80a414a212 [formerly 82231cfd68]]]
Former-commit-id: 1c162bcbf1 [formerly 3df1cf77a2] [formerly 1c1afc3da1 [formerly 9dcea3caee]]
Former-commit-id: 4e74fb2d57 [formerly 4e01e3147d]
Former-commit-id: 8d1b239814

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()

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

setup.py

@@ -41,7 +41,6 @@ setup(
         'nimfa==1.4.0',
         'stumpy==1.4.0',
         'more-itertools==8.5.0',
-        'gitdb==0.6.4'
     ],
 
     entry_points = merge_entry_points()