Skip to content

Commit

Permalink
[mlflow#120] Remove tox in favor of running tests from a conda enviro…
Browse files Browse the repository at this point in the history
…nment (mlflow#266)
  • Loading branch information
smurching authored and aarondav committed Aug 8, 2018
1 parent 8bf6716 commit 6e996d7
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 22 deletions.
14 changes: 8 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ services:
matrix:
include:
- python: 2.7
env: TOXENV=py27
- python: 3.6
env: TOXENV=py36
install:
- sudo mkdir -p /travis-install
- sudo chown travis /travis-install
Expand All @@ -28,11 +26,13 @@ install:
- conda config --set always_yes yes --set changeps1 no
# Useful for debugging any issues with conda
- conda info -a
# Install virtualenv inside conda env
- conda install virtualenv
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- source activate test-environment
- python --version
- pip install --upgrade pip
- pip install .
- pip install -r dev-requirements.txt
- pip install -r dev-requirements.txt -q
- pip install -r test-requirements.txt -q
- export MLFLOW_HOME=$(pwd)
# Remove boto config present in Travis VMs (https://github.com/travis-ci/travis-ci/issues/7940)
- sudo rm -f /etc/boto.cfg
Expand All @@ -44,7 +44,9 @@ script:
- pip list
- which mlflow
- echo $MLFLOW_HOME
- tox
- mlflow sagemaker build-and-push-container --no-push --mlflow-home .
- pytest --cov=mlflow --verbose --large
- ./lint.sh
- cd mlflow/server/js
- npm i
- npm test -- --coverage
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ to MLflow locally.
Prerequisites
-------------

We recommend installing MLflow in its own virtualenv for development, as follows:
We recommend installing MLflow in its own conda environment for development, as follows:

.. code:: bash
virtualenv env
source env/bin/activate
conda create --name mlflow-dev-env
source activate mlflow-dev-env
pip install -r dev-requirements.txt
pip install -r tox-requirements.txt
pip install -r test-requirements.txt
pip install -e . # installs mlflow from current checkout
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR /app
ADD . /app

RUN pip install -r dev-requirements.txt && \
pip install -r tox-requirements.txt && \
pip install -r test-requirements.txt && \
pip install -e . && \
apt-get install -y gnupg && \
curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
Expand Down
File renamed without changes.
11 changes: 0 additions & 11 deletions tox.ini

This file was deleted.

0 comments on commit 6e996d7

Please sign in to comment.