From 2dd34c19fdacc7d34665b0a7eb07cee065da36a8 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Thu, 9 Jul 2009 09:38:19 -0400 Subject: Setup.py should be linted too --- Makefile | 4 ++-- setup.py | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 59681065..fa887e64 100644 --- a/Makefile +++ b/Makefile @@ -34,8 +34,8 @@ LINTABLE_TESTS = \ test/test_templite.py lint: - -python -x /Python25/Scripts/pylint.bat --rcfile=.pylintrc coverage $(LINTABLE_TESTS) - python /Python25/Lib/tabnanny.py coverage test + -python -x /Python25/Scripts/pylint.bat --rcfile=.pylintrc coverage $(LINTABLE_TESTS) setup.py + python /Python25/Lib/tabnanny.py coverage test setup.py python checkeol.py testready: $(TEST_ZIP) devinst diff --git a/setup.py b/setup.py index 212dc9f6..af0412b8 100644 --- a/setup.py +++ b/setup.py @@ -25,10 +25,11 @@ Topic :: Software Development :: Testing import sys if sys.hexversion < 0x03000000: + # In Py 2.x, use setuptools. from ez_setup import use_setuptools use_setuptools() - from setuptools import setup, find_packages + from setuptools import setup from distutils.core import Extension setuptools_args = dict( @@ -38,9 +39,11 @@ if sys.hexversion < 0x03000000: ] }, - zip_safe = False, # we need to get HTML assets from our htmlfiles dir. + # We need to get HTML assets from our htmlfiles dir. + zip_safe = False, ) else: + # No setuptools yet for Py 3.x, so do without. from distutils.core import setup, Extension setuptools_args = {} -- cgit v1.2.1