Unverified Commit 4720fc36 authored by Matti Picus's avatar Matti Picus Committed by GitHub
Browse files

Merge pull request #516 from matthew-brett/add-packages

MRG: Add tomli, ensure virtualenv
parents c8a79690 18d8903b
...@@ -19,10 +19,13 @@ MB_PYTHON_VERSION=${MB_PYTHON_VERSION:-$TRAVIS_PYTHON_VERSION} ...@@ -19,10 +19,13 @@ MB_PYTHON_VERSION=${MB_PYTHON_VERSION:-$TRAVIS_PYTHON_VERSION}
function before_install { function before_install {
# Install a virtualenv to work in. # Install a virtualenv to work in.
# Virtualenv package may not be installed on host Python.
python -m pip install virtualenv
virtualenv --python=$PYTHON_EXE venv virtualenv --python=$PYTHON_EXE venv
source venv/bin/activate source venv/bin/activate
python --version # just to check python --version # just to check
pip install --upgrade pip wheel # Tomli for pyproject.toml parsing, to get dependencies.
pip install --upgrade pip wheel tomli
} }
function build_wheel { function build_wheel {
......
...@@ -39,7 +39,8 @@ function before_install { ...@@ -39,7 +39,8 @@ function before_install {
get_macpython_environment $MB_PYTHON_VERSION venv get_macpython_environment $MB_PYTHON_VERSION venv
source venv/bin/activate source venv/bin/activate
pip install --upgrade pip wheel # Tomli for pyproject.toml parsing, to get dependencies.
pip install --upgrade pip wheel tomli
} }
# build_wheel function defined in common_utils (via osx_utils) # build_wheel function defined in common_utils (via osx_utils)
......
#!/bin/bash #!/bin/bash
# Despite the name, this file is not specific to Travis-CI.
# It sets up the local environment for wheel building and testing.
# For Mac, configure xcode, and set up before_install and other
# functions to wrap builds.
# For linux, set up before_install to work in virtualenv, and set up wrapping
# to run build and tests in docker containers.
WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse} WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment