Merge pull request #37 from nschloe/distance-label-lines

Distance label-lines

.github/workflows/ci.yml

@@ -12,18 +12,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-python@v2
-      with:
-        python-version: "3.x"
-    - uses: actions/checkout@v2
-    - name: Lint with flake8
-      run: |
-        pip install flake8
-        flake8 .
-    - name: Lint with black
-      run: |
-        pip install black
-        black --check .
+      - name: Check out repo
+        uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+      - name: Run pre-commit
+        uses: pre-commit/[email protected]
 
   build:
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -0,0 +1,16 @@
+repos:
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.9.1
+    hooks:
+      - id: isort
+
+  - repo: https://github.com/python/black
+    rev: 21.6b0
+    hooks:
+      - id: black
+        language_version: python3
+
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.2
+    hooks:
+      - id: flake8

README.md

@@ -4,6 +4,7 @@
 </p>
 
 [![PyPi Version](https://img.shields.io/pypi/v/dufte.svg?style=flat-square)](https://pypi.org/project/dufte)
+[![Anaconda Cloud](https://anaconda.org/conda-forge/dufte/badges/version.svg?=style=flat-square)](https://anaconda.org/conda-forge/dufte/)
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/dufte.svg?style=flat-square)](https://pypi.org/pypi/dufte/)
 [![GitHub stars](https://img.shields.io/github/stars/nschloe/dufte.svg?logo=github&label=Stars&logoColor=white&style=flat-square)](https://github.com/nschloe/dufte)
 [![PyPi downloads](https://img.shields.io/pypi/dm/dufte.svg?style=flat-square)](https://pypistats.org/packages/dufte)

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = dufte
-version = 0.2.20
+version = 0.2.21
 author = Nico Schlömer
 author_email = [email protected]
 description = Clean matplotlib plots
@@ -14,6 +14,7 @@ long_description_content_type = text/markdown
 license = GPL-3.0-or-later
 classifiers =
     Development Status :: 4 - Beta
+    Framework :: Matplotlib
     License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
     Operating System :: OS Independent
     Programming Language :: Python

src/dufte/main.py

@@ -175,7 +175,10 @@ def legend(ax=None, min_label_distance="auto", alpha: float = 1.0):
     xlim0, xlim1 = ax.get_xlim()
     for label, t, color in zip(labels, targets, colors):
         plt.text(
-            xlim1 + (xlim1 - xlim0) / 100,
+            # Leave the labels some space to breathe. If they are too close to the
+            # lines, they can get visually merged.
+            # <https://twitter.com/EdwardTufte/status/1416035189843714050>
+            xlim1 + (xlim1 - xlim0) / 100 * 3,
             t,
             label,
             verticalalignment="center",

tests/test_plot.py

@@ -20,8 +20,8 @@ def test_plot(filename, light: bool, noise, offsets):
         y0 += noise * np.random.rand(len(y0))
         plt.plot(x0, y0, label=label)
 
-    plt.xlabel("x label")
-    plt.ylabel("y label")
+    plt.xlabel("distance [m]")
+    dufte.ylabel("voltage [V]")
     # plt.title("title")
     dufte.legend()