Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
requirements: requirements.txt

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
Expand All @@ -39,11 +39,26 @@ jobs:
python -m pip install pytest pytest-cov pytest-xdist
python -m pip install -r ${{ matrix.requirements }}

- name: Install ghostscript on Ubuntu
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
sudo apt-get update
sudo apt-get install -y ghostscript

- name: Install ghostscript on macOS
if: ${{ matrix.os == 'macos-latest' }}
run: brew install ghostscript

- name: Install ghostscript on Windows
if: ${{ matrix.os == 'windows-latest' }}
run: choco install ghostscript -y
shell: powershell

- name: Test with pytest
run: python -m pytest --cov=fgivenx
run: python -m pytest --cov=fgivenx -s -vv

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}

2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fgivenx: Functional Posterior Plotter
=====================================
:fgivenx: Functional Posterior Plotter
:Author: Will Handley
:Version: 2.5.0
:Version: 2.5.1
:Homepage: https://github.com/handley-lab/fgivenx
:Documentation: http://fgivenx.readthedocs.io/

Expand Down
Binary file modified fgivenx/test/baseline_images/test_plot/plot.pdf
Binary file not shown.
Binary file not shown.
Binary file modified fgivenx/test/baseline_images/test_plot/plot_lines.pdf
Binary file not shown.
Binary file modified fgivenx/test/baseline_images/test_plot/plot_lines_downsample.pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified fgivenx/test/baseline_images/test_plot/plot_nolines.pdf
Binary file not shown.
Binary file modified fgivenx/test/baseline_images/test_plot/plot_rasterize.pdf
Binary file not shown.
Binary file modified fgivenx/test/baseline_images/test_plot/plot_smooth.pdf
Binary file not shown.
Binary file not shown.
12 changes: 12 additions & 0 deletions fgivenx/test/test_plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from fgivenx.plot import plot, plot_lines
import matplotlib.pyplot as plt
import matplotlib
from matplotlib.testing.decorators import image_comparison


def gen_plot_data():
Expand All @@ -16,6 +17,7 @@ def gen_plot_data():
return x, y, z


@image_comparison(baseline_images=['plot'], extensions=['pdf'])
def test_plot():
x, y, z = gen_plot_data()

Expand All @@ -24,13 +26,16 @@ def test_plot():
assert type(cbar) is matplotlib.contour.QuadContourSet


@image_comparison(baseline_images=['plot_transparent'], extensions=['pdf'])
def test_plot_transparent():
x, y, z = gen_plot_data()

fig, ax = plt.subplots()
cbar = plot(x, y, z, ax, alpha=0.7)
assert type(cbar) is matplotlib.contour.QuadContourSet


@image_comparison(baseline_images=['plot_transparent'], extensions=['pdf'])
def test_plot_fineness():
x, y, z = gen_plot_data()

Expand All @@ -46,24 +51,28 @@ def test_plot_wrong_argument():
plot(x, y, z, wrong_argument=None)


@image_comparison(baseline_images=['plot'], extensions=['pdf'])
def test_plot_no_ax():
plt.subplots()
x, y, z = gen_plot_data()
plot(x, y, z)


@image_comparison(baseline_images=['plot_smooth'], extensions=['pdf'])
def test_plot_smooth():
plt.subplots()
x, y, z = gen_plot_data()
plot(x, y, z, smooth=1)


@image_comparison(baseline_images=['plot_rasterize'], extensions=['pdf'])
def test_plot_rasterize():
plt.subplots()
x, y, z = gen_plot_data()
plot(x, y, z, rasterize_contours=True)


@image_comparison(baseline_images=['plot_nolines'], extensions=['pdf'])
def test_plot_nolines():
plt.subplots()
x, y, z = gen_plot_data()
Expand All @@ -81,18 +90,21 @@ def gen_line_data():
return x, fsamps


@image_comparison(baseline_images=['plot_lines'], extensions=['pdf'])
def test_plot_lines():
x, fsamps = gen_line_data()
fig, ax = plt.subplots()
plot_lines(x, fsamps, ax)


@image_comparison(baseline_images=['plot_lines'], extensions=['pdf'])
def test_plot_lines_no_ax():
x, fsamps = gen_line_data()
plt.subplots()
plot_lines(x, fsamps)


@image_comparison(baseline_images=['plot_lines_downsample'], extensions=['pdf'])
def test_plot_lines_downsample():
x, fsamps = gen_line_data()
plt.subplots()
Expand Down
Loading