revert accidental removel of unittest2 from the setup.py script

diff --git a/build.xml b/build.xml
index 545d916580e06cb79635766f95033a79e0b9a0f9..72d8a83ee3e2903cefbeae20c66bbf6d126db7ae 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="jenkinsapi" default="all">
        <property file="build.properties" />
-
+       
+       <target name="release" depends="clean, compile, test, sdist, bdist, doc" />
+       
        <target name="all" depends="clean, compile" />
 
        <target name="clean">
@@ -40,9 +42,17 @@
                        <arg value="sdist" />
                        <arg value="upload" />
                </exec>
-       </target>       
-
-       <target name="doc" depends="sdist">
+       </target>
+       
+       <target name="bdist" depends="test">
+                       <exec executable="python">
+                               <arg value="setup.py" />
+                               <arg value="bdist_wheel" />
+                               <arg value="upload" />
+                       </exec>
+               </target>       
+
+       <target name="doc" depends="">
                <exec executable="python">
                        <arg value="setup.py" />
                        <arg value="build_sphinx" />

diff --git a/setup.py b/setup.py
index dfe19a630949a453a969afdcad911773c9828116..a4a2bd9ad955f7f481f60a9c0b757a619307e0ce 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ SHORT_DESCRIPTION = 'A Python API for accessing resources on a Jenkins continuou
 
 try:
     DESCRIPTION = open(os.path.join(PROJECT_ROOT, "README.rst")).read()
-except IOError, _:
+except IOError:
     DESCRIPTION = SHORT_DESCRIPTION
 
 GLOBAL_ENTRY_POINTS = {
@@ -29,7 +29,7 @@ setup(
     include_package_data=False,
     install_requires=['requests>=1.2.3', 'pytz>=2013b'],
     test_suite='nose.collector',
-    tests_require=['mock', 'nose', 'coverage'],
+    tests_require=['mock', 'nose', 'coverage', 'unittest2'],
     entry_points=GLOBAL_ENTRY_POINTS,
     url=PROJECT_URL,
     description=SHORT_DESCRIPTION,