Skip to content

Commit

Permalink
Merge branch 'release-v1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
bbengfort committed Aug 29, 2019
2 parents d9f4bed + 861850e commit a27c290
Show file tree
Hide file tree
Showing 733 changed files with 31,793 additions and 11,607 deletions.
78 changes: 50 additions & 28 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,56 +1,80 @@
# AppVeyor is a CI service to build and run tests under Windows
# https://ci.appveyor.com/project/districtdatalabs/yellowbrick

image:
- Previous Visual Studio 2017

version: 0.9.{build}
pull_requests:
do_not_increment_build_number: true

branches:
only:
- master
- develop

environment:

matrix:
# Tests failing on 32 bit architectures
# https://github.com/numpy/numpy/issues/4384
# - PYTHON: "C:\\Python27"
# PYTHON_VERSION: "2.7.14"
# PYTHON_ARCH: "32"

- PYTHON: "C:\\Python27-x64"
PYTHON_VERSION: "2.7.14"
PYTHON_ARCH: "64"

# - PYTHON: "C:\\Python36"
# PYTHON_VERSION: "3.6.4"
# PYTHON_ARCH: "32"

- PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6.4"
PYTHON_ARCH: "64"

# - PYTHON: "C:\\Miniconda3"
# PYTHON_VERSION: "3.6.4"
# MINICONDA_VERSION: "4.4.10"
# PYTHON_ARCH: "32"

- PYTHON: "C:\\Miniconda3-x64"
PYTHON_VERSION: "3.6.4"
MINICONDA_VERSION: "4.4.10"
- PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Miniconda36-x64"
PYTHON_VERSION: "3.6"
MINICONDA_VERSION: "4.5.4"
PYTHON_ARCH: "64"

# Failing Tests Due to TypeError: LoadLibrary()
# - PYTHON: "C:\\Miniconda37-x64"
# PYTHON_VERSION: "3.7"
# MINICONDA_VERSION: "4.5.12"
# PYTHON_ARCH: "64"


# Cancel pending jobs after first job failure
matrix:
fast_finish: true

install:
- "%PYTHON%\\python.exe -m pip install wheel"
- "%PYTHON%\\python.exe -m pip install -r requirements.txt"
- "%PYTHON%\\python.exe -m pip install -r tests/requirements.txt"
- "%PYTHON%\\python.exe -m nltk.downloader popular"
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- cmd: "IF '%MINICONDA_VERSION%'=='' (
python -m pip install -U pip &&
python -m pip install -U wheel &&
python -m pip install -U -r requirements.txt &&
python -m pip install -U -r tests/requirements.txt
) ELSE (
conda update -n base conda --yes &&
conda config --add channels conda-forge &&
conda env create -f tests/requirements.txt -n yellowbrick &&
call activate yellowbrick
)"
- "python -m nltk.downloader popular"

# No requirement to build any C libraries
build: off

test_script:
- "%PYTHON%\\python.exe setup.py test"
- "python setup.py test"

after_test:
- "%PYTHON%\\python.exe setup.py bdist_wheel"
- "python setup.py bdist_wheel"

artifacts:
- path: dist\*
Expand All @@ -60,12 +84,10 @@ cache:
- '%APPDATA%\pip\Cache'

notifications:
- provider: Email
to:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
on_build_success: false
on_build_failure: false
- provider: Slack
auth_token:
secure: 6hd0IQ66qUUiStas9s304izgV7Wh0XyY0gFjuua7H8gtYle41gbFozkfKgzs110oK/iT4XKWrNfWOgz3S5Jcp2SGFXQ9IvF5ZqYmX71ZQRY=
channel: '#yb-ci'
on_build_success: true
on_build_failure: true
on_build_status_changed: true
8 changes: 8 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
custom: https://numfocus.org/donate
73 changes: 73 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<!--
# Welcome Contributor!
Thank you for contributing to Yellowbrick, please follow the instructions below to get
your PR started off on the right foot.
## First Steps
1. Are you merging from a feature branch into develop?
_If not, please create a feature branch and change your PR to merge from that branch
into the Yellowbrick `develop` branch._
2. Does your PR have a title?
_Please ensure your PR has a short, informative title, e.g. "Enhances ParallelCoordinates with new andrews_curve parameter" or "Corrects bug in WhiskerPlot that causes index error"_
3. Summarize your PR (HINT: See CHECKLIST/TEMPLATE below!)
-->

This PR fixes #issue_number _(If you are fixing a bug)_ which reported a bug that caused a problem to occur when users...

_(or if you are introducing a new feature)_ which requested a feature to allow the user to...

I have made the following changes:

1.
2.
3.

### Sample Code and Plot

_If you are adding or modifying a visualizer, PLEASE include a sample plot here along with the code you used to generate it._

### TODOs and questions

<!--
If this is a work-in-progress (WIP), list the changes you still need to make and/or questions or the Yellowbrick team. You can also mention extensions to your work that might be added as an issue to work on after the PR.
-->

Still to do:

- [ ]
- [ ]
- [ ]

Questions for the @DistrictDataLabs/team-oz-maintainers:

