Merge pull request #431 from nschloe/fix-tests

Fix tests

Author: nschloe

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v2
       with:
         python-version: "3.x"
     - uses: actions/checkout@v2
@@ -25,7 +25,7 @@ jobs:
       matrix:
         python-version: [3.6, 3.7, 3.8]
     steps:
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - uses: actions/checkout@v2

Makefile

@@ -6,15 +6,11 @@ default:
 tag:
 	# Make sure we're on the master branch
 	@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "master" ]; then exit 1; fi
-	# @echo "Tagging v$(VERSION)..."
-	# git tag v$(VERSION)
-	# git push --tags
 	curl -H "Authorization: token `cat $(HOME)/.github-access-token`" -d '{"tag_name": "v$(VERSION)"}' https://api.github.com/repos/nschloe/tikzplotlib/releases
 
 upload:
 	@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "master" ]; then exit 1; fi
 	rm -f dist/*
-	# python3 setup.py sdist bdist_wheel
 	# https://stackoverflow.com/a/58756491/353337
 	python3 -m pep517.build --source --binary .
 	twine upload dist/*
@@ -26,10 +22,7 @@ clean:
 	@rm -rf *.egg-info/ build/ dist/ MANIFEST
 
 format:
-	isort -rc .
-	black .
-
-black:
+	isort .
 	black .
 
 lint:

test/helpers.py

@@ -45,7 +45,7 @@ def assert_equality(
     this_dir = os.path.dirname(os.path.abspath(__file__))
     with open(os.path.join(this_dir, filename), encoding="utf-8") as f:
         reference = f.read()
-    assert reference == code, _unidiff_output(code, reference)
+    assert reference == code, _unidiff_output(reference, code)
 
     if assert_compilation:
         plot()

test/test_annotate.py

@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
@@ -38,7 +37,6 @@ def plot():
 
 def test():
     assert_equality(plot, __file__[:-3] + "_reference.tex")
-    return
 
 
 if __name__ == "__main__":

test/test_axvline.py

@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 

test/test_barchart.py

@@ -5,7 +5,6 @@
 """
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 

test/test_barchart_errorbars.py

@@ -5,7 +5,6 @@
 """
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 

test/test_barchart_legend.py

@@ -9,7 +9,6 @@
 """
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
@@ -34,7 +33,6 @@ def plot():
 
 def test():
     assert_equality(plot, "test_barchart_legend_reference.tex")
-    return
 
 
 if __name__ == "__main__":

test/test_basic_sin.py

@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 

test/test_boxplot.py

@@ -6,7 +6,6 @@
 See: https://github.com/nschloe/tikzplotlib/pull/134
 """
 import matplotlib.pyplot as plt
-
 from helpers import assert_equality