From 995d9dea2f7d3c641ad2c409ab5cd4ba9d5f831f Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Sat, 30 Oct 2021 22:10:26 +0200 Subject: [PATCH] clean up setuptools usage --- doc/conf.py | 15 ++++----------- tox.ini | 1 + 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index e81e20b..24d0b05 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -15,11 +15,9 @@ import sys import os +from importlib.metadata import version as imp_version + on_rtd = os.getenv("READTHEDOCS") == "True" -if on_rtd: - import escpos -else: - from setuptools_scm import get_version # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -75,14 +73,9 @@ copyright = u"2016, Manuel F Martinez and others" # |version| and |release|, also used in various other places throughout the # built documents. # -if on_rtd: - # The full version, including alpha/beta/rc tags. - release = escpos.__version__ -else: - # locally setuptools_scm should work - release = get_version(root=root) +release = imp_version("python-escpos") # The short X.Y version. -version = ".".join(release.split(".")[:2]) # The short X.Y version. +version = ".".join(release.split(".")[:2]) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/tox.ini b/tox.ini index 4ab2be5..ea27473 100644 --- a/tox.ini +++ b/tox.ini @@ -31,6 +31,7 @@ deps = sphinx>=3.0.0 setuptools_scm python-barcode sphinxcontrib-spelling>=7.2.0 + sphinx_rtd_theme commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:flake8]