[meta-cloud-services][PATCH] python-django: uprev to 1.8.6

[meta-cloud-services][PATCH] python-django: uprev to 1.8.6

[Mark Asselstine]

Move to use git to ease future uprevs. Note that a recipe for django
exists in meta-python and since it is a versioned recipe instead of a
"_git" recipe it seems to be picked up instead of our recipe, so we
need to add a PREFERRED_VERSION to ensure our recipe is used.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 meta-openstack/conf/layer.conf                                |  1 +
 .../python/{python-django_1.7.5.bb => python-django_git.bb}   | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-django_1.7.5.bb => python-django_git.bb} (51%)

diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index 2b3a00d..f0d42b8 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -14,3 +14,4 @@ BB_DANGLINGAPPENDS_WARNONLY ?= "true"
 PREFERRED_VERSION_python-greenlet = "0.4.1"
 PREFERRED_VERSION_python-sqlalchemy = "0.9.7"
 PREFERRED_VERSION_python-pexpect = "3.3"
+PREFERRED_VERSION_python-django = "1.8.6"
diff --git a/meta-openstack/recipes-devtools/python/python-django_1.7.5.bb b/meta-openstack/recipes-devtools/python/python-django_git.bb
similarity index 51%
rename from meta-openstack/recipes-devtools/python/python-django_1.7.5.bb
rename to meta-openstack/recipes-devtools/python/python-django_git.bb
index b462e4d..f11f8e6 100644
--- a/meta-openstack/recipes-devtools/python/python-django_1.7.5.bb
+++ b/meta-openstack/recipes-devtools/python/python-django_git.bb
@@ -6,13 +6,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa"
 
 SRCNAME = "Django"
 
-SRC_URI = "https://pypi.python.org/packages/source/D/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-"
+PV = "1.8.6"
+SRCREV = "80b7e9d09f2d23209b591288f9b2cf3eb3d927c8"
 
-SRC_URI[md5sum] = "e76c70a5dd7d56a511974b28ab38df20"
-SRC_URI[sha256sum] = "1c391f9349c97df503dac3461599f24235e4d04393498e6060e74dd2721460bc"
+SRC_URI = " \
+    git://github.com/django/django.git;branch=stable/1.8.x \
+    "
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${WORKDIR}/git"
 
 inherit setuptools
 
-- 
2.1.4

Re: [meta-cloud-services][PATCH] python-django: uprev to 1.8.6

[Mark Asselstine]

Note that this is the first of *many* changes I will be sending to
move master to the point where the liberty release has been forked. At
the end of it all we will be able to create a liberty branch and both
master and liberty can evolve from there.

I have most of the needed changes staged for this transition and
things are mostly working so I will start organizing my changes and
getting reviews out over the next week or so. I can't promise that
master won't be broken at times and that things will be bisect-able
throughout the series but I will try my best to keep things working
from commit to commit.

I will also try to leverage commits Josep and others have made on the
other branches. If I happen to miss a change someone already made on
another branch and thus duplicate their work I apologize in advance.
Trust me I don't want to duplicate any work so this would only happen
accidentally.

Regards,
Mark

