From 6011872aa594fae61451c2f0977d040d9db6f809 Mon Sep 17 00:00:00 2001 From: Viktor Dick Date: Wed, 15 Jan 2020 10:23:53 +0100 Subject: [PATCH] Set version to correctly reflect upstream. --- CHANGES.txt | 6 ++++++ Products/ZPsycopgDA/__init__.py | 2 +- setup.py | 14 +++++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index a7ed878..b9ab0c7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,12 @@ Changelog ========= +2.4.7.dev1+perfact.1 +------------------- +Collection of PerFact patches to the Product, including reorganization of how +pooling works. + + 2.4.7 ------------------- diff --git a/Products/ZPsycopgDA/__init__.py b/Products/ZPsycopgDA/__init__.py index e1d4ecf..e5ded6c 100644 --- a/Products/ZPsycopgDA/__init__.py +++ b/Products/ZPsycopgDA/__init__.py @@ -16,7 +16,7 @@ # their work without bothering about the module dependencies. __doc__ = "ZPsycopg Database Adapter Registration." -__version__ = '2.4.7.dev1' +__version__ = '2.4.7.dev1+perfact.1' # Python2 backward compatibility try: diff --git a/setup.py b/setup.py index b63ddd0..d81794e 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,17 @@ from setuptools import setup +# Get the version number from the package +f = open('Products/ZPsycopgDA/__init__.py') +try: + for line in f: + if line.startswith('__version__'): + version = line.split()[-1].replace("'", "") + break + else: + raise ValueError('__version__ not found') +finally: + f.close() + long_description = ( open('README.rst').read() + '\n' + @@ -14,7 +26,7 @@ setup( name='Products.ZPsycopgDA', - version='3.0', + version=version, description="Zope bindings for psycopg2.", long_description=long_description, # Get more strings from