Changed location of the testing-related requirements

Thanks @movermeyer
This commit is contained in:
Hernan Grecco
2016-08-03 21:57:23 -03:00
parent 65004cb4f0
commit ecc911089f
9 changed files with 20 additions and 17 deletions

View File

@@ -51,15 +51,6 @@ else:
long_type = long
if sys.version_info < (2, 7):
try:
import unittest2 as unittest
except ImportError:
raise Exception("Testing Pint in Python 2.6 requires package 'unittest2'")
else:
import unittest
try:
from collections import Chainmap
except ImportError:

View File

@@ -9,10 +9,11 @@ import sys
from contextlib import contextmanager
from pint.compat import ndarray, unittest, np
from pint.compat import ndarray, np
from pint import logger, UnitRegistry
from pint.quantity import _Quantity
from pint.testsuite.compat import unittest
from pint.testsuite.helpers import PintOutputChecker
from logging.handlers import BufferingHandler

View File

@@ -0,0 +1,9 @@
import sys
if sys.version_info < (2, 7):
try:
import unittest2 as unittest
except ImportError:
raise Exception("Testing Pint in Python 2.6 requires package 'unittest2'")
else:
import unittest

View File

@@ -7,7 +7,8 @@ import doctest
from distutils.version import StrictVersion
import re
from pint.compat import unittest, HAS_NUMPY, HAS_UNCERTAINTIES, NUMPY_VER, PYTHON3
from pint.compat import HAS_NUMPY, HAS_UNCERTAINTIES, NUMPY_VER, PYTHON3
from pint.testsuite.compat import unittest
def requires_numpy18():

View File

@@ -28,10 +28,7 @@
# def test_eval(self, input, expected_output):
# self.assertEqual(eval(input), expected_output)
try:
import unittest2 as unittest
except ImportError: # pragma: no cover
import unittest
from pint.testsuite.compat import unittest
from functools import wraps
import collections

View File

@@ -9,9 +9,10 @@ from pint import UnitRegistry
from pint.unit import UnitsContainer
from pint.util import ParserHelper
from pint.compat import np, unittest, long_type
from pint.compat import np, long_type
from pint.errors import UndefinedUnitError
from pint.testsuite import QuantityTestCase, helpers
from pint.testsuite.compat import unittest
class TestIssues(QuantityTestCase):

View File

@@ -8,6 +8,7 @@ import operator as op
from pint import DimensionalityError, set_application_registry
from pint.compat import np, unittest
from pint.testsuite import QuantityTestCase, helpers
from pint.testsuite.compat import unittest
from pint.testsuite.test_umath import TestUFuncs

View File

@@ -2,8 +2,9 @@
from __future__ import division, unicode_literals, print_function, absolute_import
from pint.compat import unittest, tokenizer
from pint.compat import tokenizer
from pint.pint_eval import build_eval_tree
from pint.testsuite.compat import unittest
class TestPintEval(unittest.TestCase):

View File

@@ -37,6 +37,7 @@ setup(
author_email='hernan.grecco@gmail.com',
url='https://github.com/hgrecco/pint',
test_suite='pint.testsuite.testsuite',
tests_require=["unittest2 ; python_version < '2.7'"],
zip_safe=True,
packages=['pint'],
package_data={