Clean up and update setup.py

Author: Hugo Osvaldo Barrera

.gitignore

@@ -15,5 +15,4 @@ dist/*
 tests/*
 docs/_build/*
 MANIFEST
-
-
+barcode/version.py

barcode/__init__.py

@@ -11,35 +11,14 @@
 installed, the barcodes can also be rendered as images (all
 formats supported by PIL).
 """
-__docformat__ = 'restructuredtext en'
-
-__project__ = 'python-barcode'
-__author__ = 'Thorsten Weimann'
-__copyright__ = '2010-2016, ' + __author__
-__author_email__ = '[email protected]'
-__description__ = ('Create standard barcodes with Python. No external '
-                   'modules needed (optional PIL support included).')
-__version__ = '0.8'
-__release__ = '{version}'.format(version=__version__)
-__license__ = 'MIT'
-__url__ = 'https://bitbucket.org/whitie/python-barcode/'
-__classifiers__ = [
-    'Development Status :: 5 - Production/Stable',
-    'Environment :: Console',
-    'Intended Audience :: Developers',
-    'License :: OSI Approved :: MIT License',
-    'Operating System :: OS Independent',
-    'Programming Language :: Python',
-    'Topic :: Software Development :: Libraries :: Python Modules',
-    'Topic :: Multimedia :: Graphics',
-]
 
 from barcode.errors import BarcodeNotFoundError
 from barcode.codex import Code39, PZN, Code128
 from barcode.ean import EAN8, EAN13, EAN14, JAN
 from barcode.isxn import ISBN10, ISBN13, ISSN
 from barcode.upc import UPCA
 from barcode.itf import ITF
+from barcode.version import version  # noqa: F401
 
 try:
     _strbase = basestring  # lint:ok

barcode/writer.py

@@ -6,7 +6,7 @@
 import os
 import xml.dom
 
-from barcode import __release__
+from barcode import version
 
 try:
     import Image
@@ -49,7 +49,7 @@ def create_svg_object():
 
 
 SIZE = '{0:.3f}mm'
-COMMENT = 'Autogenerated with pyBarcode {0}'.format(__release__)
+COMMENT = 'Autogenerated with python-barcode {0}'.format(version)
 PATH = os.path.dirname(os.path.abspath(__file__))
 FONT = os.path.join(PATH, 'DejaVuSansMono.ttf')
 

docs/conf.py

@@ -18,7 +18,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.append(os.path.abspath('.'))
 sys.path.append(os.path.abspath('..'))
-import barcode
+from barcode import version
 LOGO = os.path.join('images', 'pybarcode_small.png')
 
 # -- General configuration -----------------------------------------------------
@@ -41,17 +41,17 @@
 master_doc = 'index'
 
 # General information about the project.
-project = barcode.__project__
-copyright = barcode.__copyright__
+project = 'python-barcode'
+copyright = '2010-2017 Thorsten Weimann et al'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = barcode.__version__
+version = version
 # The full version, including alpha/beta/rc tags.
-release = barcode.__release__
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -1,40 +1,43 @@
 # -*- coding: utf-8 -*-
 
-import sys
-from os.path import join, dirname
-
-import barcode as pkg
-
-from setuptools import setup, find_packages
-
-
-# Avoid name clashes if the user has Python 2 and 3 installed
-console_script = 'pybarcode{0}'.format(sys.version_info[0])
-try:
-    import argparse  # lint:ok
-    required = []
-except ImportError:
-    required = ['argparse']
-
-with open(join(dirname(__file__), 'README.rst')) as fp:
-    long_desc = fp.read()
+from pathlib import Path
+from setuptools import find_packages, setup
 
 
 setup(
-    name=pkg.__project__,
-    version=pkg.__release__,
+    name='python-barcode',
     packages=find_packages(),
-    url=pkg.__url__,
-    license=pkg.__license__,
-    author=pkg.__author__,
-    author_email=pkg.__author_email__,
-    description=pkg.__description__,
-    long_description=long_desc,
-    classifiers=pkg.__classifiers__,
+    url="https://github.com/WhyNotHugo/python-barcode",
+    license='MIT',
+    author='Thorsten Weimann et al',
+    author_email='[email protected]',
+    description=(
+        'Create standard barcodes with Python. No external modules needed '
+        '(optional PIL support included).'
+    ),
+    long_description=Path('README.rst').read_text(),
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Topic :: Multimedia :: Graphics',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
     entry_points={
-        'console_scripts':
-            ['{0} = barcode.pybarcode:main'.format(console_script)],
-        },
-    install_requires=required,
+        'console_scripts': [
+            'python-barcode = barcode.pybarcode:main',
+        ],
+    },
+    use_scm_version={
+        'version_scheme': 'post-release',
+        'write_to': 'barcode/version.py',
+    },
+    setup_requires=['setuptools_scm'],
     include_package_data=True,
 )

test.py

@@ -15,7 +15,7 @@
 import sys
 import unittest
 
-from barcode import get_barcode, get_barcode_class, __version__
+from barcode import get_barcode, get_barcode_class, version
 try:
     from barcode.writer import ImageWriter
 except ImportError:
@@ -102,7 +102,7 @@ def test():
     # Save htmlfile with all objects
     with codecs.open(HTMLFILE, 'w', encoding='utf-8') as f:
         obj = '\n'.join(objects)
-        f.write(HTML.format(version=__version__, body=obj))
+        f.write(HTML.format(version=version, body=obj))
 
 
 class TestBarcodeBuilds(unittest.TestCase):