From 87091043ed3909b2c8a07ccf517b2c8230c2a3c3 Mon Sep 17 00:00:00 2001 From: salimfadhley Date: Thu, 31 May 2012 00:47:49 +0100 Subject: [PATCH] Many changes to aid doc-building & release process. --- build.xml | 2 +- doc/source/conf.py | 36 +++++++++++++++++++++--------------- jenkinsapi/.gitignore | 1 + setup.py | 2 +- 4 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 jenkinsapi/.gitignore diff --git a/build.xml b/build.xml index 07d3bd2..3a2c96e 100644 --- a/build.xml +++ b/build.xml @@ -15,7 +15,7 @@ - + diff --git a/doc/source/conf.py b/doc/source/conf.py index a1b2307..25dd1d6 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -11,24 +11,30 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os +import sys, os, logging +import pkg_resources -DOC_SRC_DIR, _ = os.path.split( os.path.abspath( __file__ )) -DOC_DIR, _ = os.path.split( DOC_SRC_DIR ) -PROJECT_DIR, _ = os.path.split( DOC_DIR ) +if __name__ == "__main__": + logging.basicConfig() -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -sys.path.insert(0, PROJECT_DIR ) +log = logging.getLogger(__name__) +# CHANGE THIS +VERSION = REVISION = '0.1.7' +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.' +# CHANGE THIS + +REQUIRE_STRING = "%s==%s" % (PROJECT_NAME.lower(), VERSION) + +pkg_resources.require(REQUIRE_STRING) +distrib = pkg_resources.get_distribution(REQUIRE_STRING) #Sanity check import jenkinsapi -import examples -import jenkinsapi_tests -# Config file -import setup_config as jenkinsapi_setup_config # -- General configuration ----------------------------------------------------- @@ -53,16 +59,16 @@ master_doc = 'index' # General information about the project. project = u' JenkinsAPI' -copyright = u'2012, %s' % jenkinsapi_setup_config.PROJECT_AUTHORS +copyright = u'2012, %s' % PROJECT_AUTHORS # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = jenkinsapi_setup_config.VERSION +version = VERSION # The full version, including alpha/beta/rc tags. -release = jenkinsapi_setup_config.REVISION +release = REVISION # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/jenkinsapi/.gitignore b/jenkinsapi/.gitignore new file mode 100644 index 0000000..225fc6f --- /dev/null +++ b/jenkinsapi/.gitignore @@ -0,0 +1 @@ +/__pycache__ diff --git a/setup.py b/setup.py index eeecb61..18179a7 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup import os PROJECT_ROOT, _ = os.path.split(__file__) -VERSION = REVISION = '0.1.6' +VERSION = REVISION = '0.1.7' PROJECT_NAME = 'JenkinsAPI' PROJECT_AUTHORS = "Salim Fadhley, Ramon van Alteren, Ruslan Lutsenko" PROJECT_EMAILS = 'salimfadhley@gmail.com, ramon@vanalteren.nl, ruslan.lutcenko@gmail.com' -- 2.7.4