- [ ]
- [ ]

### CHECKLIST

<!--
Here's a handy checklist to go through before submitting a PR, note that you can check a checkbox in Markdown by changing `- [ ]` to `- [x]` or you can create the PR and check the box manually.
-->

- [ ] _Is the commit message formatted correctly?_
- [ ] _Have you noted the new functionality/bugfix in the release notes of the next release?_

<!-- If you've changed any code -->

- [ ] _Included a sample plot to visually illustrate your changes?_
- [ ] _Do all of your functions and methods have docstrings?_
- [ ] _Have you added/updated unit tests where appropriate?_
- [ ] _Have you updated the baseline images if necessary?_
- [ ] _Have you run the unit tests using `pytest`?_
- [ ] _Is your code style correct (are you using PEP8, pyflakes)?_
- [ ] _Have you documented your new feature/functionality in the docs?_

<!-- If you've added to the docs -->

- [ ] _Have you built the docs using `make html`?_
17 changes: 0 additions & 17 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md

This file was deleted.

5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ docs/_build/
# IDE/editor droppings
*.swp
*.swo
.vscode/settings.json

# OS droppings
.DS_Store
Expand Down Expand Up @@ -120,6 +121,4 @@ fabric.properties

# Data downloaded from Yellowbrick
data/
.vscode/settings.json

yellowbrick/datasets/fixtures
yellowbrick/datasets/fixtures
61 changes: 43 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,53 @@
dist: xenial
language: python
python:
- '2.7'
- '3.6'
matrix:
include:
- name: "Python 3.6 on Xenial Linux"
python: '3.6'

- name: "Python 3.7 on Xenial Linux"
python: '3.7'

- name: "Miniconda 3.6 on Xenial Linux"
env: ANACONDA="3.6"

- name: "Miniconda 3.7 on Xenial Linux"
env: ANACONDA="3.7"

before_install:
- sudo apt-get update
- sudo apt-get build-dep python-scipy
- sudo apt-get update;
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo apt-get build-dep python-scipy;
MINICONDA_OS="Linux";
fi

install:
- pip install -r requirements.txt
- pip install -r tests/requirements.txt
- pip install coveralls
- python -m nltk.downloader popular
- if [[ -z ${ANACONDA} ]]; then
pip install -r requirements.txt;
pip install -r tests/requirements.txt;
pip install coveralls;
else
wget https://repo.anaconda.com/miniconda/Miniconda3-latest-$MINICONDA_OS-x86_64.sh -O miniconda.sh;
bash miniconda.sh -b -p $HOME/miniconda;
export PATH="$HOME/miniconda/bin:$PATH";
hash -r;
conda config --set always_yes yes --set changeps1 no;
export BASE_PYTHON=`python -c 'import sys; version=sys.version_info[:3]; print("{0}.{1}.{2}".format(*version))'`;
echo "Base Anaconda Python is $BASE_PYTHON";
echo "Creating Anaconda Python $ANACONDA conda environment";
conda update -n base conda --yes;
conda config --add channels conda-forge;
conda env create -f tests/requirements.txt -n yellowbrick python=$ANACONDA;
source activate yellowbrick;
conda install coveralls;
fi

script: make test
script:
- python -m nltk.downloader popular
- make test

after_success: coveralls

notifications:
email:
recipients:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
on_success: change
on_failure: always
slack:
secure: mWKVHmEc22FJSp6Rrnd1j4QYCgZY4NJSrA8kZ5wj2/lf1iHI/CfWGTf7+Qihqe+rt0FOU0+UA9SzvSHRD1bV76q/zINayQ0EyJAfQzvIWIRGGnnMSO/79WoEYF56wwjpc5pLUTh6QV5qqfy+8nNGQ1/uJ0h6FtsUaSa/g61a5ZJEVBIjIpH8PgMxM64dRgJCmAdQuXkBP5Uf3yHlCtYk+Jr+gyXU2oqwMZ1VWgZkEo1Tqo7W9WY8dkOaAkzXDT61OqtcyyTuVSYbmK4i3c84681NBpb7wT6BfiCCAd3tn5AIKCkJVJ0ga0XeF6MdDpnicpku4FaN+fQjwkPiU47o/aFp8RNp27JQ9AhvH7wMuu5O8HDhszjRkfGOlUbuPOTavc22o4j0ShsrLiTQRJRhQQzJoquPuPj5wHqCCN+ice7IVUHj3ZC2jpJKDEYUNnr1fATtOwocimc6PhJM/IoeHgEEHpi37b+AxnhgOFoBlgsq2f4nsRD9JsLHqIpJCHgMjKxc6p3FtcFcXZDlDXQIcCzSRiPhG207dahspA3aPLj4Z+tOLJwh7/PSEfp02kcgPMM/MLYTWcaBv14aYi69kvQoZTfqVY8tIohg3ygda5siOCTTgqGriJYzkmdY5/Dp51kabhl+cEVIxPyY0miqyl3hZjqkqCnnOtg06qqxLLM=
Loading

0 comments on commit a27c290

Please sign in to comment.