On Wed, Dec 9, 2015 at 11:44 AM, Mark Asselstine
<mark.asselstine@windriver.com> wrote:
> Move to use git to ease future uprevs. Note that a recipe for django
> exists in meta-python and since it is a versioned recipe instead of a
> "_git" recipe it seems to be picked up instead of our recipe, so we
> need to add a PREFERRED_VERSION to ensure our recipe is used.
>
> Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> ---
>  meta-openstack/conf/layer.conf                                |  1 +
>  .../python/{python-django_1.7.5.bb => python-django_git.bb}   | 11 ++++++-----
>  2 files changed, 7 insertions(+), 5 deletions(-)
>  rename meta-openstack/recipes-devtools/python/{python-django_1.7.5.bb => python-django_git.bb} (51%)
>
> diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
> index 2b3a00d..f0d42b8 100644
> --- a/meta-openstack/conf/layer.conf
> +++ b/meta-openstack/conf/layer.conf
> @@ -14,3 +14,4 @@ BB_DANGLINGAPPENDS_WARNONLY ?= "true"
>  PREFERRED_VERSION_python-greenlet = "0.4.1"
>  PREFERRED_VERSION_python-sqlalchemy = "0.9.7"
>  PREFERRED_VERSION_python-pexpect = "3.3"
> +PREFERRED_VERSION_python-django = "1.8.6"
> diff --git a/meta-openstack/recipes-devtools/python/python-django_1.7.5.bb b/meta-openstack/recipes-devtools/python/python-django_git.bb
> similarity index 51%
> rename from meta-openstack/recipes-devtools/python/python-django_1.7.5.bb
> rename to meta-openstack/recipes-devtools/python/python-django_git.bb
> index b462e4d..f11f8e6 100644
> --- a/meta-openstack/recipes-devtools/python/python-django_1.7.5.bb
> +++ b/meta-openstack/recipes-devtools/python/python-django_git.bb
> @@ -6,13 +6,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa"
>
>  SRCNAME = "Django"
>
> -SRC_URI = "https://pypi.python.org/packages/source/D/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
> -"
> +PV = "1.8.6"
> +SRCREV = "80b7e9d09f2d23209b591288f9b2cf3eb3d927c8"
>
> -SRC_URI[md5sum] = "e76c70a5dd7d56a511974b28ab38df20"
> -SRC_URI[sha256sum] = "1c391f9349c97df503dac3461599f24235e4d04393498e6060e74dd2721460bc"
> +SRC_URI = " \
> +    git://github.com/django/django.git;branch=stable/1.8.x \
> +    "
>
> -S = "${WORKDIR}/${SRCNAME}-${PV}"
> +S = "${WORKDIR}/git"
>
>  inherit setuptools
>
> --
> 2.1.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization

Re: [meta-cloud-services][PATCH] python-django: uprev to 1.8.6

[Bruce Ashfield]

On 15-12-09 11:44 AM, Mark Asselstine wrote:
> Move to use git to ease future uprevs. Note that a recipe for django
> exists in meta-python and since it is a versioned recipe instead of a
> "_git" recipe it seems to be picked up instead of our recipe, so we
> need to add a PREFERRED_VERSION to ensure our recipe is used.

merged.

Bruce

>
> Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> ---
>   meta-openstack/conf/layer.conf                                |  1 +
>   .../python/{python-django_1.7.5.bb => python-django_git.bb}   | 11 ++++++-----
>   2 files changed, 7 insertions(+), 5 deletions(-)
>   rename meta-openstack/recipes-devtools/python/{python-django_1.7.5.bb => python-django_git.bb} (51%)
>
> diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
> index 2b3a00d..f0d42b8 100644
> --- a/meta-openstack/conf/layer.conf
> +++ b/meta-openstack/conf/layer.conf
> @@ -14,3 +14,4 @@ BB_DANGLINGAPPENDS_WARNONLY ?= "true"
>   PREFERRED_VERSION_python-greenlet = "0.4.1"
>   PREFERRED_VERSION_python-sqlalchemy = "0.9.7"
>   PREFERRED_VERSION_python-pexpect = "3.3"
> +PREFERRED_VERSION_python-django = "1.8.6"
> diff --git a/meta-openstack/recipes-devtools/python/python-django_1.7.5.bb b/meta-openstack/recipes-devtools/python/python-django_git.bb
> similarity index 51%
> rename from meta-openstack/recipes-devtools/python/pythongit-django_1.7.5.bb
> rename to meta-openstack/recipes-devtools/python/python-django_git.bb
> index b462e4d..f11f8e6 100644
> --- a/meta-openstack/recipes-devtools/python/python-django_1.7.5.bb
> +++ b/meta-openstack/recipes-devtools/python/python-django_git.bb
> @@ -6,13 +6,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa"
>
>   SRCNAME = "Django"
>
> -SRC_URI = "https://pypi.python.org/packages/source/D/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
> -"
> +PV = "1.8.6"
> +SRCREV = "80b7e9d09f2d23209b591288f9b2cf3eb3d927c8"
>
> -SRC_URI[md5sum] = "e76c70a5dd7d56a511974b28ab38df20"
> -SRC_URI[sha256sum] = "1c391f9349c97df503dac3461599f24235e4d04393498e6060e74dd2721460bc"
> +SRC_URI = " \
> +    git://github.com/django/django.git;branch=stable/1.8.x \
> +    "
>
> -S = "${WORKDIR}/${SRCNAME}-${PV}"
> +S = "${WORKDIR}/git"
>
>   inherit setuptools
>
>