Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MLBazaar/AutoBazaar
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.2.1
Choose a base ref
...
head repository: MLBazaar/AutoBazaar
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 15 commits
  • 10 files changed
  • 2 contributors

Commits on Jun 22, 2020

  1. Copy the full SHA
    3337fbf View commit details

Commits on Jul 1, 2020

  1. Copy the full SHA
    c3fe6d2 View commit details

Commits on Oct 14, 2020

  1. Copy the full SHA
    c256090 View commit details
  2. Fix isort option

    micahjsmith committed Oct 14, 2020
    Copy the full SHA
    7d77008 View commit details
  3. Copy the full SHA
    4162e1f View commit details
  4. Remove py35 support

    micahjsmith committed Oct 14, 2020
    Copy the full SHA
    06f4dd6 View commit details
  5. Copy the full SHA
    99ec543 View commit details
  6. Fix lint

    micahjsmith committed Oct 14, 2020
    Copy the full SHA
    c09a037 View commit details
  7. Update travis config

    micahjsmith committed Oct 14, 2020
    Copy the full SHA
    832a405 View commit details
  8. Upgrade pip in tox

    micahjsmith committed Oct 14, 2020
    Copy the full SHA
    bb6f602 View commit details

Commits on Oct 15, 2020

  1. Update authors

    micahjsmith committed Oct 15, 2020
    Copy the full SHA
    f66e46e View commit details

Commits on Dec 10, 2020

  1. Copy the full SHA
    064499b View commit details

Commits on Dec 13, 2020

  1. Merge pull request #28 from micahjsmith/master

    Update doc links to MLBazaar org
    csala authored Dec 13, 2020
    Copy the full SHA
    26a20c1 View commit details
  2. Update CI badge

    csala authored Dec 13, 2020
    Copy the full SHA
    36e71a7 View commit details
  3. Remove travis-ci badge

    csala authored Dec 13, 2020
    Copy the full SHA
    a138406 View commit details
Showing with 48 additions and 62 deletions.
  1. +1 −1 .github/workflows/tests.yml
  2. +2 −13 .travis.yml
  3. +7 −0 AUTHORS.rst
  4. +3 −3 CONTRIBUTING.rst
  5. +10 −19 README.md
  6. +13 −14 autobazaar/__init__.py
  7. +1 −1 autobazaar/utils.py
  8. +4 −5 setup.cfg
  9. +4 −3 setup.py
  10. +3 −3 tox.ini
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.5, 3.6, 3.7]
python-version: [3.6, 3.7]
os: [ubuntu-latest]

steps:
15 changes: 2 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,24 +2,13 @@
language: python
python:
- 3.6
- 3.7

# Command to install dependencies
install:
- pip install -U tox-travis codecov
- pip install --upgrade pip && pip install -U tox-travis codecov

# Command to run tests
script: tox

after_success: codecov

deploy:

- provider: pages
skip-cleanup: true
github-token: "$GITHUB_TOKEN"
keep-history: true
local-dir: docs/_build/html
target-branch: gh-pages
on:
branch: master
python: 3.6
7 changes: 7 additions & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
Credits
=======

Development Lead
----------------

* Carles Sala <csala@csail.mit.edu>

Contributors
------------

* Micah Smith <micahs@mit.edu>
* Max Kanter <max.kanter@gmail.com>
* Kalyan Veeramachaneni <kalyan@mit.edu>
6 changes: 3 additions & 3 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ Types of Contributions
Report Bugs
~~~~~~~~~~~

Report bugs at https://github.com/HDI-Project/AutoBazaar/issues.
Report bugs at https://github.com/MLBazaar/AutoBazaar/issues.

If you are reporting a bug, please include:

@@ -45,7 +45,7 @@ articles, and such.
Submit Feedback
~~~~~~~~~~~~~~~

The best way to send feedback is to file an issue at https://github.com/HDI-Project/AutoBazaar/issues.
The best way to send feedback is to file an issue at https://github.com/MLBazaar/AutoBazaar/issues.

If you are proposing a feature:

