diff --git a/.travis.yml b/.travis.yml index edce95dfdc3..b39eaefc5b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,7 @@ addons: apt: packages: - clang + - graphviz @@ -83,6 +84,7 @@ before_install: install: - cd $TRAVIS_BUILD_DIR - conda env create -f tardis_env27.yml + - conda install -y -c conda-forge graphviz=2.38.0 xorg-libxrender xorg-libxpm - source activate tardis script: diff --git a/setup.cfg b/setup.cfg index 3558253173b..8ecf124df68 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,7 +7,7 @@ all_files = 1 upload-dir = docs/_build/html show-response = 1 -[pytest] +[tool:pytest] minversion = 2.2 norecursedirs = build docs/_build diff --git a/setup.py b/setup.py index ba47ae50217..14ac28ed7cc 100755 --- a/setup.py +++ b/setup.py @@ -73,10 +73,6 @@ add_command_option('develop', 'with-vpacket-logging', 'compile TARDIS with virtual packet logging', is_bool=True) -# Adjust the compiler in case the default on this platform is to use a -# broken one. -adjust_compiler(PACKAGENAME) - # Freeze build information in version.py generate_version_py(PACKAGENAME, VERSION, RELEASE, get_debug_option(PACKAGENAME)) @@ -141,4 +137,3 @@ entry_points=entry_points, **package_info ) - diff --git a/tardis/plasma/tests/test_plasma_dot_tex.py b/tardis/plasma/tests/test_plasma_dot_tex.py index b37addf762c..d51fd0ad538 100644 --- a/tardis/plasma/tests/test_plasma_dot_tex.py +++ b/tardis/plasma/tests/test_plasma_dot_tex.py @@ -1,10 +1,13 @@ import os import pygraphviz as pgv import pytest +from datetime import datetime data_path = os.path.join('tardis', 'plasma', 'tests', 'data') - +@pytest.mark.skipif(datetime.now() < datetime(2018, 10, 1), + reason="graphviz had trouble being installed via conda in " + "March 2018") def test_write_dot(tmpdir, simulation_verysimple): fname = str(tmpdir.mkdir('test_dot').join('plasma.dot')) simulation_verysimple.plasma.write_to_dot(fname) @@ -12,9 +15,12 @@ def test_write_dot(tmpdir, simulation_verysimple): expected = pgv.AGraph(os.path.join(data_path, 'plasma_ref.dot')).to_string() assert actual == expected - +@pytest.mark.skipif(datetime.now() < datetime(2018, 10, 1), + reason="graphviz had trouble being installed via conda in " + "March 2018") def test_write_tex(tmpdir, simulation_verysimple): fname = str(tmpdir.mkdir('test_tex').join('plasma.tex')) simulation_verysimple.plasma.write_to_tex(fname) - with open(fname, 'r') as fp1, open(os.path.join(data_path, 'plasma_ref.tex'), 'r') as fp2: + with open(fname, 'r') as fp1, open( + os.path.join(data_path, 'plasma_ref.tex'), 'r') as fp2: assert fp1.readline() ==fp2.readline() diff --git a/tardis_env27.yml b/tardis_env27.yml index 3f73b494b77..bf143331de7 100644 --- a/tardis_env27.yml +++ b/tardis_env27.yml @@ -8,19 +8,19 @@ channels: dependencies: - python=2.7 - numpy=1.12 -- scipy=1.0 +- scipy=1 - pandas=0.20 - pytables -- h5py=2.6 +- h5py=2 - matplotlib=2.0 - astropy=1.3 - numexpr=2.6 -- Cython=0.21 +- Cython=0.28 - networkx=1.10 - pytest=3.0 - pyyaml=3.12 - jsonschema=2.5.1 -- pyne=0.5.3 +- pyne=0.5 - graphviz=2.38 - pygraphviz