From 5f0fa108cfa2dbbdee9d858bfb96e82853dc9c59 Mon Sep 17 00:00:00 2001 From: Blair Bonnett Date: Sun, 26 Jan 2025 15:53:27 +0100 Subject: [PATCH] Format with ruff --- conftest.py | 1 + .../examples/threecol/double.py | 2 - .../examples/threecol/single.py | 2 - .../examples/threecol/triple.py | 2 - .../examples/twocol/double.py | 2 - .../examples/twocol/single.py | 2 - pyproject.toml | 6 +- tests/sources/environment/check_set/basic.py | 2 - .../sources/environment/check_set/override.py | 3 - tests/sources/environment/invalid/basic.py | 1 - tests/sources/environment/repeated/basic.py | 2 - tests/sources/external/cartopy_figure.py | 2 - tests/sources/external/seaborn_figure.py | 2 - .../sources/fix_raster_paths/figures/noise.py | 5 +- tests/sources/fix_raster_paths/speckle.py | 5 +- tests/sources/fonts/custom_font.py | 2 - tests/sources/fonts/noconfig/custom_font.py | 2 - tests/sources/kwargs/default.py | 1 - tests/sources/kwargs/overridden.py | 1 - tests/sources/legend/legend_only.py | 2 - tests/sources/pythonpath/using_custom_lib.py | 2 - tests/sources/tikzpicture/square.py | 2 - .../tracking/config_enabled/config_enabled.py | 2 - tests/sources/tracking/dependency_loadtxt.py | 2 - tests/sources/tracking/dependency_npy.py | 2 - tests/sources/tracking/dependency_pathlib.py | 2 - tests/sources/tracking/extra_dirs/multi.py | 2 - .../tracking/imports/cfg_extra/figure.py | 2 - .../tracking/imports/cfg_pythonpath/figure.py | 2 - tests/sources/tracking/manual_dependencies.py | 2 - tests/sources/tracking/manual_dependency.py | 2 - tests/sources/tracking/multi.py | 2 - tests/sources/tracking/netcdf4/netcdf4.py | 2 - .../netcdf4/netcdf4_multi_explicit.py | 2 - .../tracking/netcdf4/netcdf4_multi_glob.py | 2 - tests/sources/tracking/netcdf4_in_setup.py | 2 - tests/sources/tracking/netcdf4_write.py | 2 - tests/sources/tracking/rasterisation.py | 5 +- tests/sources/tracking/simple.py | 2 - .../tracking/simple_binary_nonimage.py | 5 +- tests/sources/tracking/simple_fdopen.py | 2 - tests/sources/tracking/simple_nonbinary.py | 2 - tests/sources/tracking/simple_nonfile.py | 2 - tests/sources/tracking/simple_nonproject.py | 2 - tests/test_config.py | 7 +-- tests/test_data.py | 1 - tests/test_environment.py | 7 +-- tests/test_external.py | 13 ++-- tests/test_fonts.py | 7 +-- tests/test_misc.py | 1 - tests/test_postprocessing.py | 19 +++--- tests/test_pythonpath.py | 7 +-- tests/test_setup_figure.py | 7 +-- tests/test_tracking.py | 61 +++++++++---------- 54 files changed, 74 insertions(+), 157 deletions(-) diff --git a/conftest.py b/conftest.py index b97b77b..79eebec 100644 --- a/conftest.py +++ b/conftest.py @@ -1,6 +1,7 @@ # SPDX-FileCopyrightText: Blair Bonnett # SPDX-License-Identifier: BSD-3-Clause + def pytest_itemcollected(item): """Use the test docstring (if available) as the node ID. diff --git a/data/share/matplotlib-pgfutils/examples/threecol/double.py b/data/share/matplotlib-pgfutils/examples/threecol/double.py index adf3522..feea8ad 100644 --- a/data/share/matplotlib-pgfutils/examples/threecol/double.py +++ b/data/share/matplotlib-pgfutils/examples/threecol/double.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=0.4, columns=2) from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 400) s = 0.3 * t + 2.5 * np.cos(2 * np.pi * 0.85 * t) - 0.8 diff --git a/data/share/matplotlib-pgfutils/examples/threecol/single.py b/data/share/matplotlib-pgfutils/examples/threecol/single.py index 5b49e5b..772f32e 100644 --- a/data/share/matplotlib-pgfutils/examples/threecol/single.py +++ b/data/share/matplotlib-pgfutils/examples/threecol/single.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=0.4, columns=1) from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 200) s = 0.3 * t + 2.5 * np.cos(2 * np.pi * 0.85 * t) - 0.8 diff --git a/data/share/matplotlib-pgfutils/examples/threecol/triple.py b/data/share/matplotlib-pgfutils/examples/threecol/triple.py index 5a5f840..ea4926b 100644 --- a/data/share/matplotlib-pgfutils/examples/threecol/triple.py +++ b/data/share/matplotlib-pgfutils/examples/threecol/triple.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=0.4, columns=3) from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 400) s = 0.3 * t + 2.5 * np.cos(2 * np.pi * 0.85 * t) - 0.8 diff --git a/data/share/matplotlib-pgfutils/examples/twocol/double.py b/data/share/matplotlib-pgfutils/examples/twocol/double.py index adf3522..feea8ad 100644 --- a/data/share/matplotlib-pgfutils/examples/twocol/double.py +++ b/data/share/matplotlib-pgfutils/examples/twocol/double.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=0.4, columns=2) from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 400) s = 0.3 * t + 2.5 * np.cos(2 * np.pi * 0.85 * t) - 0.8 diff --git a/data/share/matplotlib-pgfutils/examples/twocol/single.py b/data/share/matplotlib-pgfutils/examples/twocol/single.py index 5b49e5b..772f32e 100644 --- a/data/share/matplotlib-pgfutils/examples/twocol/single.py +++ b/data/share/matplotlib-pgfutils/examples/twocol/single.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=0.4, columns=1) from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 200) s = 0.3 * t + 2.5 * np.cos(2 * np.pi * 0.85 * t) - 0.8 diff --git a/pyproject.toml b/pyproject.toml index 5ad02a1..dfcaae8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,10 +64,14 @@ select = [ "W", # pycodestyle warnings ] -[tool.ruff.isort] +[tool.ruff.lint.isort] combine-as-imports = true force-sort-within-sections = true +[tool.ruff.lint.per-file-ignores] +"data/**.py" = ["E402"] +"tests/**.py" = ["E402"] + # # Testing diff --git a/tests/sources/environment/check_set/basic.py b/tests/sources/environment/check_set/basic.py index 276327e..ea3ce14 100644 --- a/tests/sources/environment/check_set/basic.py +++ b/tests/sources/environment/check_set/basic.py @@ -3,12 +3,10 @@ from pgfutils import save, setup_figure - setup_figure() import os - name1 = os.environ.get("name1", "not set") name2 = os.environ.get("name2", "not set") diff --git a/tests/sources/environment/check_set/override.py b/tests/sources/environment/check_set/override.py index 116c65a..540b06a 100644 --- a/tests/sources/environment/check_set/override.py +++ b/tests/sources/environment/check_set/override.py @@ -3,17 +3,14 @@ import os - os.environ["name1"] = "original value" from pgfutils import save, setup_figure - setup_figure() import os - name1 = os.environ.get("name1", "not set") name2 = os.environ.get("name2", "not set") diff --git a/tests/sources/environment/invalid/basic.py b/tests/sources/environment/invalid/basic.py index aac14fd..26c5884 100644 --- a/tests/sources/environment/invalid/basic.py +++ b/tests/sources/environment/invalid/basic.py @@ -3,6 +3,5 @@ from pgfutils import save, setup_figure - setup_figure() save() diff --git a/tests/sources/environment/repeated/basic.py b/tests/sources/environment/repeated/basic.py index c06c948..2ee2b52 100644 --- a/tests/sources/environment/repeated/basic.py +++ b/tests/sources/environment/repeated/basic.py @@ -3,12 +3,10 @@ from pgfutils import save, setup_figure - setup_figure() import os - name1 = os.environ.get("name1", "not set") name2 = os.environ.get("name2", "not set") diff --git a/tests/sources/external/cartopy_figure.py b/tests/sources/external/cartopy_figure.py index 218fa49..a623741 100644 --- a/tests/sources/external/cartopy_figure.py +++ b/tests/sources/external/cartopy_figure.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) import cartopy.crs as ccrs import matplotlib.pyplot as plt - ax = plt.axes(projection=ccrs.PlateCarree()) ax.stock_img() diff --git a/tests/sources/external/seaborn_figure.py b/tests/sources/external/seaborn_figure.py index d06ebc3..74483b2 100644 --- a/tests/sources/external/seaborn_figure.py +++ b/tests/sources/external/seaborn_figure.py @@ -3,12 +3,10 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) import seaborn as sns - sns.set() tips = sns.load_dataset("tips") sns.relplot( diff --git a/tests/sources/fix_raster_paths/figures/noise.py b/tests/sources/fix_raster_paths/figures/noise.py index 297dc19..e4a48b8 100644 --- a/tests/sources/fix_raster_paths/figures/noise.py +++ b/tests/sources/fix_raster_paths/figures/noise.py @@ -3,14 +3,13 @@ from pgfutils import save, setup_figure - setup_figure(width=0.95, height=0.4) from matplotlib import pyplot as plt import numpy as np - -noise = np.random.randn(512, 256) +rng = np.random.default_rng(seed=100) +noise = rng.random((512, 256)) plt.imshow(noise, interpolation="nearest", aspect="auto") plt.colorbar() diff --git a/tests/sources/fix_raster_paths/speckle.py b/tests/sources/fix_raster_paths/speckle.py index 8dd75e3..d2b40a2 100644 --- a/tests/sources/fix_raster_paths/speckle.py +++ b/tests/sources/fix_raster_paths/speckle.py @@ -3,14 +3,13 @@ from pgfutils import save, setup_figure - setup_figure(width=0.95, height=0.4) from matplotlib import pyplot as plt import numpy as np - -noise = np.random.randn(512, 256) + 1j * np.random.randn(512, 256) +rng = np.random.default_rng(seed=1010) +noise = rng.standard_normal((512, 256)) + 1j * rng.standard_normal((512, 256)) plt.imshow(np.abs(noise) ** 2, interpolation="nearest", aspect="auto") plt.colorbar() diff --git a/tests/sources/fonts/custom_font.py b/tests/sources/fonts/custom_font.py index df097b5..39a8e17 100644 --- a/tests/sources/fonts/custom_font.py +++ b/tests/sources/fonts/custom_font.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=0.95, height=0.4) from matplotlib import pyplot as plt import numpy as np - t = np.linspace(-4, 4, 201) plt.plot(t, 2 * np.sin(2 * np.pi * 2.5 * t)) diff --git a/tests/sources/fonts/noconfig/custom_font.py b/tests/sources/fonts/noconfig/custom_font.py index 00c8596..022370c 100644 --- a/tests/sources/fonts/noconfig/custom_font.py +++ b/tests/sources/fonts/noconfig/custom_font.py @@ -3,7 +3,6 @@ from pgfutils import save, setup_figure - setup_figure( width=0.5, height=0.4, @@ -16,7 +15,6 @@ from matplotlib import pyplot as plt import numpy as np - t = np.linspace(-4, 4, 201) plt.plot(t, 2 * np.sin(2 * np.pi * 2.5 * t)) diff --git a/tests/sources/kwargs/default.py b/tests/sources/kwargs/default.py index 6da5fb6..49941a2 100644 --- a/tests/sources/kwargs/default.py +++ b/tests/sources/kwargs/default.py @@ -3,6 +3,5 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) save() diff --git a/tests/sources/kwargs/overridden.py b/tests/sources/kwargs/overridden.py index 52d4eab..08f515b 100644 --- a/tests/sources/kwargs/overridden.py +++ b/tests/sources/kwargs/overridden.py @@ -3,6 +3,5 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1, figure_background="red") save() diff --git a/tests/sources/legend/legend_only.py b/tests/sources/legend/legend_only.py index 1333140..a00fb2b 100644 --- a/tests/sources/legend/legend_only.py +++ b/tests/sources/legend/legend_only.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt from matplotlib.lines import Line2D - cmap = plt.cm.coolwarm custom_lines = [ Line2D([0], [0], color=cmap(0), lw=4), diff --git a/tests/sources/pythonpath/using_custom_lib.py b/tests/sources/pythonpath/using_custom_lib.py index db44d40..c0e7d32 100644 --- a/tests/sources/pythonpath/using_custom_lib.py +++ b/tests/sources/pythonpath/using_custom_lib.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) from custom_library import get_data import matplotlib.pyplot as plt - t, s = get_data() plt.plot(t, s) diff --git a/tests/sources/tikzpicture/square.py b/tests/sources/tikzpicture/square.py index 7a25ab5..7109f13 100644 --- a/tests/sources/tikzpicture/square.py +++ b/tests/sources/tikzpicture/square.py @@ -4,13 +4,11 @@ # Set up the figure environment. from pgfutils import save, setup_figure - setup_figure(width=0.9, height=0.4) from matplotlib import pyplot as plt import numpy as np - # Generate square wave from a few terms of its Fourier series. f = 3 t = np.linspace(0, 1, 501) diff --git a/tests/sources/tracking/config_enabled/config_enabled.py b/tests/sources/tracking/config_enabled/config_enabled.py index dc78520..8861dcc 100644 --- a/tests/sources/tracking/config_enabled/config_enabled.py +++ b/tests/sources/tracking/config_enabled/config_enabled.py @@ -3,13 +3,11 @@ from pgfutils import add_dependencies, save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt import numpy as np - noise = np.load("noise.npy") plt.imshow(noise) plt.colorbar() diff --git a/tests/sources/tracking/dependency_loadtxt.py b/tests/sources/tracking/dependency_loadtxt.py index fc99af0..47c5c25 100644 --- a/tests/sources/tracking/dependency_loadtxt.py +++ b/tests/sources/tracking/dependency_loadtxt.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt import numpy as np - data = np.loadtxt("scatter.csv", delimiter=",", dtype=int) x = data[:, :3] diff --git a/tests/sources/tracking/dependency_npy.py b/tests/sources/tracking/dependency_npy.py index 326f0d3..bb21909 100644 --- a/tests/sources/tracking/dependency_npy.py +++ b/tests/sources/tracking/dependency_npy.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt import numpy as np - data = np.load("noise.npy") x = data[:, :3] diff --git a/tests/sources/tracking/dependency_pathlib.py b/tests/sources/tracking/dependency_pathlib.py index 2d8251a..4f119e6 100644 --- a/tests/sources/tracking/dependency_pathlib.py +++ b/tests/sources/tracking/dependency_pathlib.py @@ -3,7 +3,6 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) import pathlib @@ -11,7 +10,6 @@ from matplotlib import pyplot as plt import numpy as np - datastr = pathlib.Path("scatter.csv").read_text() data = np.genfromtxt(datastr.splitlines(), delimiter=",", dtype=int) diff --git a/tests/sources/tracking/extra_dirs/multi.py b/tests/sources/tracking/extra_dirs/multi.py index ed5e31c..76af9e3 100644 --- a/tests/sources/tracking/extra_dirs/multi.py +++ b/tests/sources/tracking/extra_dirs/multi.py @@ -3,13 +3,11 @@ from pgfutils import add_dependencies, save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt import numpy as np - noise = np.load("../noise.npy") plt.imshow(noise) plt.colorbar() diff --git a/tests/sources/tracking/imports/cfg_extra/figure.py b/tests/sources/tracking/imports/cfg_extra/figure.py index b55d9dc..da60fbc 100644 --- a/tests/sources/tracking/imports/cfg_extra/figure.py +++ b/tests/sources/tracking/imports/cfg_extra/figure.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(height=0.3) from custom_lib import get_data from matplotlib import pyplot as plt - t, s = get_data() plt.plot(t, s) diff --git a/tests/sources/tracking/imports/cfg_pythonpath/figure.py b/tests/sources/tracking/imports/cfg_pythonpath/figure.py index b55d9dc..da60fbc 100644 --- a/tests/sources/tracking/imports/cfg_pythonpath/figure.py +++ b/tests/sources/tracking/imports/cfg_pythonpath/figure.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(height=0.3) from custom_lib import get_data from matplotlib import pyplot as plt - t, s = get_data() plt.plot(t, s) diff --git a/tests/sources/tracking/manual_dependencies.py b/tests/sources/tracking/manual_dependencies.py index 087162b..15c20cd 100644 --- a/tests/sources/tracking/manual_dependencies.py +++ b/tests/sources/tracking/manual_dependencies.py @@ -3,13 +3,11 @@ from pgfutils import add_dependencies, save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 201) s = np.sin(2 * np.pi * 0.5 * t) diff --git a/tests/sources/tracking/manual_dependency.py b/tests/sources/tracking/manual_dependency.py index 3c8b5a0..05d95bf 100644 --- a/tests/sources/tracking/manual_dependency.py +++ b/tests/sources/tracking/manual_dependency.py @@ -3,13 +3,11 @@ from pgfutils import add_dependencies, save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 201) s = np.sin(2 * np.pi * 0.5 * t) diff --git a/tests/sources/tracking/multi.py b/tests/sources/tracking/multi.py index dc78520..8861dcc 100644 --- a/tests/sources/tracking/multi.py +++ b/tests/sources/tracking/multi.py @@ -3,13 +3,11 @@ from pgfutils import add_dependencies, save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt import numpy as np - noise = np.load("noise.npy") plt.imshow(noise) plt.colorbar() diff --git a/tests/sources/tracking/netcdf4/netcdf4.py b/tests/sources/tracking/netcdf4/netcdf4.py index d190039..2e61099 100644 --- a/tests/sources/tracking/netcdf4/netcdf4.py +++ b/tests/sources/tracking/netcdf4/netcdf4.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=0.4) import matplotlib.pyplot as plt import netCDF4 - ds = netCDF4.Dataset("sine.nc") plt.plot(ds["time"][:], ds["voltage"][:]) diff --git a/tests/sources/tracking/netcdf4/netcdf4_multi_explicit.py b/tests/sources/tracking/netcdf4/netcdf4_multi_explicit.py index b17b13c..e3967c9 100644 --- a/tests/sources/tracking/netcdf4/netcdf4_multi_explicit.py +++ b/tests/sources/tracking/netcdf4/netcdf4_multi_explicit.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=0.4) import matplotlib.pyplot as plt import netCDF4 - ds = netCDF4.MFDataset(["mftest0.nc", "mftest1.nc", "mftest2.nc"]) plt.plot(ds["x"][:]) diff --git a/tests/sources/tracking/netcdf4/netcdf4_multi_glob.py b/tests/sources/tracking/netcdf4/netcdf4_multi_glob.py index 7ffa281..662051c 100644 --- a/tests/sources/tracking/netcdf4/netcdf4_multi_glob.py +++ b/tests/sources/tracking/netcdf4/netcdf4_multi_glob.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=0.4) import matplotlib.pyplot as plt import netCDF4 - ds = netCDF4.MFDataset("mftest*.nc") plt.plot(ds["x"][:]) diff --git a/tests/sources/tracking/netcdf4_in_setup.py b/tests/sources/tracking/netcdf4_in_setup.py index e07135c..11c5a74 100644 --- a/tests/sources/tracking/netcdf4_in_setup.py +++ b/tests/sources/tracking/netcdf4_in_setup.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=0.4, extra_tracking="netCDF4") import matplotlib.pyplot as plt import netCDF4 - ds = netCDF4.Dataset("netcdf4/sine.nc") plt.plot(ds["time"][:], ds["voltage"][:]) diff --git a/tests/sources/tracking/netcdf4_write.py b/tests/sources/tracking/netcdf4_write.py index f81dd90..2c383ad 100644 --- a/tests/sources/tracking/netcdf4_write.py +++ b/tests/sources/tracking/netcdf4_write.py @@ -3,14 +3,12 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=0.4, extra_tracking="netCDF4") import matplotlib.pyplot as plt import netCDF4 import numpy as np - t = np.linspace(0, 1, 101) s = np.sin(2 * np.pi * 3 * t) diff --git a/tests/sources/tracking/rasterisation.py b/tests/sources/tracking/rasterisation.py index 4fbef59..ae46bcd 100644 --- a/tests/sources/tracking/rasterisation.py +++ b/tests/sources/tracking/rasterisation.py @@ -3,14 +3,13 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt import numpy as np - -d = np.random.randn(128, 128) +rng = np.random.default_rng(seed=4242) +d = rng.random((128, 128)) plt.imshow(d) save() diff --git a/tests/sources/tracking/simple.py b/tests/sources/tracking/simple.py index 9a6b157..d7c90df 100644 --- a/tests/sources/tracking/simple.py +++ b/tests/sources/tracking/simple.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 201) s = np.sin(2 * np.pi * 0.5 * t) diff --git a/tests/sources/tracking/simple_binary_nonimage.py b/tests/sources/tracking/simple_binary_nonimage.py index 92b9fe5..9677fd6 100644 --- a/tests/sources/tracking/simple_binary_nonimage.py +++ b/tests/sources/tracking/simple_binary_nonimage.py @@ -3,17 +3,16 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 201) s = np.sin(2 * np.pi * 0.5 * t) -data = np.random.randn(100, 100) +rng = np.random.default_rng(seed=8816517) +data = rng.random((100, 100)) with open("test.npy", "wb") as f: np.save(f, data) diff --git a/tests/sources/tracking/simple_fdopen.py b/tests/sources/tracking/simple_fdopen.py index b65cb05..a9fd0f3 100644 --- a/tests/sources/tracking/simple_fdopen.py +++ b/tests/sources/tracking/simple_fdopen.py @@ -3,7 +3,6 @@ from pgfutils import _file_tracker, save, setup_figure - setup_figure(width=1, height=1) import base64 @@ -12,7 +11,6 @@ from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 201) s = np.sin(2 * np.pi * 0.5 * t) diff --git a/tests/sources/tracking/simple_nonbinary.py b/tests/sources/tracking/simple_nonbinary.py index 33fce00..5809590 100644 --- a/tests/sources/tracking/simple_nonbinary.py +++ b/tests/sources/tracking/simple_nonbinary.py @@ -3,13 +3,11 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 201) s = np.sin(2 * np.pi * 0.5 * t) diff --git a/tests/sources/tracking/simple_nonfile.py b/tests/sources/tracking/simple_nonfile.py index 2c00e62..d43a0ed 100644 --- a/tests/sources/tracking/simple_nonfile.py +++ b/tests/sources/tracking/simple_nonfile.py @@ -3,7 +3,6 @@ from pgfutils import _file_tracker, save, setup_figure - setup_figure(width=1, height=1) import base64 @@ -12,7 +11,6 @@ from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 201) s = np.sin(2 * np.pi * 0.5 * t) diff --git a/tests/sources/tracking/simple_nonproject.py b/tests/sources/tracking/simple_nonproject.py index bad49a6..4160379 100644 --- a/tests/sources/tracking/simple_nonproject.py +++ b/tests/sources/tracking/simple_nonproject.py @@ -3,7 +3,6 @@ from pgfutils import save, setup_figure - setup_figure(width=1, height=1) import base64 @@ -13,7 +12,6 @@ from matplotlib import pyplot as plt import numpy as np - t = np.linspace(0, 10, 201) s = np.sin(2 * np.pi * 0.5 * t) diff --git a/tests/test_config.py b/tests/test_config.py index 6861257..909824b 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -8,7 +8,6 @@ from pgfutils import DimensionError, _config, _config_reset - base = Path(__file__).parent @@ -31,9 +30,9 @@ def test_cfg_rcparams(self): """Config parser allows rcParams in config file...""" _config_reset() _config.read(base / "sources" / "extra_rcparams.cfg") - assert not _config["rcParams"].getboolean( - "ytick.left" - ), "ytick.left is incorrect" + assert not _config["rcParams"].getboolean("ytick.left"), ( + "ytick.left is incorrect" + ) assert _config["rcParams"].getboolean("ytick.right"), "ytick.right is incorrect" def test_cfg_unknown_rcparams(self): diff --git a/tests/test_data.py b/tests/test_data.py index 24309f9..e8a5ee6 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -5,7 +5,6 @@ from pgfutils import PgfutilsParser, _config, _config_reset - base_dir = Path(__file__).parent.parent.resolve() share_dir = base_dir / "data" / "share" / "matplotlib-pgfutils" diff --git a/tests/test_environment.py b/tests/test_environment.py index f0e53e6..64bbb6e 100644 --- a/tests/test_environment.py +++ b/tests/test_environment.py @@ -5,7 +5,6 @@ from .utils import build_pypgf - srcdir = Path(__file__).parent.resolve() / "sources" / "environment" @@ -31,6 +30,6 @@ def test_environment_invalid(): """Check invalid environment variable in configuration is rejected...""" with build_pypgf(srcdir / "invalid", "basic.py") as res: assert res.returncode != 0, "Configuration not rejected." - assert ( - "Environment variables should be in the form" in res.stderr - ), "Incorrect message." + assert "Environment variables should be in the form" in res.stderr, ( + "Incorrect message." + ) diff --git a/tests/test_external.py b/tests/test_external.py index 00261cd..8e8554e 100644 --- a/tests/test_external.py +++ b/tests/test_external.py @@ -7,7 +7,6 @@ from .utils import build_pypgf - srcdir = Path(__file__).parent / "sources" / "external" @@ -16,9 +15,9 @@ def test_cartopy(): pytest.importorskip("cartopy", reason="cartopy not available for testing") with build_pypgf(srcdir, "cartopy_figure.py") as res: - assert ( - res.returncode == 0 - ), f"{srcdir / 'cartopy_figure.py'} could not be built." + assert res.returncode == 0, ( + f"{srcdir / 'cartopy_figure.py'} could not be built." + ) def test_seaborn(): @@ -30,6 +29,6 @@ def test_seaborn(): # Due to an upstream Matplotlib bug. if "'NoneType' object has no attribute 'write'" in res.stderr: pytest.xfail("https://github.com/mwaskom/seaborn/issues/2343") - assert ( - res.returncode == 0 - ), f"{srcdir / 'seaborn_figure.py'} could not be built." + assert res.returncode == 0, ( + f"{srcdir / 'seaborn_figure.py'} could not be built." + ) diff --git a/tests/test_fonts.py b/tests/test_fonts.py index 87d0ac8..2c059d7 100644 --- a/tests/test_fonts.py +++ b/tests/test_fonts.py @@ -5,7 +5,6 @@ from .utils import build_pypgf - srcdir = Path(__file__).parent.resolve() / "sources" / "fonts" @@ -18,6 +17,6 @@ def test_custom_font(): def test_custom_font_kwargs(): """Test figure using a custom font specified through kwargs...""" with build_pypgf(srcdir / "noconfig", "custom_font.py") as res: - assert ( - res.returncode == 0 - ), "Failed to build tests/sources/fonts/no_config/custom_font.py" + assert res.returncode == 0, ( + "Failed to build tests/sources/fonts/no_config/custom_font.py" + ) diff --git a/tests/test_misc.py b/tests/test_misc.py index d2f0de7..2f0e728 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -10,7 +10,6 @@ from .utils import build_pypgf - srcdir = Path(__file__).parent.parent diff --git a/tests/test_postprocessing.py b/tests/test_postprocessing.py index 69fc48a..1b03ae8 100644 --- a/tests/test_postprocessing.py +++ b/tests/test_postprocessing.py @@ -8,7 +8,6 @@ from .utils import build_pypgf, build_tex - srcdir = Path(__file__).parent / "sources" @@ -23,9 +22,9 @@ def test_fix_raster_paths(): assert res.returncode == 0, f"Building {dir / 'speckle.pypgf'} failed." with build_tex(dir, "document") as tex_res: - assert ( - tex_res.returncode == 0 - ), "Building tests/sources/fix_raster_paths/document.pdf failed." + assert tex_res.returncode == 0, ( + "Building tests/sources/fix_raster_paths/document.pdf failed." + ) def test_tracking_fix_raster_paths(): @@ -60,14 +59,14 @@ def test_tikzpicture(): assert res.returncode == 0, f"Building {dir / 'square.pypgf'} failed." with build_tex(dir, "document_pgf") as tex_res: - assert ( - tex_res.returncode != 0 - ), "Document should have failed to built without the tikz package." + assert tex_res.returncode != 0, ( + "Document should have failed to built without the tikz package." + ) with build_tex(dir, "document_tikz") as tex_res: - assert ( - tex_res.returncode == 0 - ), "Document failed to build with the tikz package." + assert tex_res.returncode == 0, ( + "Document failed to build with the tikz package." + ) def test_legend_parameters(): diff --git a/tests/test_pythonpath.py b/tests/test_pythonpath.py index 30d3716..6a79b65 100644 --- a/tests/test_pythonpath.py +++ b/tests/test_pythonpath.py @@ -5,13 +5,12 @@ from .utils import build_pypgf - srcdir = Path(__file__).parent / "sources" / "pythonpath" def test_python_path(): """Check sys.path can be modified...""" with build_pypgf(srcdir, "using_custom_lib.py") as res: - assert ( - res.returncode == 0 - ), f"{srcdir / 'using_custom_lib.py'} could not be built." + assert res.returncode == 0, ( + f"{srcdir / 'using_custom_lib.py'} could not be built." + ) diff --git a/tests/test_setup_figure.py b/tests/test_setup_figure.py index a6d94af..be2f08e 100644 --- a/tests/test_setup_figure.py +++ b/tests/test_setup_figure.py @@ -11,7 +11,6 @@ from .utils import build_pypgf, in_directory - base = Path(__file__).parent.resolve() @@ -144,9 +143,9 @@ def get_fill_color(fn): # Check the default (pgfutils.cfg) fill color is in use. with build_pypgf(dir, "default.py") as res: assert res.returncode == 0, f"Failed to run {dir / 'default.py'}." - assert get_fill_color(dir / "default.pypgf") == approx( - (0, 0, 1) - ), "Default background fill should be blue, (0, 0, 1)." + assert get_fill_color(dir / "default.pypgf") == approx((0, 0, 1)), ( + "Default background fill should be blue, (0, 0, 1)." + ) # And now check we can override this using kwargs. with build_pypgf(dir, "overridden.py") as res: diff --git a/tests/test_tracking.py b/tests/test_tracking.py index 13eef8e..ad0653b 100644 --- a/tests/test_tracking.py +++ b/tests/test_tracking.py @@ -10,7 +10,6 @@ from .utils import build_pypgf - srcdir = Path(__file__).parent / "sources" / "tracking" @@ -307,9 +306,9 @@ def test_ignore_non_image_binary(self): # Run the script. env = {"PGFUTILS_TRACK_FILES": "1"} with build_pypgf(srcdir, "simple_binary_nonimage.py", env) as res: - assert ( - res.returncode == 0 - ), f"Running {srcdir / 'simple_binary_nonimage.py'} failed." + assert res.returncode == 0, ( + f"Running {srcdir / 'simple_binary_nonimage.py'} failed." + ) npfn = srcdir / "test.npy" assert npfn.exists(), "Test output not written." @@ -321,9 +320,9 @@ def test_ignore_non_binary(self): # Run the script. env = {"PGFUTILS_TRACK_FILES": "1"} with build_pypgf(srcdir, "simple_nonbinary.py", env) as res: - assert ( - res.returncode == 0 - ), f"Running {srcdir / 'simple_nonbinary.py'} failed." + assert res.returncode == 0, ( + f"Running {srcdir / 'simple_nonbinary.py'} failed." + ) txtfn = srcdir / "test.txt" assert txtfn.exists(), "Test output not written." @@ -334,9 +333,9 @@ def test_nonfile_opener(self): """File tracking ignores openers that don't return file objects...""" env = {"PGFUTILS_TRACK_FILES": "1"} with build_pypgf(srcdir, "simple_nonfile.py", env) as res: - assert ( - res.returncode == 0 - ), f"Running {srcdir / 'simple_nonfile.py'} failed." + assert res.returncode == 0, ( + f"Running {srcdir / 'simple_nonfile.py'} failed." + ) pngfn = srcdir / "test_nonfile.png" assert pngfn.exists(), "Test output not written." @@ -358,9 +357,9 @@ def test_nonproject(self): """File tracking ignores files written outside top-level directory...""" env = {"PGFUTILS_TRACK_FILES": "1"} with build_pypgf(srcdir, "simple_nonproject.py", env) as res: - assert ( - res.returncode == 0 - ), f"Running {srcdir / 'simple_nonproject.py'} failed." + assert res.returncode == 0, ( + f"Running {srcdir / 'simple_nonproject.py'} failed." + ) pngfn = Path(tempfile.gettempdir()) / "test_nonproject.png" assert pngfn.exists(), "Test output not written." @@ -377,7 +376,7 @@ def test_manual_stdout(self): for script, expected in tests.items(): # Run the script and check it succeeded. with build_pypgf(srcdir, script, env) as res: - assert res.returncode == 0, f"Running {srcdir/script} failed," + assert res.returncode == 0, f"Running {srcdir / script} failed," # Check the output files are correct. actual = set(res.stdout.strip().splitlines()) @@ -393,7 +392,7 @@ def test_manual_stderr(self): for script, expected in tests.items(): # Run the script and check it succeeded. with build_pypgf(srcdir, script, env) as res: - assert res.returncode == 0, f"Running {srcdir/script} failed," + assert res.returncode == 0, f"Running {srcdir / script} failed," # Check the output files are correct. actual = set(res.stderr.strip().splitlines()) @@ -410,7 +409,7 @@ def test_manual_file(self): for script, expected in tests.items(): # Run the script and check it succeeded. with build_pypgf(srcdir, script, env) as res: - assert res.returncode == 0, f"Running {srcdir/script} failed," + assert res.returncode == 0, f"Running {srcdir / script} failed," # Check the expected dependencies are reported. with open(tfn, "r") as f: @@ -436,9 +435,9 @@ def test_netcdf4_setup(self): env = {"PGFUTILS_TRACK_FILES": "1"} with build_pypgf(srcdir, "netcdf4_in_setup.py", env) as res: - assert ( - res.returncode == 0 - ), f"Running {srcdir / 'netcdf4_in_setup.py'} failed." + assert res.returncode == 0, ( + f"Running {srcdir / 'netcdf4_in_setup.py'} failed." + ) actual = set(res.stdout.strip().splitlines()) expected = { "r:netcdf4/sine.nc", @@ -451,9 +450,9 @@ def test_netcdf4_cfg(self): env = {"PGFUTILS_TRACK_FILES": "1"} with build_pypgf(srcdir / "netcdf4", "netcdf4.py", env) as res: - assert ( - res.returncode == 0 - ), f"Running {srcdir / 'netcdf4' / 'netcdf4.py'} failed." + assert res.returncode == 0, ( + f"Running {srcdir / 'netcdf4' / 'netcdf4.py'} failed." + ) actual = set(res.stdout.strip().splitlines()) expected = {"r:sine.nc", "r:pgfutils.cfg"} assert actual == expected @@ -477,9 +476,9 @@ def test_netcdf4_multi_explicit(self): env = {"PGFUTILS_TRACK_FILES": "1"} with build_pypgf(srcdir / "netcdf4", "netcdf4_multi_explicit.py", env) as res: - assert ( - res.returncode == 0 - ), f"Running {srcdir / 'netcdf4' / 'netcdf4_multi_explicit.py'} failed." + assert res.returncode == 0, ( + f"Running {srcdir / 'netcdf4' / 'netcdf4_multi_explicit.py'} failed." + ) actual = set(res.stdout.strip().splitlines()) expected = { "r:mftest0.nc", @@ -495,9 +494,9 @@ def test_netcdf4_multi_glob(self): env = {"PGFUTILS_TRACK_FILES": "1"} with build_pypgf(srcdir / "netcdf4", "netcdf4_multi_glob.py", env) as res: - assert ( - res.returncode == 0 - ), f"Running {srcdir / 'netcdf4' / 'netcdf4_multi_glob.py'} failed." + assert res.returncode == 0, ( + f"Running {srcdir / 'netcdf4' / 'netcdf4_multi_glob.py'} failed." + ) actual = set(res.stdout.strip().splitlines()) expected = { "r:mftest0.nc", @@ -533,9 +532,9 @@ def test_track_enabled_config(self): """File tracking can be enabled through configured environment variables...""" # Run the script. with build_pypgf(srcdir / "config_enabled", "config_enabled.py") as res: - assert ( - res.returncode == 0 - ), f"Running {srcdir / 'config_enabled' / 'config_enabled.py'} failed." + assert res.returncode == 0, ( + f"Running {srcdir / 'config_enabled' / 'config_enabled.py'} failed." + ) # Check the results are as expected. expected = {