Merge pull request #134 from nschloe/matplotx

dufte -> matplotx

Author: nschloe

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- python-version: ["3.7", "3.8", "3.9", "3.10-dev"]
+ python-version: ["3.7", "3.8", "3.9", "3.10"]
  steps:
  - uses: actions/setup-python@v2
  with:
@@ -34,4 +34,4 @@ jobs:
  pip install tox
  tox -- --cov perfplot --cov-report xml --cov-report term
  - uses: codecov/codecov-action@v1
- if: ${{ matrix.python-version == '3.9' }}
+ if: ${{ matrix.python-version == '3.10' }}

README.md

@@ -5,7 +5,8 @@
 [![PyPi Version](https://img.shields.io/pypi/v/perfplot.svg?style=flat-square)](https://pypi.org/project/perfplot)
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/perfplot.svg?style=flat-square)](https://pypi.org/pypi/perfplot/)
 [![GitHub stars](https://img.shields.io/github/stars/nschloe/perfplot.svg?style=flat-square&logo=github&label=Stars&logoColor=white)](https://github.com/nschloe/perfplot)
-[![PyPi downloads](https://img.shields.io/pypi/dm/perfplot.svg?style=flat-square)](https://pypistats.org/packages/perfplot)
+[![Downloads](https://pepy.tech/badge/perfplot/month)](https://pepy.tech/project/perfplot)
+<!--[![PyPi downloads](https://img.shields.io/pypi/dm/perfplot.svg?style=flat-square)](https://pypistats.org/packages/perfplot)-->
 
 [![Discord](https://img.shields.io/static/v1?logo=discord&label=chat&message=on%20discord&color=7289da&style=flat-square)](https://discord.gg/hnTJ5MRX2Y)
 

justfile

@@ -7,7 +7,7 @@ default:
 
 tag:
 @if [ "$(git rev-parse --abbrev-ref HEAD)" != "main" ]; then exit 1; fi
-curl -H "Authorization: token `cat ~/.github-access-token`" -d '{"tag_name": "{{version}}"}' https://api.github.com/repos/nschloe/{{name}}/releases
+curl -H "Authorization: token `cat ~/.github-access-token`" -d '{"tag_name": "v{{version}}"}' https://api.github.com/repos/nschloe/{{name}}/releases
 
 upload: clean
 @if [ "$(git rev-parse --abbrev-ref HEAD)" != "main" ]; then exit 1; fi

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = perfplot
-version = 0.9.11
+version = 0.9.12
 author = Nico Schlömer
 author_email = nico.schloemer@gmail.com
 description = Performance plots for Python code snippets
@@ -34,8 +34,8 @@ package_dir =
  =src
 packages = find:
 install_requires =
- dufte >= 0.2.20
  matplotlib
+ matplotx
  numpy
  rich
  typing_extensions;python_version<"3.8"

src/perfplot/_main.py

@@ -11,9 +11,9 @@
 except ImportError:
  from typing_extensions import Literal
 
-import dufte
 import matplotlib.animation as animation
 import matplotlib.pyplot as plt
+import matplotx
 import numpy as np
 import numpy.typing as npt
 from rich.console import Console
@@ -22,12 +22,12 @@
 
 from ._exceptions import PerfplotError
 
-plt.style.use(dufte.style)
+plt.style.use(matplotx.styles.dufte)
 
 # Orders of Magnitude for SI time units in {unit: magnitude} format
 si_time = {
  "s": 1e0, # second
- "ms": 1e-3, # milisecond
+ "ms": 1e-3, # millisecond
  "us": 1e-6, # microsecond
  "ns": 1e-9, # nanosecond
 }
@@ -37,7 +37,7 @@ def _auto_time_unit(time_s: float) -> str:
  """Automatically obtains a readable unit at which to plot :py:attr:`timings` of the
  benchmarking process. This is accomplished by converting the minimum measured
  execution time into SI second and iterating over the plausible SI time units (s, ms,
- us, ns) to find the first one whos magnitude is smaller than the minimum execution
+ us, ns) to find the first one whose magnitude is smaller than the minimum execution
  time.
 
  :rtype: str
@@ -122,7 +122,7 @@ def plot( # noqa: C901
  for t, label in zip(scaled_timings, self.labels):
  plotfun(self.n_range, t, label=label)
 
- dufte.ylabel(ylabel)
+ matplotx.ylabel_top(ylabel)
  else:
  if relative_to is None:
  flops = self.flop / self.timings_s
@@ -139,7 +139,7 @@ def plot( # noqa: C901
  if relative_to is not None and not logy:
  plt.gca().set_ylim(bottom=0)
 
- dufte.legend()
+ matplotx.line_labels()
 
  def show(self, **kwargs):
  self.plot(**kwargs)
@@ -318,8 +318,8 @@ def _b(data, kernel: Callable, repeat: int):
  number = int(factor * number) + 1
 
  assert tm is not None
- # Only return the minimum time; everthing else just measures how slow the system can
- # go.
+ # Only return the minimum time; everything else just measures how slow the system
+ # can go.
  return np.min(tm)
 
 
@@ -385,7 +385,7 @@ def init():
  lines.append(plotfun([], [], label=label)[0])
 
  ax.legend()
- dufte.ylabel("Runtime [s]")
+ matplotx.ylabel_top("Runtime [s]")
  if xlabel:
  ax.set_xlabel(xlabel)
  xdata = []

tests/test_perfplot.py

@@ -66,9 +66,9 @@ def test_no_labels():
  [
  # Dealing w/ edge-case when timing < nanosecond
  # ("ns", 0.125, "auto"),
- # Almost a milisecond
+ # Almost a millisecond
  ("us", 9.999e5, "auto"),
- # Equal exactly to a milisecond
+ # Equal exactly to a millisecond
  ("ms", 1e6, "auto"),
  # Over 1 second
  ("s", 1.5e9, "auto"),