Fixed setup.py

The amount of data in setup_config doesn't really need an extra file and the hassle to get that in setup.py
Copied vars back to the setup.py file and deleted setup_config.py

diff --git a/setup.py b/setup.py
index c28e36ff59f277ad9ffc2a2c6dc9ced731b7b036..f6e708458506c7991a37a93a36004723df2301f9 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,20 @@
 from setuptools import setup
-from setup_config import DESCRIPTION, VERSION, PROJECT_NAME, PROJECT_AUTHORS, GLOBAL_ENTRY_POINTS, PROJECT_EMAILS, PROJECT_URL, SHORT_DESCRIPTION
+import os
+
+PROJECT_ROOT, _ = os.path.split(__file__) 
+DESCRIPTION = open( os.path.join(PROJECT_ROOT, "README") ).read()
+VERSION = REVISION = '0.1.1'
+PROJECT_NAME = 'JenkinsAPI'
+PROJECT_AUTHORS = "Salim Fadhley, Ramon van Alteren, Ruslan Lutsenko"
+PROJECT_EMAILS = 'salimfadhley@gmail.com, ramon@vanalteren.nl, ruslan.lutcenko@gmail.com'
+PROJECT_URL = "https://github.com/salimfadhley/jenkinsapi"
+SHORT_DESCRIPTION = 'A Python API for accessing resources on a Jenkins continuous-integration server.'
+
+GLOBAL_ENTRY_POINTS = {
+        "console_scripts":[ "jenkins_invoke=jenkinsapi.command_line.jenkins_invoke:main"]
+        }
+
+# Actual setup
 
 setup(name=PROJECT_NAME.lower(),
       version=VERSION,

diff --git a/setup_config.py b/setup_config.py
deleted file mode 100644 (file)
index fc1daa4..0000000
--- a/setup_config.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from setuptools import setup, find_packages\r
-import sys, os\r
-\r
-# Use the README file as the long-description for the project. \r
-# This makes sure that the PyPi index page contains automatically\r
-# generated documentation.\r
-PROJECT_ROOT, _ = os.path.split(__file__) \r
-DESCRIPTION = open( os.path.join(PROJECT_ROOT, "README") ).read()\r
-VERSION = REVISION = '0.1.1'\r
-PROJECT_NAME = 'JenkinsAPI'\r
-PROJECT_AUTHORS = "Salim Fadhley, Ramon van Alteren, Ruslan Lutsenko"\r
-PROJECT_EMAILS = 'salimfadhley@gmail.com, ramon@vanalteren.nl, ruslan.lutcenko@gmail.com',\r
-PROJECT_URL = "https://github.com/salimfadhley/jenkinsapi"\r
-SHORT_DESCRIPTION = 'A Python API for accessing resources on a Jenkins continuous-integration server.'\r
-\r
-GLOBAL_ENTRY_POINTS = {\r
-        "console_scripts":[ "jenkins_invoke=jenkinsapi.command_line.jenkins_invoke:main"]\r
-        }
\ No newline at end of file