make release-tag: Merge branch 'master' into stable

Author: csala

.dockerignore

@@ -0,0 +1,11 @@
+data/
+input/
+input_dir/
+output/
+docs/
+tests/
+logs/
+static/
+notebooks/
+.tox/
+.git/

.editorconfig

@@ -0,0 +1,20 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+end_of_line = lf
+
+[*.py]
+max_line_length = 99
+
+[LICENSE]
+insert_final_newline = false
+
+[Makefile]
+indent_style = tab

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,15 @@
+* AutoBazaar version:
+* Python version:
+* Operating System (`python -c 'import platform;print(platform.platform())'`):
+
+### Description
+
+Describe what you were trying to get done.
+Tell us what happened, what went wrong, and what you expected to happen.
+
+### What I Did
+
+```
+Paste the command(s) you ran and the output.
+If there was a crash, please include the traceback here.
+```

.gitignore

@@ -119,3 +119,6 @@ input
 data
 compressed
 notebooks
+
+.bak
+mongodb_config.json

Dockerfile

@@ -0,0 +1,18 @@
+FROM python:3.6-buster
+
+RUN mkdir /autobazaar && \
+    mkdir /abz && \
+    ln -s /input /abz/input && \
+    ln -s /output /abz/output
+
+# Copy code
+COPY setup.py README.md HISTORY.md MANIFEST.in /autobazaar/
+
+# Install project
+RUN pip3 install -e /autobazaar && pip install ipdb
+
+COPY autobazaar /autobazaar/autobazaar
+
+WORKDIR /abz
+
+CMD ["echo", "Usage: docker run -ti -u$UID -v $(pwd):/abz mlbazaar/autobazaar abz OPTIONS"]

HISTORY.md

@@ -1,8 +1,21 @@
 # History
 
