launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #07528
[Merge] lp:~stub/lazr-postgresql/devel into lp:lazr-postgresql
Stuart Bishop has proposed merging lp:~stub/lazr-postgresql/devel into lp:lazr-postgresql.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~stub/lazr-postgresql/devel/+merge/104361
Move the package to the standard lazr namespace and other tidies
--
https://code.launchpad.net/~stub/lazr-postgresql/devel/+merge/104361
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stub/lazr-postgresql/devel into lp:lazr-postgresql.
=== modified file '.bzrignore'
--- .bzrignore 2011-12-01 07:07:57 +0000
+++ .bzrignore 2012-05-02 10:44:24 +0000
@@ -2,7 +2,7 @@
./.installed.cfg
./develop-eggs
./bin
-./lazr_postgresql.egg-info
+./lazr.postgresql.egg-info
./parts
./eggs
./download-cache
=== modified file '.testr.conf'
--- .testr.conf 2011-12-01 07:07:57 +0000
+++ .testr.conf 2012-05-02 10:44:24 +0000
@@ -1,4 +1,4 @@
[DEFAULT]
-test_command=PYTHONPATH=. bin/py -m subunit.run $LISTOPT $IDOPTION lazr_postgresql.tests.test_suite
+test_command=PYTHONPATH=src bin/py -m subunit.run $LISTOPT $IDOPTION lazr.postgresql.tests.test_suite
test_id_option=--load-list $IDFILE
test_list_option=--list
=== modified file 'NEWS'
--- NEWS 2011-12-11 22:50:39 +0000
+++ NEWS 2012-05-02 10:44:24 +0000
@@ -1,11 +1,13 @@
-lazr_postgresql NEWS
+lazr.postgresql NEWS
++++++++++++++++++++
-Changes and improvements to lazr_postgresql, grouped by release.
+Changes and improvements to lazr.postgresql, grouped by release.
NEXT
----
+* Package moved to lazr.postgresql.
+
0.0.1
-----
=== modified file 'README'
--- README 2011-12-11 18:56:47 +0000
+++ README 2012-05-02 10:44:24 +0000
@@ -1,8 +1,8 @@
*********************************************
-lazr_postgresql: Launchpad PostgreSQL support
+lazr.postgresql: Launchpad PostgreSQL support
*********************************************
- Copyright (c) 2011, Canonical Ltd
+ Copyright (c) 2011-2012, Canonical Ltd
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
with this program. If not, see <http://www.gnu.org/licenses/>.
GNU General Public License version 3 (see the file LICENSE).
-lazr_postgresql contains various helpers used by Launchpad for PostgreSQL
+lazr.postgresql contains various helpers used by Launchpad for PostgreSQL
support. Primary amongst these is the Slony aware database migrations facility.
Dependencies
@@ -90,17 +90,17 @@
Development
===========
-Upstream development takes place at https://launchpad.net/lazr_postgresql.
+Upstream development takes place at https://launchpad.net/lazr.postgresql.
To setup a working area for development, if the dependencies are not
immediately available, you can use ./bootstrap.py to create bin/buildout, then
bin/py to get a python interpreter with the dependencies available.
To run the tests use the runner of your choice, the test suite is
-lazr_postgresql.tests.test_suite.
+lazr.postgresql.tests.test_suite.
For instance::
- $ bin/py -m testtools.run lazr_postgresql.tests.test_suite
+ $ PYTHONPATH=src bin/py -m testtools.run lazr.postgresql.tests.test_suite
If you have testrepository you can run the tests with it:
=== modified file 'buildout.cfg'
--- buildout.cfg 2011-12-01 07:07:57 +0000
+++ buildout.cfg 2012-05-02 10:44:24 +0000
@@ -31,7 +31,7 @@
[scripts]
recipe = z3c.recipe.scripts
-eggs = lazr_postgresql [test]
+eggs = lazr.postgresql [test]
include-site-packages = true
allowed-eggs-from-site-packages =
subunit
=== added file 'ez_setup.py'
--- ez_setup.py 1970-01-01 00:00:00 +0000
+++ ez_setup.py 2012-05-02 10:44:24 +0000
@@ -0,0 +1,284 @@
+#!python
+"""Bootstrap setuptools installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+ from ez_setup import use_setuptools
+ use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import sys
+DEFAULT_VERSION = "0.6c11"
+DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/"; % sys.version[:3]
+
+md5_data = {
+ 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
+ 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
+ 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
+ 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
+ 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
+ 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
+ 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
+ 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
+ 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
+ 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+ 'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090',
+ 'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4',
+ 'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7',
+ 'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5',
+ 'setuptools-0.6c11-py2.3.egg': '2baeac6e13d414a9d28e7ba5b5a596de',
+ 'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b',
+ 'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2',
+ 'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086',
+ 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
+ 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
+ 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
+ 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
+ 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
+ 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
+ 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
+ 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
+ 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
+ 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
+ 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
+ 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
+ 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
+ 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
+ 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
+ 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
+ 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
+ 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
+ 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
+ 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
+ 'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03',
+ 'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
+ 'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
+ 'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
+}
+
+import sys, os
+try: from hashlib import md5
+except ImportError: from md5 import md5
+
+def _validate_md5(egg_name, data):
+ if egg_name in md5_data:
+ digest = md5(data).hexdigest()
+ if digest != md5_data[egg_name]:
+ print >>sys.stderr, (
+ "md5 validation of %s failed! (Possible download problem?)"
+ % egg_name
+ )
+ sys.exit(2)
+ return data
+
+def use_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ download_delay=15
+):
+ """Automatically find/download setuptools and make it available on sys.path
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end with
+ a '/'). `to_dir` is the directory where setuptools will be downloaded, if
+ it is not already available. If `download_delay` is specified, it should
+ be the number of seconds that will be paused before initiating a download,
+ should one be required. If an older version of setuptools is installed,
+ this routine will print a message to ``sys.stderr`` and raise SystemExit in
+ an attempt to abort the calling script.
+ """
+ was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
+ def do_download():
+ egg = download_setuptools(version, download_base, to_dir, download_delay)
+ sys.path.insert(0, egg)
+ import setuptools; setuptools.bootstrap_install_from = egg
+ try:
+ import pkg_resources
+ except ImportError:
+ return do_download()
+ try:
+ pkg_resources.require("setuptools>="+version); return
+ except pkg_resources.VersionConflict, e:
+ if was_imported:
+ print >>sys.stderr, (
+ "The required version of setuptools (>=%s) is not available, and\n"
+ "can't be installed while this script is running. Please install\n"
+ " a more recent version first, using 'easy_install -U setuptools'."
+ "\n\n(Currently using %r)"
+ ) % (version, e.args[0])
+ sys.exit(2)
+ except pkg_resources.DistributionNotFound:
+ pass
+
+ del pkg_resources, sys.modules['pkg_resources'] # reload ok
+ return do_download()
+
+def download_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ delay = 15
+):
+ """Download setuptools from a specified location and return its filename
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end
+ with a '/'). `to_dir` is the directory where the egg will be downloaded.
+ `delay` is the number of seconds to pause before an actual download attempt.
+ """
+ import urllib2, shutil
+ egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
+ url = download_base + egg_name
+ saveto = os.path.join(to_dir, egg_name)
+ src = dst = None
+ if not os.path.exists(saveto): # Avoid repeated downloads
+ try:
+ from distutils import log
+ if delay:
+ log.warn("""
+---------------------------------------------------------------------------
+This script requires setuptools version %s to run (even to display
+help). I will attempt to download it for you (from
+%s), but
+you may need to enable firewall access for this script first.
+I will start the download in %d seconds.
+
+(Note: if this machine does not have network access, please obtain the file
+
+ %s
+
+and place it in this directory before rerunning this script.)
+---------------------------------------------------------------------------""",
+ version, download_base, delay, url
+ ); from time import sleep; sleep(delay)
+ log.warn("Downloading %s", url)
+ src = urllib2.urlopen(url)
+ # Read/write all in one block, so we don't create a corrupt file
+ # if the download is interrupted.
+ data = _validate_md5(egg_name, src.read())
+ dst = open(saveto,"wb"); dst.write(data)
+ finally:
+ if src: src.close()
+ if dst: dst.close()
+ return os.path.realpath(saveto)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+def main(argv, version=DEFAULT_VERSION):
+ """Install or upgrade setuptools and EasyInstall"""
+ try:
+ import setuptools
+ except ImportError:
+ egg = None
+ try:
+ egg = download_setuptools(version, delay=0)
+ sys.path.insert(0,egg)
+ from setuptools.command.easy_install import main
+ return main(list(argv)+[egg]) # we're done here
+ finally:
+ if egg and os.path.exists(egg):
+ os.unlink(egg)
+ else:
+ if setuptools.__version__ == '0.0.1':
+ print >>sys.stderr, (
+ "You have an obsolete version of setuptools installed. Please\n"
+ "remove it from your system entirely before rerunning this script."
+ )
+ sys.exit(2)
+
+ req = "setuptools>="+version
+ import pkg_resources
+ try:
+ pkg_resources.require(req)
+ except pkg_resources.VersionConflict:
+ try:
+ from setuptools.command.easy_install import main
+ except ImportError:
+ from easy_install import main
+ main(list(argv)+[download_setuptools(delay=0)])
+ sys.exit(0) # try to force an exit
+ else:
+ if argv:
+ from setuptools.command.easy_install import main
+ main(argv)
+ else:
+ print "Setuptools version",version,"or greater has been installed."
+ print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
+
+def update_md5(filenames):
+ """Update our built-in md5 registry"""
+
+ import re
+
+ for name in filenames:
+ base = os.path.basename(name)
+ f = open(name,'rb')
+ md5_data[base] = md5(f.read()).hexdigest()
+ f.close()
+
+ data = [" %r: %r,\n" % it for it in md5_data.items()]
+ data.sort()
+ repl = "".join(data)
+
+ import inspect
+ srcfile = inspect.getsourcefile(sys.modules[__name__])
+ f = open(srcfile, 'rb'); src = f.read(); f.close()
+
+ match = re.search("\nmd5_data = {\n([^}]+)}", src)
+ if not match:
+ print >>sys.stderr, "Internal error!"
+ sys.exit(2)
+
+ src = src[:match.start(1)] + repl + src[match.end(1):]
+ f = open(srcfile,'w')
+ f.write(src)
+ f.close()
+
+
+if __name__=='__main__':
+ if len(sys.argv)>2 and sys.argv[1]=='--md5update':
+ update_md5(sys.argv[2:])
+ else:
+ main(sys.argv[1:])
+
+
+
+
+
+
=== modified file 'setup.py'
--- setup.py 2011-12-11 22:50:39 +0000
+++ setup.py 2012-05-02 10:44:24 +0000
@@ -15,22 +15,29 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# GNU General Public License version 3 (see the file LICENSE).
-from distutils.core import setup
+# 'Yay for Python packaging' dead chicken.
+try:
+ from setuptools import setup, find_packages
+except ImportError:
+ import ez_setup
+ ez_setup.use_setuptools()
+ from setuptools import setup, find_packages
+
import os.path
description = file(
os.path.join(os.path.dirname(__file__), 'README'), 'rb').read()
-setup(name="lazr_postgresql",
- version="0.0.1",
+setup(name="lazr.postgresql",
+ version="0.0.2",
description=\
"LAZR postgresql specific support code.",
long_description=description,
maintainer="Launchpad Developers",
maintainer_email="launchpad-dev@xxxxxxxxxxxxxxxxxxx",
url="https://launchpad.net/lazr-postgresql";,
- packages=['lazr_postgresql'],
- package_dir={'':'.'},
+ packages=find_packages('src'),
+ package_dir={'':'src'},
classifiers=[
'Development Status :: 2 - Pre-Alpha',
'Intended Audience :: Developers',
@@ -41,7 +48,6 @@
install_requires=[
'bzr',
'psycopg2',
- 'pytz',
],
extras_require=dict(
test=[
@@ -52,6 +58,6 @@
),
entry_points=dict(
console_scripts=[ # `console_scripts` is a magic name to setuptools
- 'lp-migrate = lazr_postgresql.migrate:main',
+ 'lp-migrate = lazr.postgresql.migrate:main',
]),
)
=== added directory 'src'
=== added directory 'src/lazr'
=== added file 'src/lazr/__init__.py'
--- src/lazr/__init__.py 1970-01-01 00:00:00 +0000
+++ src/lazr/__init__.py 2012-05-02 10:44:24 +0000
@@ -0,0 +1,22 @@
+# Copyright (c) 2012, Canonical Ltd. All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 only.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License version 3 (see the file LICENSE).
+
+# namespace package dead chicken.
+try:
+ import pkg_resources
+ pkg_resources.declare_namespace(__name__)
+except ImportError:
+ import pkgutil
+ __path__ = pkgutil.extend_path(__path__, __name__)
=== renamed directory 'lazr_postgresql' => 'src/lazr/postgresql'
=== modified file 'src/lazr/postgresql/__init__.py'
--- lazr_postgresql/__init__.py 2011-12-01 07:07:57 +0000
+++ src/lazr/postgresql/__init__.py 2012-05-02 10:44:24 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, Canonical Ltd
+# Copyright (c) 2011-2012, Canonical Ltd
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
# established at this point, and setup.py will use a version of next-$(revno).
# If the releaselevel is 'final', then the tarball will be major.minor.micro.
# Otherwise it is major.minor.micro~$(revno).
-__version__ = (0, 0, 1, 'beta', 0)
+__version__ = (0, 0, 2, 'alpha', 0)
__all__ = [
]
=== modified file 'src/lazr/postgresql/migrate.py'
--- lazr_postgresql/migrate.py 2011-12-12 04:01:03 +0000
+++ src/lazr/postgresql/migrate.py 2012-05-02 10:44:24 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Canonical Ltd
+# Copyright (c) 2011-2012, Canonical Ltd
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
import psycopg2
-from lazr_postgresql import upgrade
+from lazr.postgresql import upgrade
__all__ = [
'main',
@@ -85,7 +85,7 @@
level = logging.DEBUG
logging.basicConfig(level=level)
if len(args) != 2:
- raise ValueError("Unexpected number of arguments. got %r" % (args,))
+ parser.error("Unexpected number of arguments. got %r" % (args,))
return upgrade.upgrade(
partial(psycopg2.connect, args[0]), args[1], options.dry_run,
options.slony_cluster_name, options.patch_type, options.apply_all,
=== modified file 'src/lazr/postgresql/tests/__init__.py'
--- lazr_postgresql/tests/__init__.py 2011-12-11 22:50:39 +0000
+++ src/lazr/postgresql/tests/__init__.py 2012-05-02 10:44:24 +0000
@@ -13,7 +13,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# GNU General Public License version 3 (see the file LICENSE).
-"""Tests for lazr_postgresql."""
+"""Tests for lazr.postgresql."""
import os
@@ -40,4 +40,4 @@
]
loader = testresources.TestLoader()
return loader.loadTestsFromNames(
- ['lazr_postgresql.tests.test_' + name for name in test_mod_names])
+ ['lazr.postgresql.tests.test_' + name for name in test_mod_names])
=== modified file 'src/lazr/postgresql/tests/test_migrate.py'
--- lazr_postgresql/tests/test_migrate.py 2011-12-12 03:40:05 +0000
+++ src/lazr/postgresql/tests/test_migrate.py 2012-05-02 10:44:24 +0000
@@ -21,8 +21,8 @@
MonkeyPatch,
)
-from lazr_postgresql.tests import ResourcedTestCase
-from lazr_postgresql.migrate import main
+from lazr.postgresql.tests import ResourcedTestCase
+from lazr.postgresql.migrate import main
class TestMain(ResourcedTestCase):
@@ -42,7 +42,7 @@
patch_types, apply_all, one_only))
return 0
self.useFixture(
- MonkeyPatch('lazr_postgresql.upgrade.upgrade', upgrade))
+ MonkeyPatch('lazr.postgresql.upgrade.upgrade', upgrade))
self.assertEqual(0, main(argv))
self.assertEqual([
'connstring',
=== modified file 'src/lazr/postgresql/tests/test_upgrade.py'
--- lazr_postgresql/tests/test_upgrade.py 2011-12-12 03:48:30 +0000
+++ src/lazr/postgresql/tests/test_upgrade.py 2012-05-02 10:44:24 +0000
@@ -42,11 +42,11 @@
StartsWith,
)
-from lazr_postgresql.tests import (
+from lazr.postgresql.tests import (
db_resource,
ResourcedTestCase,
)
-from lazr_postgresql.upgrade import (
+from lazr.postgresql.upgrade import (
apply_patches_normal,
CannotApply,
missing_patches,
@@ -74,7 +74,7 @@
self.useFixture(fake_slony_status(self.log, self.slony_enabled))
self.logger = self.useFixture(FakeLogger())
self.patchdir = self.useFixture(TempDir()).path
- module_name = 'lazr_postgresql.upgrade.'
+ module_name = 'lazr.postgresql.upgrade.'
def patch_function(name, result=None, results=None):
def f(*params):
self.log.append((name,) + params)
@@ -103,7 +103,7 @@
def slony_installed(con, name):
log.append(('slony_installed', con, name))
return enabled
- fqn = 'lazr_postgresql.slony.slony_installed'
+ fqn = 'lazr.postgresql.slony.slony_installed'
return MonkeyPatch(fqn, slony_installed)
@@ -410,7 +410,7 @@
calls.append(patch_types)
return []
self.useFixture(MonkeyPatch(
- 'lazr_postgresql.upgrade.missing_patches', missing_patches))
+ 'lazr.postgresql.upgrade.missing_patches', missing_patches))
apply_patches_normal(con, patchdir, patch_types=[PATCH_STANDARD])
self.assertEqual([[PATCH_STANDARD]], calls)
@@ -424,7 +424,7 @@
calls.append(one_only)
return []
self.useFixture(MonkeyPatch(
- 'lazr_postgresql.upgrade.missing_patches', missing_patches))
+ 'lazr.postgresql.upgrade.missing_patches', missing_patches))
apply_patches_normal(con, patchdir, one_only=True)
self.assertEqual([True], calls)
=== modified file 'src/lazr/postgresql/upgrade.py'
--- lazr_postgresql/upgrade.py 2011-12-12 04:01:03 +0000
+++ src/lazr/postgresql/upgrade.py 2012-05-02 10:44:24 +0000
@@ -24,7 +24,7 @@
import bzrlib.branch
import bzrlib.errors
-from lazr_postgresql import slony
+from lazr.postgresql import slony
__all__ = [
'CannotApply',
@@ -97,7 +97,7 @@
slony_cluster_name = 'sl'
con = connect()
try:
- log = logging.getLogger("lazr_postgresql.upgrade")
+ log = logging.getLogger("lazr.postgresql.upgrade")
finished = False
slony_installed = slony.slony_installed(con, slony_cluster_name)
if dry_run:
@@ -145,7 +145,7 @@
def get_patch(patch):
"""Get the SQL to apply a single patch directly or via slonik."""
- log = logging.getLogger("lazr_postgresql.upgrade")
+ log = logging.getLogger("lazr.postgresql.upgrade")
(major, minor, point), filename, type = patch
if filename is None:
patch_content = META_PATCHES[(major, minor, point)]
@@ -204,7 +204,7 @@
def apply_patches_normal(con, patches_dir, patch_types=None, one_only=False):
"""Apply patches to a DB in a transaction on one node."""
- log = logging.getLogger("lazr_postgresql.upgrade")
+ log = logging.getLogger("lazr.postgresql.upgrade")
patches = missing_patches(
con, patches_dir, patch_types=patch_types, one_only=one_only)
if not patches:
@@ -295,7 +295,7 @@
"""Repoty how long patches took to run."""
if not patches:
return
- log = logging.getLogger("lazr_postgresql.upgrade")
+ log = logging.getLogger("lazr.postgresql.upgrade")
cur = con.cursor()
sql_patches = "(%s)" % ",".join("(%s, %s, %s)" % patch[0]
for patch in patches)
=== modified file 'versions.cfg'
--- versions.cfg 2011-12-07 03:07:33 +0000
+++ versions.cfg 2012-05-02 10:44:24 +0000
@@ -4,9 +4,9 @@
[versions]
bzr = 2.5.0dev3-r6220
fixtures = 0.3.8
-iso8601 = 0.1.4
+#iso8601 = 0.1.4
psycopg2 = 2.4.1
-pytz = 2010o
+#pytz = 2012c
setuptools = 0.6c11
testresources = 0.2.4-r58
testtools = 0.9.12-r228
