Move project information into postgresql.project

James William Pye · James William Pye · commit 9ef001fa2b1f · 2010-02-02T17:42:00.000-07:00
diff --git a/postgresql/__init__.py b/postgresql/__init__.py
@@ -12,28 +12,20 @@
 __all__ = [
 	'__author__',
 	'__date__',
-	'__project__',
-	'__project_id__',
-	'__docformat__',
 	'__version__',
+	'__docformat__',
 	'version',
 	'version_info',
 	'open',
 ]
 
-__author__ = "James William Pye <x@jwp.name>"
-__date__ = "2009-12-14 21:16:00-07"
-
-__project__ = 'py-postgresql'
-__project_id__ = 'http://python.projects.postgresql.org'
-
-#: The py-postgresql version tuple.
-version_info = (1, 0, 0, 'dev', 0)
-
-#: The py-postgresql version string.
-version = __version__ = '.'.join(map(str, version_info[:3])) + (
-	version_info[3] if version_info[3] != 'final' else ''
-)
+# Optional.
+try:
+	from .project import version_info, version, \
+		author as __author__, date as __date__
+	__version__ = version
+except ImportError:
+	pass
 
 # Avoid importing these until requested.
 _pg_iri = _pg_driver = _pg_param = None
diff --git a/postgresql/documentation/changes.txt b/postgresql/documentation/changes.txt
@@ -13,6 +13,8 @@ Changes
  * Set the default client_min_messages level to WARNING.
    NOTICEs are often not desired by programmers, and py-postgresql's
    high verbosity further irritates that case.
+ * Added postgresql.project module to provide project information.
+   Project name, author, version, etc.
 
 0.9.3 released on 2010-01-01
 ----------------------------
diff --git a/postgresql/project.py b/postgresql/project.py
@@ -0,0 +1,9 @@
+# project information
+name = 'py-postgresql'
+identity = 'http://python.projects.postgresql.org/'
+author = "James William Pye <x@jwp.name>"
+
+# Set this to the target date when approaching a release.
+date = None
+version_info = (1, 0, 0)
+version = '.'.join(map(str, version_info)) + (date is None and 'dev' or '')
diff --git a/postgresql/release/distutils.py b/postgresql/release/distutils.py
@@ -13,10 +13,7 @@
 """
 import sys
 import os
-from .. import \
-	__version__ as version, \
-	__project__ as name, \
-	__project_id__ as url
+from ..project import version, name, identity as url
 from distutils.core import Extension
 
 LONG_DESCRIPTION = """
diff --git a/sphinx-src/conf.py b/sphinx-src/conf.py
@@ -18,7 +18,7 @@
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.
-sys.path.append(os.path.abspath(os.path.dirname(__file__) + '../..'))
+sys.path.insert(0, os.path.abspath(os.path.dirname(__file__) + '../../postgresql'))
 
 # General configuration
 # ---------------------
@@ -37,17 +37,16 @@
 master_doc = 'index'
 
 # General substitutions.
-import postgresql as meta
-project = meta.__project__
-copyright = meta.__date__ + ', ' + meta.__author__
+import project
+copyright = '2010, ' + project.author
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '.'.join(map(str, meta.version_info[:2]))
+version = '.'.join(map(str, project.version_info[:2]))
 # The full version, including alpha/beta/rc tags.
-release = meta.__version__
+release = project.version
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -145,7 +144,7 @@
 #html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = meta.__project__
+htmlhelp_basename = project.__name__
 
 
 # Options for LaTeX output
@@ -180,3 +179,5 @@
 
 # If false, no module index is generated.
 #latex_use_modindex = True
+
+project = project.name
