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 --- .../python/python-psycopg2/remove-pg-config.patch | 7 ++++--- .../recipes-devtools/python/python-psycopg2_2.6.2.bb | 19 ------------------- .../recipes-devtools/python/python-psycopg2_2.7.4.bb | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 meta-openstack/recipes-devtools/python/python-psycopg2_2.6.2.bb create mode 100644 meta-openstack/recipes-devtools/python/python-psycopg2_2.7.4.bb (limited to 'meta-openstack/recipes-devtools/python') 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 diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.2.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.2.bb deleted file mode 100644 index 37a4bdd..0000000 --- a/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Python-PostgreSQL Database Adapter" -HOMEPAGE = "http://initd.org/psycopg/" -SECTION = "devel/python" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2c9872d13fa571e7ba6de95055da1fe2" -DEPENDS = "postgresql" - -SRC_URI += " \ - file://remove-pg-config.patch \ - " - -SRC_URI[md5sum] = "4a392949ba31a378a18ed3e775a4693f" -SRC_URI[sha256sum] = "70490e12ed9c5c818ecd85d185d363335cc8a8cbf7212e3c185431c79ff8c05c" - -inherit distutils pypi - -DEPENDS += " \ - postgresql \ -" diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.4.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.4.bb new file mode 100644 index 0000000..674322d --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.4.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Python-PostgreSQL Database Adapter" +HOMEPAGE = "http://initd.org/psycopg/" +SECTION = "devel/python" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c9872d13fa571e7ba6de95055da1fe2" +DEPENDS = "postgresql" + +SRC_URI += " \ + file://remove-pg-config.patch \ + " + +SRC_URI[md5sum] = "70fc57072e084565a42689d416cf2c5c" +SRC_URI[sha256sum] = "8bf51191d60f6987482ef0cfe8511bbf4877a5aa7f313d7b488b53189cf26209" + +inherit distutils pypi + +DEPENDS += " \ + postgresql \ +" -- cgit v1.2.3-54-g00ecf