setup improvements: set the universal flag to 1, and cleaned up the setup.py. Fixes #36

Author: Sylvain MARIE

setup.cfg

@@ -7,7 +7,7 @@
 # This flag says that the code is written to work on both Python 2 and Python
 # 3. If at all possible, it is good practice to do this. If you cannot, you
 # will need to generate wheels for each Python version that you support.
-universal=0
+universal=1
 
 [metadata]
 description-file = README.md

setup.py

@@ -3,52 +3,41 @@
 https://packaging.python.org/en/latest/distributing.html
 https://github.com/pypa/sampleproject
 """
-from six import raise_from
 from os import path
-
+import pkg_resources
 from setuptools import setup, find_packages
 
-here = path.abspath(path.dirname(__file__))
+pkg_resources.require("setuptools>=39.2")
+pkg_resources.require("setuptools_scm")
+
+from setuptools_scm import get_version  # noqa: E402
 
 # *************** Dependencies *********
 INSTALL_REQUIRES = ['decopatch', 'funcsigs;python_version<"3.3"', 'makefun']
 DEPENDENCY_LINKS = []
-SETUP_REQUIRES = ['pytest-runner', 'setuptools_scm', 'pypandoc', 'pandoc']
-TESTS_REQUIRE = ['pytest', 'pytest-logging', 'PyContracts', 'enforce', 'pytypes', 'pyfields', 'valid8']
+SETUP_REQUIRES = ['pytest-runner', 'setuptools_scm']
+TESTS_REQUIRE = ['pytest', 'PyContracts', 'enforce', 'pytypes', 'pyfields', 'valid8']
 EXTRAS_REQUIRE = {'contracts': ['PyContracts'],
                   'enforce': ['enforce'],
                   'validate': ['valid8']}
 
-# simple check
-try:
-    from setuptools_scm import get_version
-except Exception as e:
-    raise_from(Exception('Required packages for setup not found. Please install `setuptools_scm`'), e)
-
 # ************** ID card *****************
 DISTNAME = 'autoclass'
 DESCRIPTION = 'Helps you write compact python classes'
 MAINTAINER = 'Sylvain MARIE'
 MAINTAINER_EMAIL = 'sylvain.marie@se.com'
 URL = 'https://github.com/smarie/python-autoclass'
+DOWNLOAD_URL = URL + '/tarball/' + get_version()
 LICENSE = 'BSD 3-Clause'
 LICENSE_LONG = 'License :: OSI Approved :: BSD License'
-
-version_for_download_url = get_version()
-DOWNLOAD_URL = URL + '/tarball/' + version_for_download_url
-
 KEYWORDS = 'auto code generator getter setter constructor autoarg autoprops decorator property properties fields ' \
            'attribute attr contract object class enforce valid boilerplate pep484 type-hints runtime-typechecking ' \
            'typechecking'
 
+here = path.abspath(path.dirname(__file__))
 with open(path.join(here, 'docs', 'long_description.md')) as f:
     LONG_DESCRIPTION = f.read()
 
-# ************* VERSION **************
-# --Get the Version number from VERSION file, see https://packaging.python.org/single_source_version/ option 4.
-# THIS IS DEPRECATED AS WE NOW USE GIT TO MANAGE VERSION
-# with open(path.join(here, 'VERSION')) as version_file:
-#    VERSION = version_file.read().strip()
 OBSOLETES = ['classtools_autocode']
 
 setup(