Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update changelog; peg documentation version.

  • Loading branch information...
commit e113656703c73352e1e9854e80d1f92c1e34e17c 1 parent 339705d
@kgaughan authored
Showing with 43 additions and 21 deletions.
  1. +14 −0 ChangeLog
  2. +1 −1  MANIFEST.in
  3. +20 −0 buildkit.py
  4. +7 −3 docs/conf.py
  5. +1 −17 setup.py
View
14 ChangeLog
@@ -4,6 +4,20 @@
Change history
==============
+.. _version-0.1.4:
+
+0.1.4
+=====
+:Release date: 2012-10-11T12:59:00.Z
+:By: Keith Gaughan
+
+* `execute*()` now returns the number of affected rows.
+* Add `last_row_count` and `last_row_id` to `Context`.
+* Remove `DummyPool` and `ThreadAffinePool`, though the latter may be
+ returning.
+* Stablise the behaviour of `Pool` when dealing with expired connections.
+* Documentation version is now pegged directly to the library.
+
.. _version-0.1.2:
0.1.2
View
2  MANIFEST.in
@@ -1,4 +1,4 @@
-include LICENSE ChangeLog
+include LICENSE ChangeLog buildkit.py
recursive-include docs *.rst *.py
recursive-include tests *.py
recursive-include examples *.py *.sql
View
20 buildkit.py
@@ -0,0 +1,20 @@
+import re
+import os
+
+
+def read(filename):
+ """Read files relative to this file."""
+ full_path = os.path.join(os.path.dirname(__file__), filename)
+ with open(full_path, 'r') as fh:
+ return fh.read()
+
+
+def get_metadata(module_path):
+ """Extract the metadata from a module file."""
+ matches = re.finditer(
+ r"^__(\w+?)__ *= *'(.*?)'$",
+ read(module_path),
+ re.MULTILINE)
+ return dict(
+ (match.group(1), match.group(2).decode('unicode_escape'))
+ for match in matches)
View
10 docs/conf.py
@@ -11,13 +11,17 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-import sys, os
+import sys, os, re
# 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, os.path.abspath('..'))
+import buildkit
+
+META = buildkit.get_metadata('dbkit.py')
+
# -- General configuration -----------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
@@ -48,9 +52,9 @@
# built documents.
#
# The short X.Y version.
-version = '0.1.0'
+version = META['version']
# The full version, including alpha/beta/rc tags.
-release = '0.1.0'
+release = version
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
View
18 setup.py
@@ -3,23 +3,7 @@
from __future__ import with_statement
from distutils.core import setup
-import re
-
-
-def read(filename):
- with open(filename, 'r') as fh:
- return fh.read()
-
-
-def get_metadata(module_path):
- """Extract the metadata from a module file."""
- matches = re.finditer(
- r"^__(\w+?)__ *= *'(.*?)'$",
- read(module_path),
- re.MULTILINE)
- return dict(
- (match.group(1), match.group(2).decode('unicode_escape'))
- for match in matches)
+from buildkit import *
META = get_metadata('dbkit.py')
Please sign in to comment.
Something went wrong with that request. Please try again.