From f6a231845680f6146e9158c8292f763c6ccdfb24 Mon Sep 17 00:00:00 2001
From: Ramon van Alteren <ramon@vanalteren.nl>
Date: Mon, 2 Jan 2012 14:53:37 +0100
Subject: [PATCH] Simplyfied dir setup

Removed jenkinsci_egg and src dirs
Removed tests, highly env dependant and not very usefull
---
 publish.bat                                        |  3 --
 .../pyjenkinsci_tests => pyjenkinsci}/__init__.py  |  0
 .../src/pyjenkinsci => pyjenkinsci}/api.py         |  8 +--
 .../src/pyjenkinsci => pyjenkinsci}/artifact.py    |  8 +--
 .../src/pyjenkinsci => pyjenkinsci}/build.py       | 14 +++---
 .../utils => pyjenkinsci/command_line}/__init__.py |  0
 .../command_line/jenkins_invoke.py                 |  9 ++--
 .../command_line/meta_test.py                      |  4 +-
 .../src/pyjenkinsci => pyjenkinsci}/config.py      |  0
 .../src/pyjenkinsci => pyjenkinsci}/constants.py   |  0
 .../src/pyjenkinsci => pyjenkinsci}/exceptions.py  |  0
 .../src/pyjenkinsci => pyjenkinsci}/fingerprint.py |  6 +--
 .../src/pyjenkinsci => pyjenkinsci}/jenkins.py     | 14 +++---
 .../pyjenkinsci => pyjenkinsci}/jenkinsobject.py   |  4 +-
 .../src/pyjenkinsci => pyjenkinsci}/job.py         |  8 +--
 .../src/pyjenkinsci => pyjenkinsci}/result.py      |  0
 .../src/pyjenkinsci => pyjenkinsci}/result_set.py  |  6 +--
 .../command_line => pyjenkinsci/utils}/__init__.py |  0
 .../utils/bufwrapper.py                            |  0
 .../src/pyjenkinsci => pyjenkinsci}/utils/dates.py |  0
 .../src/pyjenkinsci => pyjenkinsci}/utils/id.py    |  0
 .../pyjenkinsci => pyjenkinsci}/utils/junitxml.py  |  2 +-
 .../pyjenkinsci => pyjenkinsci}/utils/md5hash.py   |  0
 .../src/pyjenkinsci => pyjenkinsci}/utils/retry.py |  0
 .../pyjenkinsci => pyjenkinsci}/utils/urlopener.py |  0
 .../pyjenkinsci => pyjenkinsci}/utils/xmlrunner.py |  3 +-
 .../utils/xmlrunnertest.py                         |  2 +-
 .../src/pyjenkinsci => pyjenkinsci}/view.py        |  6 +--
 pyjenkinsci_egg/src/pyjenkinsci/__init__.py        |  0
 .../src/pyjenkinsci/command_line/base.py           |  8 ---
 pyjenkinsci_egg/src/pyjenkinsci_tests/config.py    | 14 ------
 pyjenkinsci_egg/src/pyjenkinsci_tests/test_api.py  | 41 ---------------
 .../src/pyjenkinsci_tests/test_query.py            | 58 ----------------------
 pyjenkinsci_egg/setup.py => setup.py               |  0
 setup_dev.bat                                      |  3 --
 35 files changed, 46 insertions(+), 175 deletions(-)
 delete mode 100644 publish.bat
 rename {pyjenkinsci_egg/src/pyjenkinsci_tests => pyjenkinsci}/__init__.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/api.py (94%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/artifact.py (94%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/build.py (87%)
 rename {pyjenkinsci_egg/src/pyjenkinsci/utils => pyjenkinsci/command_line}/__init__.py (100%)
 rename pyjenkinsci_egg/src/pyjenkinsci/command_line/hudson_invoke.py => pyjenkinsci/command_line/jenkins_invoke.py (90%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/command_line/meta_test.py (90%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/config.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/constants.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/exceptions.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/fingerprint.py (92%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/jenkins.py (87%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/jenkinsobject.py (92%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/job.py (94%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/result.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/result_set.py (85%)
 rename {pyjenkinsci_egg/src/pyjenkinsci/command_line => pyjenkinsci/utils}/__init__.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/utils/bufwrapper.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/utils/dates.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/utils/id.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/utils/junitxml.py (96%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/utils/md5hash.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/utils/retry.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/utils/urlopener.py (100%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/utils/xmlrunner.py (99%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/utils/xmlrunnertest.py (96%)
 rename {pyjenkinsci_egg/src/pyjenkinsci => pyjenkinsci}/view.py (87%)
 delete mode 100644 pyjenkinsci_egg/src/pyjenkinsci/__init__.py
 delete mode 100644 pyjenkinsci_egg/src/pyjenkinsci/command_line/base.py
 delete mode 100644 pyjenkinsci_egg/src/pyjenkinsci_tests/config.py
 delete mode 100644 pyjenkinsci_egg/src/pyjenkinsci_tests/test_api.py
 delete mode 100644 pyjenkinsci_egg/src/pyjenkinsci_tests/test_query.py
 rename pyjenkinsci_egg/setup.py => setup.py (100%)
 delete mode 100644 setup_dev.bat

diff --git a/publish.bat b/publish.bat
deleted file mode 100644
index d820450..0000000
--- a/publish.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-cd /D %~dp0
-cd pyjenkinsci_egg
-python setup.py bdist_egg
\ No newline at end of file
diff --git a/pyjenkinsci_egg/src/pyjenkinsci_tests/__init__.py b/pyjenkinsci/__init__.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci_tests/__init__.py
rename to pyjenkinsci/__init__.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/api.py b/pyjenkinsci/api.py
similarity index 94%
rename from pyjenkinsci_egg/src/pyjenkinsci/api.py
rename to pyjenkinsci/api.py
index 08d86e7..a40006a 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/api.py
+++ b/pyjenkinsci/api.py
@@ -1,7 +1,7 @@
-from pyjenkinsci.jenkins import jenkins
-from pyjenkinsci.artifact import artifact
-from pyjenkinsci.exceptions import ArtifactsMissing, TimeOut, BadURL
-from pyjenkinsci import constants
+import artifact
+import constants
+import jenkins
+from exceptions import ArtifactsMissing, TimeOut, BadURL
 from urllib2 import urlparse
 
 import os
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/artifact.py b/pyjenkinsci/artifact.py
similarity index 94%
rename from pyjenkinsci_egg/src/pyjenkinsci/artifact.py
rename to pyjenkinsci/artifact.py
index 48ff2fb..a3b0193 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/artifact.py
+++ b/pyjenkinsci/artifact.py
@@ -5,11 +5,11 @@ import cStringIO
 import zipfile
 import cPickle
 import datetime
+import config
 
-from pyjenkinsci import config
-from pyjenkinsci.utils.retry import retry_function
-from pyjenkinsci.exceptions import ArtifactBroken
-from pyjenkinsci.utils.md5hash import new_digest
+from utils.retry import retry_function
+from exceptions import ArtifactBroken
+from utils.md5hash import new_digest
 
 log = logging.getLogger( __name__ )
 
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/build.py b/pyjenkinsci/build.py
similarity index 87%
rename from pyjenkinsci_egg/src/pyjenkinsci/build.py
rename to pyjenkinsci/build.py
index 79b9b9b..00fe594 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/build.py
+++ b/pyjenkinsci/build.py
@@ -1,15 +1,15 @@
-from pyjenkinsci.jenkinsobject import jenkinsobject
-from pyjenkinsci.artifact import artifact
-from pyjenkinsci.result_set import result_set
+import artifact
+import config
+import jenkinsobject
 import time
 import logging
-from pyjenkinsci import config
-from pyjenkinsci.exceptions import NoResults, FailedNoResults
-from pyjenkinsci.constants import STATUS_FAIL, STATUS_ABORTED, RESULTSTATUS_FAILURE
+from exceptions import NoResults, FailedNoResults
+from constants import STATUS_FAIL, STATUS_ABORTED, RESULTSTATUS_FAILURE
+import result_set
 
 log = logging.getLogger(__name__)
 
-class build( jenkinsobject ):
+class build(jenkinsobject):
     """
     Represents a jenkins build, executed in context of a job.
     """
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/utils/__init__.py b/pyjenkinsci/command_line/__init__.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/utils/__init__.py
rename to pyjenkinsci/command_line/__init__.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/command_line/hudson_invoke.py b/pyjenkinsci/command_line/jenkins_invoke.py
similarity index 90%
rename from pyjenkinsci_egg/src/pyjenkinsci/command_line/hudson_invoke.py
rename to pyjenkinsci/command_line/jenkins_invoke.py
index 78e88c9..3f9afd0 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/command_line/hudson_invoke.py
+++ b/pyjenkinsci/command_line/jenkins_invoke.py
@@ -1,17 +1,16 @@
 import os
 import sys
 import logging
-
-from pyjenkinsci.command_line.base import base
-from pyjenkinsci.jenkins import jenkins
+import optparse
+import jenkins
 
 log = logging.getLogger(__name__)
 
-class jenkins_invoke( base ):
+class jenkins_invoke(object):
 
     @classmethod
     def mkparser(cls):
-        parser = base.mkparser( )
+        parser = optparse.OptionParser()
         DEFAULT_BASEURL=os.environ.get( "JENKINS_URL", "http://localhost/jenkins" )
         parser.help_text = "Execute a number of jenkins jobs on the server of your choice. Optionally block until the jobs are complete."
         parser.add_option("-J", "--jenkinsbase", dest="baseurl",
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/command_line/meta_test.py b/pyjenkinsci/command_line/meta_test.py
similarity index 90%
rename from pyjenkinsci_egg/src/pyjenkinsci/command_line/meta_test.py
rename to pyjenkinsci/command_line/meta_test.py
index b1a1bee..c918339 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/command_line/meta_test.py
+++ b/pyjenkinsci/command_line/meta_test.py
@@ -2,8 +2,8 @@ import optparse
 import os
 import random
 import logging
-from pyjenkinsci.utils import junitxml
-from pyjenkinsci.utils.id import mk_id
+from utils.id import mk_id
+from utils import junitxml
 
 log = logging.getLogger(__name__)
 
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/config.py b/pyjenkinsci/config.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/config.py
rename to pyjenkinsci/config.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/constants.py b/pyjenkinsci/constants.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/constants.py
rename to pyjenkinsci/constants.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/exceptions.py b/pyjenkinsci/exceptions.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/exceptions.py
rename to pyjenkinsci/exceptions.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/fingerprint.py b/pyjenkinsci/fingerprint.py
similarity index 92%
rename from pyjenkinsci_egg/src/pyjenkinsci/fingerprint.py
rename to pyjenkinsci/fingerprint.py
index 073ba50..836dc29 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/fingerprint.py
+++ b/pyjenkinsci/fingerprint.py
@@ -1,5 +1,5 @@
-from pyjenkinsci.jenkinsobject import jenkinsobject
-from pyjenkinsci.exceptions import ArtifactBroken
+import jenkinsobject
+from exceptions import ArtifactBroken
 
 import urllib2
 import re
@@ -8,7 +8,7 @@ import logging
 
 log = logging.getLogger( __name__ )
 
-class fingerprint( jenkinsobject ):
+class fingerprint(jenkinsobject):
     """
     Represents a jenkins fingerprint on a single artifact file ??
     """
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/jenkins.py b/pyjenkinsci/jenkins.py
similarity index 87%
rename from pyjenkinsci_egg/src/pyjenkinsci/jenkins.py
rename to pyjenkinsci/jenkins.py
index 6a821e9..4b83074 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/jenkins.py
+++ b/pyjenkinsci/jenkins.py
@@ -1,15 +1,15 @@
-from pyjenkinsci.exceptions import UnknownJob
-from pyjenkinsci.fingerprint import fingerprint
-from pyjenkinsci.jenkinsobject import jenkinsobject
-from pyjenkinsci.job import job
-from pyjenkinsci.utils.urlopener import mkurlopener
-from pyjenkinsci.view import view
+import fingerprint
+import jenkinsobject
+import job
+from exceptions import UnknownJob
+from utils.urlopener import mkurlopener
 import logging
 import time
+import view
 
 log = logging.getLogger(__name__)
 
-class jenkins( jenkinsobject ):
+class jenkins(jenkinsobject):
     """
     Represents a jenkins environment.
     """
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/jenkinsobject.py b/pyjenkinsci/jenkinsobject.py
similarity index 92%
rename from pyjenkinsci_egg/src/pyjenkinsci/jenkinsobject.py
rename to pyjenkinsci/jenkinsobject.py
index 031ab03..e97ef95 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/jenkinsobject.py
+++ b/pyjenkinsci/jenkinsobject.py
@@ -1,8 +1,8 @@
 import urllib2
 import logging
 import pprint
-from pyjenkinsci import config
-from pyjenkinsci.utils.retry import retry_function
+import config
+from utils.retry import retry_function
 
 log = logging.getLogger( __name__ )
 
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/job.py b/pyjenkinsci/job.py
similarity index 94%
rename from pyjenkinsci_egg/src/pyjenkinsci/job.py
rename to pyjenkinsci/job.py
index 64ea3e2..9d6889b 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/job.py
+++ b/pyjenkinsci/job.py
@@ -2,14 +2,14 @@ import logging
 import urlparse
 import urllib2
 import time
+import build
+import jenkinsobject
 
-from pyjenkinsci.jenkinsobject import jenkinsobject
-from pyjenkinsci.build import build
-from pyjenkinsci.exceptions import NoBuildData
+from exceptions import NoBuildData
 
 log = logging.getLogger(__name__)
 
-class job( jenkinsobject ):
+class job(jenkinsobject):
     """
     Represents a jenkins job
     A job can hold N builds which are the actual execution environments
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/result.py b/pyjenkinsci/result.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/result.py
rename to pyjenkinsci/result.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/result_set.py b/pyjenkinsci/result_set.py
similarity index 85%
rename from pyjenkinsci_egg/src/pyjenkinsci/result_set.py
rename to pyjenkinsci/result_set.py
index 7eb7579..9e343ad 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/result_set.py
+++ b/pyjenkinsci/result_set.py
@@ -1,7 +1,7 @@
-from pyjenkinsci.jenkinsobject import jenkinsobject
-from pyjenkinsci.result import result
+import jenkinsobject
+import result
 
-class result_set( jenkinsobject ):
+class result_set(jenkinsobject):
     """
     Represents a result from a completed Hudson run.
     """
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/command_line/__init__.py b/pyjenkinsci/utils/__init__.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/command_line/__init__.py
rename to pyjenkinsci/utils/__init__.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/utils/bufwrapper.py b/pyjenkinsci/utils/bufwrapper.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/utils/bufwrapper.py
rename to pyjenkinsci/utils/bufwrapper.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/utils/dates.py b/pyjenkinsci/utils/dates.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/utils/dates.py
rename to pyjenkinsci/utils/dates.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/utils/id.py b/pyjenkinsci/utils/id.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/utils/id.py
rename to pyjenkinsci/utils/id.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/utils/junitxml.py b/pyjenkinsci/utils/junitxml.py
similarity index 96%
rename from pyjenkinsci_egg/src/pyjenkinsci/utils/junitxml.py
rename to pyjenkinsci/utils/junitxml.py
index 34f4f7c..f838241 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/utils/junitxml.py
+++ b/pyjenkinsci/utils/junitxml.py
@@ -8,7 +8,7 @@ try:
 except Exception, e:
     import elementtree.ElementTree as ET
 
-from pyjenkinsci.utils.dates import timedelta_to_seconds
+from utils.dates import timedelta_to_seconds
 
 log = logging.getLogger(__name__)
 
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/utils/md5hash.py b/pyjenkinsci/utils/md5hash.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/utils/md5hash.py
rename to pyjenkinsci/utils/md5hash.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/utils/retry.py b/pyjenkinsci/utils/retry.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/utils/retry.py
rename to pyjenkinsci/utils/retry.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/utils/urlopener.py b/pyjenkinsci/utils/urlopener.py
similarity index 100%
rename from pyjenkinsci_egg/src/pyjenkinsci/utils/urlopener.py
rename to pyjenkinsci/utils/urlopener.py
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/utils/xmlrunner.py b/pyjenkinsci/utils/xmlrunner.py
similarity index 99%
rename from pyjenkinsci_egg/src/pyjenkinsci/utils/xmlrunner.py
rename to pyjenkinsci/utils/xmlrunner.py
index 58445a8..2292719 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/utils/xmlrunner.py
+++ b/pyjenkinsci/utils/xmlrunner.py
@@ -4,6 +4,7 @@ XML Test Runner for PyUnit
 
 # Written by Sebastian Rittau <srittau@jroger.in-berlin.de> and placed in
 # the Public Domain.
+from utils import bufwrapper
 
 __revision__ = "$Id: /mirror/jroger/python/stdlib/xmlrunner.py 3506 2006-07-27T09:12:39.629878Z srittau  $"
 
@@ -17,8 +18,6 @@ from xml.sax.saxutils import escape
 
 log = logging.getLogger()
 
-from pyjenkinsci.utils.bufwrapper import bufwrapper
-
 class faketest( object ):
     """
     A fake test object for when you want to inject additional results into the XML stream.
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/utils/xmlrunnertest.py b/pyjenkinsci/utils/xmlrunnertest.py
similarity index 96%
rename from pyjenkinsci_egg/src/pyjenkinsci/utils/xmlrunnertest.py
rename to pyjenkinsci/utils/xmlrunnertest.py
index 2ad90da..d245284 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/utils/xmlrunnertest.py
+++ b/pyjenkinsci/utils/xmlrunnertest.py
@@ -2,7 +2,7 @@ import unittest
 import sys
 import re
 from cStringIO import StringIO
-from pyjenkinsci.utils.xmlrunner import XmlTestRunner
+from utils.xmlrunner import XmlTestRunner
 
 class XmlTestRunnerTest(unittest.TestCase):
     def setUp(self):
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/view.py b/pyjenkinsci/view.py
similarity index 87%
rename from pyjenkinsci_egg/src/pyjenkinsci/view.py
rename to pyjenkinsci/view.py
index 18fd863..145e71c 100644
--- a/pyjenkinsci_egg/src/pyjenkinsci/view.py
+++ b/pyjenkinsci/view.py
@@ -1,7 +1,7 @@
-from pyjenkinsci.jenkinsobject import jenkinsobject
-from pyjenkinsci.job import job
+import jenkinsobject
+import job
 
-class view( jenkinsobject ):
+class view(jenkinsobject):
 
     def __init__(self, url, name, jenkins_obj):
         self.name = name
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/__init__.py b/pyjenkinsci_egg/src/pyjenkinsci/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pyjenkinsci_egg/src/pyjenkinsci/command_line/base.py b/pyjenkinsci_egg/src/pyjenkinsci/command_line/base.py
deleted file mode 100644
index 9275a43..0000000
--- a/pyjenkinsci_egg/src/pyjenkinsci/command_line/base.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from optparse import OptionParser
-
-class base( object ):
-
-    @classmethod
-    def mkparser(cls):
-        parser = OptionParser()
-        return parser
diff --git a/pyjenkinsci_egg/src/pyjenkinsci_tests/config.py b/pyjenkinsci_egg/src/pyjenkinsci_tests/config.py
deleted file mode 100644
index 6d04682..0000000
--- a/pyjenkinsci_egg/src/pyjenkinsci_tests/config.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-#Disable HTTP PROXY
-CLEAR_PROXY = os.environ.get("CLEAR_PROXY","")
-if len( CLEAR_PROXY ) > 0:
-    del os.environ["HTTP_PROXY"]
-
-JENKINS_BASE = os.environ.get( "JENKINS_BASE", "http://localhost:8080/jenkins" )
-HTTP_PROXY = os.environ.get( "HTTP_PROXY", "" )
-BUILD_NAME_TEST1 = "test1"
-
-if __name__ == "__main__":
-    print( "Jenkins base: %s" % JENKINS_BASE )
-    print( "Http Proxy: %s"  %HTTP_PROXY )
\ No newline at end of file
diff --git a/pyjenkinsci_egg/src/pyjenkinsci_tests/test_api.py b/pyjenkinsci_egg/src/pyjenkinsci_tests/test_api.py
deleted file mode 100644
index 98791b1..0000000
--- a/pyjenkinsci_egg/src/pyjenkinsci_tests/test_api.py
+++ /dev/null
@@ -1,41 +0,0 @@
-"""
-Important: For this test to work we need at least one Jenkins server
-You need to configure the JENKINS_BASE environment variable
-And you need to enure that this Jenkins has at least one job called "test1".
-Make sure that sucsessful builds of test one archive an artifact called "test1.txt" - it can be anything.
-"""
-import unittest
-import logging
-
-from pyjenkinsci.build import build
-from pyjenkinsci.result_set import result_set
-from pyjenkinsci.result import result
-from pyjenkinsci import api
-from pyjenkinsci_tests.config import JENKINS_BASE, BUILD_NAME_TEST1
-
-if __name__ == "__main__":
-    logging.basicConfig()
-
-log = logging.getLogger(__name__)
-
-class test_api( unittest.TestCase ):
-    """
-    Perform a number of basic queries.
-    """
-
-    def setUp(self):
-        pass
-
-    def test_get_latest_build_results(self):
-        lb = api.get_latest_build(JENKINS_BASE, BUILD_NAME_TEST1)
-        assert isinstance(lb, build)
-        rs = lb.get_resultset()
-        assert isinstance( rs, result_set )
-        assert len(rs) > 0
-
-        for id, res in rs.items():
-            assert isinstance( res, result ), "Expected result-set object, got %s" % repr(res)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/pyjenkinsci_egg/src/pyjenkinsci_tests/test_query.py b/pyjenkinsci_egg/src/pyjenkinsci_tests/test_query.py
deleted file mode 100644
index 202beb1..0000000
--- a/pyjenkinsci_egg/src/pyjenkinsci_tests/test_query.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""
-Important: For this test to work we need at least one Jenkins server
-You need to configure the JENKINS_BASE environment variable
-And you need to enure that this Jenkins has at least one job called "test1".
-Make sure that sucsessful builds of test one archive an artifact called "test1.txt" - it can be anything.
-"""
-import unittest
-import logging
-
-from pyjenkinsci.jenkins import jenkins
-from pyjenkinsci.artifact import artifact
-from pyjenkinsci.build import build
-from pyjenkinsci_tests.config import HTTP_PROXY, JENKINS_BASE
-
-if __name__ == "__main__":
-    logging.basicConfig()
-
-log = logging.getLogger(__name__)
-
-class test_query( unittest.TestCase ):
-    """
-    Perform a number of basic queries.
-    """
-
-    def setUp(self):
-        log.warn("Connecting to %s via proxy: %s" % (JENKINS_BASE, HTTP_PROXY) )
-        self.jenkins = jenkins( JENKINS_BASE )
-
-    def testListJobs(self):
-        """
-        Test that we can get a list of jobs
-        """
-        job_ids = self.jenkins.keys()
-        assert "test1" in job_ids
-
-    def testListBuilds(self):
-        """
-        """
-        test1 = self.jenkins["test1"]
-        builds = [a for a in test1.get_build_ids() ]
-        assert len(builds) > 0
-        newest_build = test1[ builds[-1] ]
-        assert isinstance( newest_build, build )
-
-    def testGetLatestArtifact(self):
-        test1 = self.jenkins["test1"]
-        builds = [a for a in test1.get_build_ids() ]
-        assert len(builds) > 0
-        newest_build = test1[ builds[0] ]
-        assert isinstance( newest_build, build )
-        artifact_dict = newest_build.get_artifact_dict()
-        assert "test1.txt" in artifact_dict.keys()
-        test_artifact = artifact_dict[ "test1.txt" ]
-        assert isinstance( test_artifact, artifact )
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/pyjenkinsci_egg/setup.py b/setup.py
similarity index 100%
rename from pyjenkinsci_egg/setup.py
rename to setup.py
diff --git a/setup_dev.bat b/setup_dev.bat
deleted file mode 100644
index 95fa360..0000000
--- a/setup_dev.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-cd /D %~dp0
-cd pyjenkinsci_egg
-python setup.py develop -m
-- 
2.7.4