Updated to use arguments module.

Removed py25 support and tox testing since try/except statements were >=2.5.
Try setup import from setuptools so python setup.py develop is available.
This commit is contained in:
barberj
2012-08-01 08:42:34 -04:00
parent 944af48ba5
commit e7db8c7e37
3 changed files with 14 additions and 7 deletions
+8 -4
View File
@@ -11,7 +11,14 @@ This module sets up the main interface for all of clint.
from __future__ import absolute_import
from . import arguments
try:
from collections import OrderedDict
except ImportError:
from .packages.ordereddict import OrderedDict
import collections
collections.OrderedDict = OrderedDict
from args import *
from . import textui
from . import utils
from .pipes import piped_in
@@ -25,6 +32,3 @@ __author__ = 'Kenneth Reitz'
__license__ = 'ISC'
__copyright__ = 'Copyright 2012 Kenneth Reitz'
__docformat__ = 'restructuredtext'
args = arguments.Args()
+4 -2
View File
@@ -4,7 +4,10 @@
import os
import sys
from distutils.core import setup
try:
from setuptools import setup
except ImportError:
from distutils.core import setup
import clint
@@ -48,7 +51,6 @@ setup(
'License :: OSI Approved :: ISC License (ISCL)',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
+2 -1
View File
@@ -1,9 +1,10 @@
[tox]
envlist = py25,py26,py27,py3
envlist = py26,py27,py3
[testenv]
commands=py.test --junitxml=junit-{envname}.xml
deps = pytest
args
[testenv:pypy]
basepython=/usr/bin/pypy-c