+## 0.2.0 - 2019-11-26
+
+Second Release:
+
+* Improved CLI interface
+* Improved Dataset support
+* New Docker image
+* Newer dependencies
+
+This is the version used to generate the results explained in the third version of [
+The Machine Learning Bazaar Paper](https://arxiv.org/abs/1905.08942v3)
+
 ## 0.1.0 - 2019-06-24
 
 First Release.
 
 This is a slightly cleaned up version of the software used to generate the results
-explained in [The Machine Learning Bazaar Paper](https://arxiv.org/pdf/1905.08942.pdf)
+explained in the first version of [The Machine Learning Bazaar Paper](
+https://arxiv.org/abs/1905.08942v1)

Makefile

@@ -105,7 +105,7 @@ fix-lint: ## fix lint issues using autoflake, autopep8, and isort
 
 .PHONY: test-all
 test-all: ## run tests on every Python version with tox
-	tox
+	tox -r
 
 .PHONY: coverage
 coverage: ## check code coverage quickly with the default Python

README.md

@@ -3,23 +3,22 @@
 <i>An open source project from Data to AI Lab at MIT.</i>
 </p>
 
-
+[![PyPi](https://img.shields.io/pypi/v/autobazaar.svg)](https://pypi.python.org/pypi/autobazaar)
 [![Travis](https://travis-ci.org/HDI-Project/AutoBazaar.svg?branch=master)](https://travis-ci.org/HDI-Project/AutoBazaar)
-[![PyPi Shield](https://img.shields.io/pypi/v/autobazaar.svg)](https://pypi.python.org/pypi/autobazaar)
-
+[![Downloads](https://pepy.tech/badge/autobazaar)](https://pepy.tech/project/autobazaar)
 
 # AutoBazaar
 
-- License: MIT
-- Documentation: https://HDI-Project.github.io/AutoBazaar/
-- Homepage: https://github.com/HDI-Project/AutoBazaar
+* License: [MIT](https://github.com/HDI-Project/AutoBazaar/blob/master/LICENSE)
+* Documentation: https://HDI-Project.github.io/AutoBazaar/
+* Homepage: https://github.com/HDI-Project/AutoBazaar
+* Paper: https://arxiv.org/pdf/1905.08942.pdf
 
-# Overview
+## Overview
 
-AutoBazaar is an AutoML system created to execute the experiments associated with the
-[The Machine Learning Bazaar Paper: Harnessing the ML Ecosystem for Effective System
-Development](https://arxiv.org/pdf/1905.08942.pdf)
-by the [Human-Data Interaction (HDI) Project](https://hdi-dai.lids.mit.edu/) at LIDS, MIT.
+AutoBazaar is an AutoML system created using [The Machine Learning Bazaar](https://arxiv.org/abs/1905.08942),
+a research project and framework for building ML and AutoML systems by the Data To AI Lab at MIT.
+See [below](#citing-autobazaar) for more references.
 
 It comes in the form of a python library which can be used directly inside any other python
 project, as well as a CLI which allows searching for pipelines to solve a problem directly
@@ -35,68 +34,41 @@ Also, although it is not strictly required, the usage of a
 [virtualenv](https://virtualenv.pypa.io/en/latest/) is highly recommended in order to avoid
 interfering with other software installed in the system where **AutoBazaar** is run.
 
-These are the minimum commands needed to create a virtualenv using python3.6 for **AutoBazaar**:
-
-```bash
-pip install virtualenv
-virtualenv -p $(which python3.6) autobazaar-venv
-```
-
-Afterwards, you have to execute this command to have the virtualenv activated:
-
-```bash
-source autobazaar-venv/bin/activate
-```
-
-Remember about executing it every time you start a new console to work on **AutoBazaar**!
-
 ## Install with pip
 
-After creating the virtualenv and activating it, we recommend using
-[pip](https://pip.pypa.io/en/stable/) in order to install **AutoBazaar**:
+The easiest and recommended way to install **AutoBazaar** is using
+[pip](https://pip.pypa.io/en/stable/):
 
 ```bash
 pip install autobazaar
 ```
 
-This will pull and install the latest stable release from [PyPi](https://pypi.org/).
-
-## Install from source
-
-Alternatively, with your virtualenv activated, you can clone the repository and install it from
-source by running `make install` on the `stable` branch:
-
-```bash
-git clone [email protected]:HDI-Project/AutoBazaar.git
-cd AutoBazaar
-git checkout stable
-make install
-```
+This will pull and install the latest stable release from [PyPI](https://pypi.org/).
 
-For development, you can use `make install-develop` instead in order to install all
-the required dependencies for testing and code linting.
+If you want to install from source or contribute to the project please read the
+[Contributing Guide](https://HDI-Project.github.io/AutoBazaar/contributing.html#get-started).
 
 # Data Format
 
 AutoBazaar works with datasets in the [D3M Schema Format](https://github.com/mitll/d3m-schema)
 as input.
 
-This dataset Schema, developed by MIT Lincoln Labs Laboratory for DARPA's Data Driven Discovery
-of Models Program, requires the data to be in plainly readable formats such as CSV files or
+This dataset schema, developed by MIT Lincoln Labs Laboratory for DARPA's Data-Driven Discovery
+of Models (D3M) Program, requires the data to be in plainly readable formats such as CSV files or
 JPG images, and to be set within a folder hierarchy alongside some metadata specifications
 in JSON format, which include information about all the data contained, as well as the problem
 that we are trying to solve.
 
 For more details about the schema and about how to format your data to be compliant with it,
-please have a look at the [Schema Documentation](https://github.com/mitll/d3m-schema/tree/master/documentation)
+refer to the [Schema Documentation](https://github.com/mitll/d3m-schema/tree/master/documentation)
 
 As an example, you can browse some datasets which have been included in this repository for
 demonstration purposes:
 - [185_baseball](https://github.com/HDI-Project/AutoBazaar/tree/master/data/185_baseball): Single Table Regression
 - [196_autoMpg](https://github.com/HDI-Project/AutoBazaar/tree/master/data/196_autoMpg): Single Table Classification
 
-Additionally, you can find a collection with ~500 datasets already formatted in the
-[d3m-data-dai S3 Bucket in AWS](https://d3m-data-dai.s3.amazonaws.com/index.html).
+<!--Additionally, you can find a collection with ~500 datasets already formatted in the
+[d3m-data-dai S3 Bucket](https://d3m-data-dai.s3.amazonaws.com/index.html).-->
 
 # Quickstart
 
@@ -206,16 +178,16 @@ For more details about **AutoBazaar** and all its possibilities and features, pl
 
 # Credits
 
-AutoBazaar is an Open Source project from the Data to AI Lab at MIT built by the following team:
+AutoBazaar is an open-source project from the Data to AI Lab at MIT built by the following team:
 
-* Carles Sala <[email protected]>
 * Micah Smith <[email protected]>
-* Max Kanter <[email protected]>
+* Carles Sala <[email protected]>
+* Max Kanter <[email protected]>
 * Kalyan Veeramachaneni <[email protected]>
 
 ## Citing AutoBazaar
 
-If you use AutoBazaar for yor research, please consider citing the following paper (https://arxiv.org/pdf/1905.08942.pdf):
+If you use AutoBazaar for your research, please consider citing the following paper (https://arxiv.org/pdf/1905.08942.pdf):
 
 ```
 @article{smith2019mlbazaar,

autobazaar/__init__.py

@@ -9,11 +9,35 @@
 by the [Human-Data Interaction (HDI) Project](https://hdi-dai.lids.mit.edu/) at LIDS, MIT.
 
 * Free software: MIT license
-* Documentation: https://HDI-Project.github.io/MLBlocks
+* Documentation: https://HDI-Project.github.io/AutoBazaar
 """
+import os
+
+import git
 
 __author__ = 'MIT Data To AI Lab'
 __copyright__ = 'Copyright (c) 2019, MIT Data To AI Lab'
 __email__ = '[email protected]'
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.2.0-dev'
+
+
+def _get_commit():
+    try:
+        base_path = os.path.dirname(__file__)
+        repo = git.Repo(base_path, search_parent_directories=True)
+        commit = repo.commit().hexsha[0:7]
+        if repo.is_dirty(untracked_files=False):
+            commit += '*'
+
+        return commit
+    except git.InvalidGitRepositoryError:
+        return None
+
+
+def get_version():
+    commit = _get_commit()
+    if commit:
+        return '{} - {}'.format(__version__, commit)
+
+    return __version__