@@ -120,7 +120,7 @@ Before you submit a pull request, check that it meets these guidelines:
4. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
5. The pull request should work for Python2.7, 3.4, 3.5 and 3.6. Check
5. The pull request should work for Python 3.6 and 3.7. Check
https://travis-ci.org/HDI-Project/AutoBazaar/pull_requests
and make sure that all the checks pass.

29 changes: 10 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -5,15 +5,15 @@

[![Development Status](https://img.shields.io/badge/Development%20Status-2%20--%20Pre--Alpha-yellow)](https://pypi.org/search/?c=Development+Status+%3A%3A+2+-+Pre-Alpha)
[![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)
[![Tests](https://github.com/MLBazaar/AutoBazaar/workflows/Run%20Tests/badge.svg)](https://github.com/MLBazaar/AutoBazaar/actions?query=workflow%3A%22Run+Tests%22+branch%3Amaster)
[![Downloads](https://pepy.tech/badge/autobazaar)](https://pepy.tech/project/autobazaar)

# AutoBazaar

* License: [MIT](https://github.com/HDI-Project/AutoBazaar/blob/master/LICENSE)
* License: [MIT](https://github.com/MLBazaar/AutoBazaar/blob/master/LICENSE)
* Development Status: [Pre-Alpha](https://pypi.org/search/?c=Development+Status+%3A%3A+2+-+Pre-Alpha)
* Documentation: https://HDI-Project.github.io/AutoBazaar/
* Homepage: https://github.com/HDI-Project/AutoBazaar
* Documentation: https://MLBazaar.github.io/AutoBazaar/
* Homepage: https://github.com/MLBazaar/AutoBazaar
* Paper: https://arxiv.org/pdf/1905.08942.pdf

## Overview
@@ -30,7 +30,7 @@ from the command line.

## Requirements

**AutoBazaar** has been developed and tested on [Python 3.5, 3.6 and 3.7](https://www.python.org/downloads/)
**AutoBazaar** has been developed and tested on [Python 3.6 and 3.7](https://www.python.org/downloads/)

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
@@ -48,7 +48,7 @@ pip install autobazaar
This will pull and install the latest stable release from [PyPI](https://pypi.org/).

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).
[Contributing Guide](https://MLBazaar.github.io/AutoBazaar/contributing.html#get-started).

# Data Format

@@ -66,8 +66,8 @@ refer to the [Schema Documentation](https://github.com/mitll/d3m-schema/tree/mas

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/input/185_baseball): Single Table Regression
- [196_autoMpg](https://github.com/HDI-Project/AutoBazaar/tree/master/input/196_autoMpg): Single Table Classification
- [185_baseball](https://github.com/MLBazaar/AutoBazaar/tree/master/input/185_baseball): Single Table Regression
- [196_autoMpg](https://github.com/MLBazaar/AutoBazaar/tree/master/input/196_autoMpg): Single Table Classification

<!--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).-->
@@ -115,7 +115,7 @@ dataset
dataset format and make sure to have indicated the right path.

For the rest of this quickstart, we will be using the `185_baseball` dataset that you can
find inside the [input folder](https://github.com/HDI-Project/AutoBazaar/tree/master/input)
find inside the [input folder](https://github.com/MLBazaar/AutoBazaar/tree/master/input)
contained in this repository.

## 2. Start the search process
@@ -181,16 +181,7 @@ abz search 185_baseball -c10,20,30 -b10 -r results.csv
## What's next?

For more details about **AutoBazaar** and all its possibilities and features, please check the
[project documentation site](https://HDI-Project.github.io/AutoBazaar/)!

# Credits

AutoBazaar is an open-source project from the Data to AI Lab at MIT built by the following team:

* Micah Smith <micahs@mit.edu>
* Carles Sala <csala@mit.edu>
* Max Kanter <max.kanter@featurelabs.com>
* Kalyan Veeramachaneni <kalyanv@mit.edu>
[project documentation site](https://MLBazaar.github.io/AutoBazaar/)!

## Citing AutoBazaar

27 changes: 13 additions & 14 deletions autobazaar/__init__.py
Original file line number Diff line number Diff line change
@@ -9,35 +9,34 @@
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/AutoBazaar
* Documentation: https://MLBazaar.github.io/AutoBazaar
"""
import os

import git
import shlex
import subprocess

__author__ = 'MIT Data To AI Lab'
__copyright__ = 'Copyright (c) 2019, MIT Data To AI Lab'
__email__ = 'dailabmit@gmail.com'
__license__ = 'MIT'
__version__ = '0.2.1'
__version__ = '0.2.2.dev0'


def _run(cmd):
return subprocess.check_output(shlex.split(cmd)).decode().strip()


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:
commit = _run('git rev-parse --short HEAD')
dirty = '*' if _run('git diff --shortstat') != '' else ''
return commit + dirty
except subprocess.CalledProcessError:
return None


def get_version():
commit = _get_commit()
if commit:
return '{} - {}'.format(__version__, commit)
return '{}+{}'.format(__version__, commit)

return __version__
2 changes: 1 addition & 1 deletion autobazaar/utils.py
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ def ensure_dir(directory):
def make_dumpable(params, datetimes=False):
"""Get nested dicts of params to allow json dumping.
Also work around this: https://github.com/HDI-Project/BTB/issues/79
Also work around this: https://github.com/MLBazaar/BTB/issues/79
And convert numpy types to primitive types.
Optionally dump datetimes to ISO format.
9 changes: 4 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[bumpversion]
current_version = 0.2.1
current_version = 0.2.2.dev0
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?
serialize =
serialize =
{major}.{minor}.{patch}.{release}{candidate}
{major}.{minor}.{patch}

[bumpversion:part:release]
optional_value = release
first_value = dev
values =
values =
dev
release

@@ -33,7 +33,7 @@ exclude = docs, .tox, .git, __pycache__, .ipynb_checkpoints
ignore = # Keep empty to prevent default ignores

[isort]
include_trailing_comment = True
include_trailing_comma = True
line_length = 99
lines_between_types = 0
multi_line_output = 4
@@ -49,4 +49,3 @@ test = pytest

[tool:pytest]
collect_ignore = ['setup.py']

7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -10,11 +10,12 @@
history = history_file.read()

install_requires = [
'boto3>=1.14,<1.14.45',
'botocore<1.17.45,>=1.17.44',
'mlblocks>=0.3.2,<0.4',
'mlprimitives>=0.2.2,<0.3',
'baytune>=0.2.1,<0.3',
'mit-d3m>=0.2.1,<0.3',
'gitpython>=3.1.1,<4',
'Keras>=2.1.6,<2.4',
'scikit-learn<0.21,>=0.20.0',
'pandas<0.25,>=0.23.4',
@@ -93,11 +94,11 @@
keywords='automl machine learning hyperparameters tuning classification regression autobazaar',
name='autobazaar',
packages=find_packages(include=['autobazaar', 'autobazaar.*']),
python_requires='>=3.5,<3.8',
python_requires='>=3.6,<3.8',
setup_requires=setup_requires,
test_suite='tests',
tests_require=tests_require,
url='https://github.com/HDI-project/AutoBazaar',
version='0.2.1',
version='0.2.2.dev0',
zip_safe=False,
)
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
[tox]
envlist = py{35,36,37}, test-devel
envlist = py{36,37}, test-devel

[travis]
python =
3.7: py37, test-devel
3.6: py36
3.5: py35

[gh-actions]
python =
3.7: py37, test-devel
3.6: py36
3.5: py35

[testenv]
passenv = CI TRAVIS TRAVIS_*
skipsdist = true
skip_install = true
commands_pre =
/usr/bin/env pip install --upgrade pip
/usr/bin/env pip install .[test]
commands =
/usr/bin/env make test

[testenv:test-devel]
commands_pre =
/usr/bin/env pip install --upgrade pip
/usr/bin/env pip install .[dev]
commands =
/usr/bin/env make test-devel