Adjustment so Tox works with Python3

sudorandom · sudorandom · commit a140c2f9d673 · 2013-01-18T11:02:51.000-06:00
The 2to3 tool runs against the code and dumps the updated code into the
build directory. Because of this, 'tests' was added to packages in the setup.py
file. This change moves tests under SoftLayer and removes it from the setup.py.
This change also removes Python 2.4 and 2.5 from the tox file.
diff --git a/SoftLayer/tests/__init__.py b/SoftLayer/tests/__init__.py
diff --git a/SoftLayer/tests/basic_tests.py b/SoftLayer/tests/basic_tests.py
@@ -6,6 +6,13 @@
 import os
 
 
+NO_CREDS_TEXT = 'SL_USERNAME and SL_API_KEY environmental variables not set'
+HAS_CREDS = True
+for key in 'SL_USERNAME SL_API_KEY'.split():
+    if key not in os.environ:
+        HAS_CREDS = False
+        break
+
 def get_creds():
     return {
         'username': os.environ['SL_USERNAME'],
@@ -22,7 +29,7 @@ def test_failed_auth(self):
             timeout=20)
         self.assertRaises(SoftLayer.API.SoftLayerError, client.getPortalLoginToken)
 
-
+@unittest.skipIf(not HAS_CREDS, NO_CREDS_TEXT)
 class AuthedUser(unittest.TestCase):
     def test_result_types(self):
         creds = get_creds()
diff --git a/setup.py b/setup.py
@@ -18,9 +18,7 @@
     description="A library to contact SoftLayer's backend services",
     author='SoftLayer Technologies, Inc.',
     author_email='sldn@softlayer.com',
-    packages=[
-        'SoftLayer', 'tests'
-    ],
+    packages=['SoftLayer'],
     license='The BSD License',
     url='http://github.com/softlayer/softlayer-api-python-client',
     classifiers=[
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py24,py25,py26,py27,py32,pypy
+envlist = py26,py27,py33,pypy
 
 [testenv]
 commands = nosetests []
@@ -8,11 +8,10 @@ deps =
     yanc
     unittest2
 
-[testenv:py32]
-
+[testenv:py33]
 commands = 
   {envpython} setup.py build
-  nosetests -w build/lib/tests []
+  nosetests -w build/lib []
 deps =
     nose
     yanc
