Verified Commit 0ae15079 authored by John Douglas Veitch's avatar John Douglas Veitch Committed by Adam Mercer
Browse files

Merge branch 'fixes' into 'master'

Fixes

See merge request lscsoft/lalsuite!1399

(cherry picked from commit 80b8fe3f)
parent 05741ad8
...@@ -13,7 +13,6 @@ rc('font',size=big) ...@@ -13,7 +13,6 @@ rc('font',size=big)
rc('legend', fontsize=small) rc('legend', fontsize=small)
rc('xtick', labelsize=small) rc('xtick', labelsize=small)
rc('ytick', labelsize=small) rc('ytick', labelsize=small)
rc('text.latex', unicode=True)
from lalinference.plot import make_disk_plot from lalinference.plot import make_disk_plot
......
...@@ -19,7 +19,6 @@ def make_disk_plot(post,outpath=None): ...@@ -19,7 +19,6 @@ def make_disk_plot(post,outpath=None):
rc('legend', fontsize=small) rc('legend', fontsize=small)
rc('xtick', labelsize=small) rc('xtick', labelsize=small)
rc('ytick', labelsize=small) rc('ytick', labelsize=small)
rc('text.latex', unicode=True)
try: try:
......
...@@ -63,7 +63,7 @@ outputs: ...@@ -63,7 +63,7 @@ outputs:
- swig >={{ swig_version }} - swig >={{ swig_version }}
host: host:
- {{ pin_subpackage('lalmetaio', exact=True) }} - {{ pin_subpackage('lalmetaio', exact=True) }}
- numpy 1.9 - numpy
- python - python
run: run:
- lal - lal
......
...@@ -83,7 +83,7 @@ outputs: ...@@ -83,7 +83,7 @@ outputs:
- swig >={{ swig_version }} - swig >={{ swig_version }}
host: host:
- {{ pin_subpackage('lalsimulation', exact=True) }} - {{ pin_subpackage('lalsimulation', exact=True) }}
- numpy 1.9 - numpy
- python - python
run: run:
- gsl - gsl
......
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