Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Install optional dependencies for Python 3.8 tests #5029

Merged
merged 3 commits into from
Jan 7, 2020
Merged

Install optional dependencies for Python 3.8 tests #5029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb99924
Install optional dependencies for Python 3.8 tests
mbargull Jan 4, 2020
dfe0263
Add whitespace change to let test_annotations run CI
mbargull Jan 4, 2020
bd8f048
Fix test broken in Py3.8
stuartarchibald Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions buildscripts/incremental/setup_conda_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@ fi
# Install optional packages into activated env
if [ "${VANILLA_INSTALL}" != "yes" ]; then
# Scipy, CFFI, jinja2, IPython and pygments are optional dependencies, but exercised in the test suite
if [ $PYTHON \< "3.8" ]; then
$CONDA_INSTALL ${EXTRA_CHANNELS} cffi scipy jinja2 ipython pygments
fi
$CONDA_INSTALL ${EXTRA_CHANNELS} cffi scipy jinja2 ipython pygments
fi

# Install the compiler toolchain
Expand Down
3 changes: 3 additions & 0 deletions numba/tests/test_annotations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
except ImportError:
pygments = None


@unittest.skipIf(jinja2 is None, "please install the 'jinja2' package")
class TestAnnotation(unittest.TestCase):

Expand Down Expand Up @@ -51,6 +52,8 @@ def bar(x):

def foo(x):
h = 0.
for i in range(x): # py 38 needs two loops for one to lift?!
h = h + i
for k in range(x):
h = h + k
if x:
Expand Down