Merge pull request #66 from Ichimonji10/setup

Use setuptools for packaging, lint `setup.py`
omaciel · Jan 12, 2015 · 3ca13df · 3ca13df
2 parents ef20458 + a741b94
commit 3ca13df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/makefile b/makefile
@@ -20,8 +20,8 @@ docs-html:
 
 lint:
 	flake8 .
-	pylint --reports=n --disable=I --ignore-imports=y fauxfactory docs/conf.py
-# pylint should also lint setup.py and the tests/ directory.
+	pylint --reports=n --disable=I --ignore-imports=y fauxfactory docs/conf.py setup.py
+# pylint should also lint the tests/ directory.
 
 test:
 	python $(unittest-args)

diff --git a/setup.py b/setup.py
@@ -1,5 +1,7 @@
 """A setuptools-based script for installing FauxFactory."""
-from distutils.core import setup
+# setuptools is preferred over distutils. See:
+# https://packaging.python.org/en/latest/current.html#packaging-tool-recommendations
+from setuptools import find_packages, setup
 import os
 
 
@@ -20,7 +22,7 @@ def read(*paths):
     author='Og Maciel',
     author_email='omaciel@ogmaciel.com',
     url='https://github.com/omaciel/fauxfactory',
-    packages=['fauxfactory'],
+    packages=find_packages(),
     keywords='python automation data',
     license='Apache 2.0',
     classifiers=[