Merge pull request #487 from nschloe/modernize

Modernize

Author: nschloe

.github/workflows/ci.yml

@@ -40,6 +40,6 @@ jobs:
     - name: Test with tox
       run: |
         pip install tox
-        tox
+        tox -- --cov tikzplotlib --cov-report xml --cov-report term
     - uses: codecov/codecov-action@v1
-      if: ${{ matrix.python-version == '3.8' }}
+      if: ${{ matrix.python-version == '3.9' }}

.gitignore

@@ -9,3 +9,4 @@ build/
 .cache/
 *.egg-info/
 .pytest_cache/
+.tox/

Makefile

@@ -18,11 +18,12 @@ publish: tag upload
 
 clean:
 	@find . | grep -E "(__pycache__|\.pyc|\.pyo$\)" | xargs rm -rf
-	@rm -rf *.egg-info/ build/ dist/ MANIFEST
+	@rm -rf src/*.egg-info/ build/ dist/ MANIFEST .tox/ .cache/ .pytest_cache/ .coverage
 
 format:
 	isort .
 	black .
+	blacken-docs README.md
 
 lint:
 	black --check .

README.md

@@ -32,10 +32,15 @@ keywords =
     graphics
 
 [options]
+package_dir =
+    =src
 packages = find:
 install_requires =
     importlib_metadata;python_version<"3.8"
     matplotlib >= 1.4.0
     numpy
     Pillow
 python_requires = >=3.6
+
+[options.packages.find]
+where=src

setup.cfg

@@ -439,25 +439,25 @@ def _update_line_data(linehandle, data):
 
 
 def _split_data_2D(data):
-    """ data --> xData, yData """
+    """data --> xData, yData"""
     xData, yData = np.split(data, 2, axis=1)
     return xData.reshape((-1,)), yData.reshape((-1,))
 
 
 def _stack_data_2D(xData, yData):
-    """ xData, yData --> data """
+    """xData, yData --> data"""
     data = np.stack([xData, yData], axis=1)
     return data
 
 
 def _split_data_3D(data):
-    """ data --> xData, yData, zData """
+    """data --> xData, yData, zData"""
     xData, yData, zData = np.split(data, 3, axis=1)
     return xData.reshape((-1,)), yData.reshape((-1,)), zData.reshape((-1,))
 
 
 def _stack_data_3D(xData, yData, zData):
-    """ xData, yData, zData --> data """
+    """xData, yData, zData --> data"""
     data = np.stack([xData, yData, zData], axis=1)
     return data
 
@@ -653,7 +653,7 @@ def _isempty(array):
 
 
 def _line_has_lines(linehandle):
-    """ check if linestyle is not None and linewidth is larger than 0 """
+    """check if linestyle is not None and linewidth is larger than 0"""
     hasLines = (linehandle.get_linestyle() is not None) and (
         linehandle.get_linewidth() > 0.0
     )