From cd57621be047996376be1b08212b0a7795c66174 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Fri, 23 Mar 2018 11:28:54 +0800 Subject: python-psycopg2: 2.6.2 -> 2.7.4 1.Upgrade python-psycopg2 from 2.6.2 to 2.7.4. 2.Modify remove-pg-config.patch, since the data has been changed. Signed-off-by: Huang Qiyu Signed-off-by: Bruce Ashfield --- .../recipes-devtools/python/python-psycopg2/remove-pg-config.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch') diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch b/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch index 37acc30..8f426f5 100644 --- a/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch +++ b/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch @@ -14,13 +14,14 @@ diff --git a/setup.cfg b/setup.cfg index d00ce92..4b45aac 100644 --- a/setup.cfg +++ b/setup.cfg -@@ -1,5 +1,6 @@ +@@ -1,6 +1,6 @@ [build_ext] define = +-pg_config = +pg_config="/bin/true" use_pydatetime = 1 + mx_include_dir = have_ssl = 0 - diff --git a/setup.py b/setup.py index d71d489..b101696 100644 --- a/setup.py @@ -42,7 +43,7 @@ index d71d489..b101696 100644 + pgversion = "9.4.4" verre = re.compile( - r"(\d+)\.(\d+)(?:(?:\.(\d+))|(devel|(alpha|beta|rc)\d+))") + r"(\d+)(?:\.(\d+))?(?:(?:\.(\d+))|(devel|(?:alpha|beta|rc)\d+))?") -- 2.7.4 -- cgit v1.2.3-54-g00ecf