Merge pull request #392 from nschloe/modernize

setup.cfg, pyproject.toml

Author: nschloe

.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
       - image: circleci/python:3.7
     steps:
       - checkout
-      - run: pip3 install -U black flake8 --user
+      - run: pip install black flake8
       - run: black --check .
       - run: flake8 .
   build:
@@ -18,18 +18,13 @@ jobs:
       # <https://stackoverflow.com/a/44333806/353337>
       - run: DEBIAN_FRONTEND=noninteractive sudo apt install tzdata
       - run: sudo apt install -y texlive-latex-base texlive-latex-extra context
-      - run: pip3 install -U pytest pytest-cov excode --user
+      - run: pip install excode
       - checkout
       - run: excode README.md test/zzz_readme_test.py --filter python,test
-      - run: pip3 install -r test_requirements.txt --user
-      - run: pip3 install .[all] --user
-      - run: pip3 check
       # The actual test
-      - run:
-          command: pytest --cov tikzplotlib
-          working_directory: test/
-          environment:
-            MPLBACKEND: Agg
+      - run: |
+          pip install tox
+          tox
       # submit to codecov
       - run: bash <(curl -s https://codecov.io/bash)
 

.github/workflows/ci.yml

@@ -31,17 +31,13 @@ jobs:
     - uses: actions/checkout@v2
     - name: Install dependencies
       run: sudo apt-get install -y texlive-latex-base texlive-latex-extra context python3-tk
-    - name: Install package
-      run: |
-        pip install .
     - name: Extract tests from README
       run: |
         pip install excode
         excode README.md test/zzz_readme_test.py --filter python,test
-    - name: Test with pytest
+    - name: Test with tox
       run: |
-        pip install pytest pytest-cov
-        pip install -r test_requirements.txt
-        cd test/ && MPLBACKEND=Agg pytest --cov tikzplotlib
+        pip install tox
+        tox
     # - name: Submit to codecov
     #   run: bash <(curl -s https://codecov.io/bash)

Makefile

@@ -1,14 +1,14 @@
-VERSION=$(shell python3 -c "import tikzplotlib; print(tikzplotlib.__version__)")
+VERSION=$(shell python3 -c "from configparser import ConfigParser; p = ConfigParser(); p.read('setup.cfg'); print(p['metadata']['version'])")
 
 default:
 	@echo "\"make publish\"?"
 
 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
+	# @echo "Tagging v$(VERSION)..."
+	# git tag v$(VERSION)
+	# git push --tags
 	curl -H "Authorization: token `cat $(HOME)/.github-access-token`" -d '{"tag_name": "$(VERSION)"}' https://api.github.com/repos/nschloe/tikzplotlib/releases
 
 upload: setup.py

pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=42", "wheel"]
+build-backend = "setuptools.build_meta"

setup.cfg

@@ -0,0 +1,38 @@
+[metadata]
+name = tikzplotlib
+version = 0.9.1
+author = Nico Schlömer
+email = [email protected]
+description = Convert matplotlib figures into TikZ/PGFPlots
+url = https://github.com/nschloe/tikzplotlib
+project_urls =
+    Code=https://github.com/nschloe/tikzplotlib
+    Issues=https://github.com/nschloe/tikzplotlib/issues
+long_description = file: README.md
+long_description_content_type = text/markdown
+license = MIT
+platforms = any
+classifiers =
+    Development Status :: 4 - Beta
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Topic :: Multimedia :: Graphics :: Graphics Conversion
+    Topic :: Scientific/Engineering :: Visualization
+
+[options]
+packages = find:
+# importlib_metadata can be removed when we support Python 3.8+ only
+install_requires =
+    importlib_metadata
+    matplotlib >= 1.4.0
+    numpy
+    Pillow
+python_requires = >=3.6
+setup_requires =
+    setuptools>=42
+    wheel

setup.py

@@ -1,36 +1,4 @@
-import os
+from setuptools import setup
 
-from setuptools import find_packages, setup
-
-# https://packaging.python.org/single_source_version/
-base_dir = os.path.abspath(os.path.dirname(__file__))
-about = {}
-with open(os.path.join(base_dir, "tikzplotlib", "__about__.py"), "rb") as f:
-    exec(f.read(), about)
-
-
-setup(
-    name="tikzplotlib",
-    version=about["__version__"],
-    packages=find_packages(),
-    url="https://github.com/nschloe/tikzplotlib",
-    author=about["__author__"],
-    author_email=about["__email__"],
-    install_requires=["matplotlib >= 1.4.0", "numpy", "Pillow"],
-    description="Convert matplotlib figures into TikZ/PGFPlots",
-    long_description=open("README.md").read(),
-    long_description_content_type="text/markdown",
-    license=about["__license__"],
-    python_requires=">=3.6",
-    classifiers=[
-        about["__status__"],
-        about["__license__"],
-        "Operating System :: OS Independent",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Topic :: Multimedia :: Graphics :: Graphics Conversion",
-        "Topic :: Scientific/Engineering :: Visualization",
-    ],
-)
+if __name__ == "__main__":
+    setup()

test_requirements.txt

@@ -1,6 +1,10 @@
-__author__ = "Nico Schlömer"
-__email__ = "[email protected]"
-__copyright__ = f"Copyright (c) 2010-2020, {__author__} <{__email__}>"
-__license__ = "License :: OSI Approved :: MIT License"
-__version__ = "0.9.1"
-__status__ = "Development Status :: 5 - Production/Stable"
+try:
+    # Python 3.8
+    from importlib import metadata
+except ImportError:
+    import importlib_metadata as metadata
+
+try:
+    __version__ = metadata.version("tikzplotlib")
+except Exception:
+    __version__ = "unknown"

tikzplotlib/__about__.py

@@ -1,23 +1,11 @@
 """Script to convert Matplotlib generated figures into TikZ/PGFPlots figures.
 """
-from .__about__ import (
-    __author__,
-    __copyright__,
-    __email__,
-    __license__,
-    __status__,
-    __version__,
-)
+from .__about__ import __version__
 from ._cleanfigure import clean_figure
 from ._save import Flavors, get_tikz_code, save
 
 __all__ = [
-    "__author__",
-    "__email__",
-    "__copyright__",
-    "__license__",
     "__version__",
-    "__status__",
     "get_tikz_code",
     "save",
     "clean_figure",

tikzplotlib/__init__.py

@@ -0,0 +1,11 @@
+[tox]
+envlist = py3
+isolated_build = True
+
+[testenv]
+deps =
+    pandas
+    pytest
+    pytest-cov
+commands =
+    pytest --cov {envsitepackagesdir}/tikzplotlib --cov-report xml --cov-report term