Skip to contentSkip to conversation

remove unneeded python2 recipes

PATCH In review Robert Yang 5 participants 15 messages May 24, 2016 – May 25, 2016

lore
Share & tools
lore
#0 lore raw

cover remove unneeded python2 recipes

They were required by buildtools-tarball, now replaced by python3 ones.

// Robert

The following changes since commit d6241e4c94a0a72acfc57e96a59918c0b2146d65:

useradd: Fix infinite build loop (2016-05-23 10:33:39 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/py3
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/py3

Robert Yang (6):
packagegroup-self-hosted.bb: python-git -> python3-git
python-pexpect: remove it
python-async: remove it
python-smmap: remove it
python-gitdb: remove it
python-git: remove it

 .../packagegroups/packagegroup-self-hosted.bb      |  2 +-
 meta/recipes-devtools/python/python-async.inc      | 15 -------------
 meta/recipes-devtools/python/python-async_0.6.2.bb |  5 -----
 meta/recipes-devtools/python/python-git.inc        | 21 ------------------
 meta/recipes-devtools/python/python-git_1.0.2.bb   |  8 -------
 meta/recipes-devtools/python/python-gitdb.inc      | 16 --------------
 meta/recipes-devtools/python/python-gitdb_0.6.4.bb |  7 ------
 .../python/python-pexpect_4.0.1.bb                 | 25 ----------------------
 meta/recipes-devtools/python/python-smmap.inc      | 19 ----------------
 meta/recipes-devtools/python/python-smmap_0.9.0.bb |  5 -----
 .../recipes-devtools/python/python3-async_0.6.2.bb | 16 +++++++++++++-
 meta/recipes-devtools/python/python3-git_1.0.2.bb  | 21 +++++++++++++++++-
 .../recipes-devtools/python/python3-gitdb_0.6.4.bb | 17 ++++++++++++++-
 .../recipes-devtools/python/python3-smmap_0.9.0.bb | 20 ++++++++++++++++-
 14 files changed, 71 insertions(+), 126 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-async.inc
 delete mode 100644 meta/recipes-devtools/python/python-async_0.6.2.bb
 delete mode 100644 meta/recipes-devtools/python/python-git.inc
 delete mode 100644 meta/recipes-devtools/python/python-git_1.0.2.bb
 delete mode 100644 meta/recipes-devtools/python/python-gitdb.inc
 delete mode 100644 meta/recipes-devtools/python/python-gitdb_0.6.4.bb
 delete mode 100644 meta/recipes-devtools/python/python-pexpect_4.0.1.bb
 delete mode 100644 meta/recipes-devtools/python/python-smmap.inc
 delete mode 100644 meta/recipes-devtools/python/python-smmap_0.9.0.bb
Signature · 1 line
2.8.0
#1 lore raw

PATCH 1/6 packagegroup-self-hosted.bb: python-git -> python3-git

---
 meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +1 -1
index aa88cf9..829ed23 100644
@@ -153,7 +153,7 @@ RDEPENDS_packagegroup-self-hosted-extended = "\
     perl-pod \
     python \
     python-compiler \
-    python-git \
+    python3-git \
     python-misc \
     python-modules \
     python-rpm \
Signature · 1 line
2.8.0
#2 lore raw

PATCH 2/6 python-pexpect: remove it

In reply to Robert Yang

It was needed by buildtools-tarball, no one requires it any more now.

---
 .../python/python-pexpect_4.0.1.bb                 | 25 ----------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-pexpect_4.0.1.bb
meta/recipes-devtools/python/python-pexpect_4.0.1.bb deleted +0 -25
deleted file mode 100644
index 7f142a3..0000000
@@ -1,25 +0,0 @@
-SUMMARY = "A Pure Python Expect like Module for Python"
-HOMEPAGE = "http://pexpect.readthedocs.org/"
-SECTION = "devel/python"
-LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=66c2378a96b307d56bfb3a9e58edafa8"
-
-SRC_URI = "https://pypi.python.org/packages/source/p/pexpect/pexpect-${PV}.tar.gz"
-SRC_URI[md5sum] = "056df81e6ca7081f1015b4b147b977b7"
-SRC_URI[sha256sum] = "232795ebcaaf2e120396dbbaa3a129eda51757eeaae1911558f4ef8ee414fc6c"
-
-UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/pexpect"
-
-S = "${WORKDIR}/pexpect-${PV}"
-
-inherit distutils
-
-RDEPENDS_${PN} = "\
-    python-core \
-    python-io \
-    python-terminal \
-    python-resource \
-    python-fcntl \
-"
-
-BBCLASSEXTEND = "nativesdk"
Signature · 1 line
2.8.0
#3 lore raw

PATCH 3/6 python-async: remove it

In reply to Robert Yang

It was needed by python-git, no one requires it any more now.

---
 meta/recipes-devtools/python/python-async.inc       | 15 ---------------
 meta/recipes-devtools/python/python-async_0.6.2.bb  |  5 -----
 meta/recipes-devtools/python/python3-async_0.6.2.bb | 16 +++++++++++++++-
 3 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-async.inc
 delete mode 100644 meta/recipes-devtools/python/python-async_0.6.2.bb
meta/recipes-devtools/python/python-async.inc deleted +0 -15
deleted file mode 100644
index d80606a..0000000
@@ -1,15 +0,0 @@
-SUMMARY = "Python framework to process interdependent tasks in a pool of workers"
-HOMEPAGE = "http://github.com/gitpython-developers/async"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=88df8e78b9edfd744953862179f2d14e"
-
-SRC_URI = "http://pypi.python.org/packages/source/a/async/async-${PV}.tar.gz"
-SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b"
-SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051"
-
-UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/async/"
-
-S = "${WORKDIR}/async-${PV}"
-
-BBCLASSEXTEND = "nativesdk"
meta/recipes-devtools/python/python-async_0.6.2.bb deleted +0 -5
deleted file mode 100644
index d855e42..0000000
@@ -1,5 +0,0 @@
-require python-async.inc
-
-inherit setuptools
-
-RDEPENDS_${PN} += "python-threading python-lang"
meta/recipes-devtools/python/python3-async_0.6.2.bb +15 -1
index 54a30f5..6c1ac39 100644
@@ -1,4 +1,18 @@
-require python-async.inc
+SUMMARY = "Python framework to process interdependent tasks in a pool of workers"
+HOMEPAGE = "http://github.com/gitpython-developers/async"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=88df8e78b9edfd744953862179f2d14e"
+
+SRC_URI = "http://pypi.python.org/packages/source/a/async/async-${PV}.tar.gz"
+SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b"
+SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051"
+
+UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/async/"
+
+S = "${WORKDIR}/async-${PV}"
+
+BBCLASSEXTEND = "nativesdk"
 
 inherit setuptools3
 
Signature · 1 line
2.8.0
#4 lore raw

PATCH 4/6 python-smmap: remove it

In reply to Robert Yang

It was needed by python-gitdb, no one requires it any more now.

---
 meta/recipes-devtools/python/python-smmap.inc       | 19 -------------------
 meta/recipes-devtools/python/python-smmap_0.9.0.bb  |  5 -----
 meta/recipes-devtools/python/python3-smmap_0.9.0.bb | 20 +++++++++++++++++++-
 3 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-smmap.inc
 delete mode 100644 meta/recipes-devtools/python/python-smmap_0.9.0.bb
meta/recipes-devtools/python/python-smmap.inc deleted +0 -19
deleted file mode 100644
index 5b2ac74..0000000
@@ -1,19 +0,0 @@
-SUMMARY = "Python implementation of a sliding window memory map manager"
-DESCRIPTION = "A pure Python implementation of a sliding memory map to \
-help unifying memory mapped access on 32 and 64 bit systems and to help \
-managing resources more efficiently."
-HOMEPAGE = "http://github.com/gitpython-developers/GitPython"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709"
-
-SRC_URI = "http://pypi.python.org/packages/source/s/smmap/smmap-${PV}.tar.gz"
-SRC_URI[md5sum] = "d7932d5ace206bf4ae15198cf36fb6ab"
-SRC_URI[sha256sum] = "0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62"
-
-UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/smmap/"
-UPSTREAM_CHECK_REGEX = "/smmap/(?P<pver>(\d+[\.\-_]*)+)"
-
-S = "${WORKDIR}/smmap-${PV}"
-
-BBCLASSEXTEND = "nativesdk"
meta/recipes-devtools/python/python-smmap_0.9.0.bb deleted +0 -5
deleted file mode 100644
index c118dd8..0000000
@@ -1,5 +0,0 @@
-require python-smmap.inc
-
-inherit setuptools
-
-RDEPENDS_${PN} += "python-codecs python-mmap python-lang"
meta/recipes-devtools/python/python3-smmap_0.9.0.bb +19 -1
index 9f8a26d..c6b0755 100644
@@ -1,4 +1,22 @@
-require python-smmap.inc
+SUMMARY = "Python implementation of a sliding window memory map manager"
+DESCRIPTION = "A pure Python implementation of a sliding memory map to \
+help unifying memory mapped access on 32 and 64 bit systems and to help \
+managing resources more efficiently."
+HOMEPAGE = "http://github.com/gitpython-developers/GitPython"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709"
+
+SRC_URI = "http://pypi.python.org/packages/source/s/smmap/smmap-${PV}.tar.gz"
+SRC_URI[md5sum] = "d7932d5ace206bf4ae15198cf36fb6ab"
+SRC_URI[sha256sum] = "0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62"
+
+UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/smmap/"
+UPSTREAM_CHECK_REGEX = "/smmap/(?P<pver>(\d+[\.\-_]*)+)"
+
+S = "${WORKDIR}/smmap-${PV}"
+
+BBCLASSEXTEND = "nativesdk"
 
 inherit setuptools3
 
Signature · 1 line
2.8.0
#5 lore raw

PATCH 5/6 python-gitdb: remove it

In reply to Robert Yang

It was needed by python-git, no one requires it any more now.

---
 meta/recipes-devtools/python/python-gitdb.inc       | 16 ----------------
 meta/recipes-devtools/python/python-gitdb_0.6.4.bb  |  7 -------
 meta/recipes-devtools/python/python3-gitdb_0.6.4.bb | 17 ++++++++++++++++-
 3 files changed, 16 insertions(+), 24 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-gitdb.inc
 delete mode 100644 meta/recipes-devtools/python/python-gitdb_0.6.4.bb
meta/recipes-devtools/python/python-gitdb.inc deleted +0 -16
deleted file mode 100644
index 6467bd2..0000000
@@ -1,16 +0,0 @@
-SUMMARY = "A pure-Python git object database"
-HOMEPAGE = "http://github.com/gitpython-developers/gitdb"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=59e5ecb13339a936eedf83282eaf4528"
-
-SRC_URI = "https://pypi.python.org/packages/source/g/gitdb/gitdb-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "44e4366b8bdfd306b075c3a52c96ae1a"
-SRC_URI[sha256sum] = "a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658"
-
-UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/gitdb/"
-
-S = "${WORKDIR}/gitdb-${PV}"
-
-BBCLASSEXTEND = "nativesdk"
meta/recipes-devtools/python/python-gitdb_0.6.4.bb deleted +0 -7
deleted file mode 100644
index 1777395..0000000
@@ -1,7 +0,0 @@
-require python-gitdb.inc
-
-DEPENDS = "python-async python-smmap"
-
-inherit distutils
-
-RDEPENDS_${PN} += "python-smmap python-async python-mmap python-lang python-zlib python-io python-shell"
meta/recipes-devtools/python/python3-gitdb_0.6.4.bb +16 -1
index 9927658..0e6508f 100644
@@ -1,4 +1,19 @@
-require python-gitdb.inc
+SUMMARY = "A pure-Python git object database"
+HOMEPAGE = "http://github.com/gitpython-developers/gitdb"
+SECTION = "devel/python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=59e5ecb13339a936eedf83282eaf4528"
+
+SRC_URI = "https://pypi.python.org/packages/source/g/gitdb/gitdb-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "44e4366b8bdfd306b075c3a52c96ae1a"
+SRC_URI[sha256sum] = "a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658"
+
+UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/gitdb/"
+
+S = "${WORKDIR}/gitdb-${PV}"
+
+BBCLASSEXTEND = "nativesdk"
 
 DEPENDS = "python3-async python3-smmap"
 
Signature · 1 line
2.8.0
#6 lore raw

PATCH 6/6 python-git: remove it

In reply to Robert Yang

It was needed by buildtools-tarball and packagegroup-self-hosted, no one requires it any more now.

---
 meta/recipes-devtools/python/python-git.inc       | 21 ---------------------
 meta/recipes-devtools/python/python-git_1.0.2.bb  |  8 --------
 meta/recipes-devtools/python/python3-git_1.0.2.bb | 21 ++++++++++++++++++++-
 3 files changed, 20 insertions(+), 30 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-git.inc
 delete mode 100644 meta/recipes-devtools/python/python-git_1.0.2.bb
meta/recipes-devtools/python/python-git.inc deleted +0 -21
deleted file mode 100644
index 72632b7..0000000
@@ -1,21 +0,0 @@
-SUMMARY = "Python library used to interact with Git repositories"
-DESCRIPTION = "GitPython provides object model read and write access to \
-a git repository. Access repository information conveniently, alter the \
-index directly, handle remotes, or go down to low-level object database \
-access with big-files support."
-HOMEPAGE = "http://github.com/gitpython-developers/GitPython"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183"
-
-SRC_URI = "http://pypi.python.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "d92d96a8da0fc77cf141d3e16084e094"
-SRC_URI[sha256sum] = "85de72556781480a38897a77de5b458ae3838b0fd589593679a1b5f34d181d84"
-
-UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/"
-UPSTREAM_CHECK_REGEX = "/GitPython/(?P<pver>(\d+[\.\-_]*)+)"
-
-S = "${WORKDIR}/GitPython-${PV}"
-
-BBCLASSEXTEND = "nativesdk"
meta/recipes-devtools/python/python-git_1.0.2.bb deleted +0 -8
deleted file mode 100644
index 5ca7713..0000000
@@ -1,8 +0,0 @@
-require python-git.inc
-
-DEPENDS = "python-gitdb"
-
-inherit setuptools
-
-RDEPENDS_${PN} += "python-gitdb python-lang python-io python-shell python-math python-re python-subprocess python-stringold python-unixadmin"
-
meta/recipes-devtools/python/python3-git_1.0.2.bb +20 -1
index 6620444..2eef462 100644
@@ -1,5 +1,24 @@
-require python-git.inc
+SUMMARY = "Python library used to interact with Git repositories"
+DESCRIPTION = "GitPython provides object model read and write access to \
+a git repository. Access repository information conveniently, alter the \
+index directly, handle remotes, or go down to low-level object database \
+access with big-files support."
+HOMEPAGE = "http://github.com/gitpython-developers/GitPython"
+SECTION = "devel/python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183"
 
+SRC_URI = "http://pypi.python.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "d92d96a8da0fc77cf141d3e16084e094"
+SRC_URI[sha256sum] = "85de72556781480a38897a77de5b458ae3838b0fd589593679a1b5f34d181d84"
+
+UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/"
+UPSTREAM_CHECK_REGEX = "/GitPython/(?P<pver>(\d+[\.\-_]*)+)"
+
+S = "${WORKDIR}/GitPython-${PV}"
+
+BBCLASSEXTEND = "nativesdk"
 DEPENDS = "python3-gitdb"
 
 inherit setuptools3
Signature · 1 line
2.8.0
#7 lore raw
In reply to Robert Yang

Hi Robert,

Quoted 1 line · On Mon, 23 May 2016 20:25:36 Robert Yang wrote:

They were required by buildtools-tarball, now replaced by python3 ones.

It's not so much that they are required by buildtools-tarball, they are required by various scripts that we have. When you say unneeded, I assume only on the python3 branch? In master python-git very definitely is still needed.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#8 lore raw

Hi Paul,

Quoted 8 lines · Paul Eggleton

Hi Robert,

Quoted 1 line · On Mon, 23 May 2016 20:25:36 Robert Yang wrote:

They were required by buildtools-tarball, now replaced by python3 ones.

It's not so much that they are required by buildtools-tarball, they are required by various scripts that we have. When you say unneeded, I assume only on the python3 branch? In master python-git very definitely is still needed.

I'm afraid no, my previous patch had been merged on master branch, so I think that python-git and others are not needed any more ?

commit 9f921676a7cfac93117788b8dfeff652dfd65134

Author: Robert Yang <[email protected]>
Date:   Wed May 18 00:43:44 2016 -0700

buildtools-tarball: replace nativesdk-python with nativesdk-python3

(From OE-Core rev: 97b5b150b3d3e82a5a42c1ea4351eed60aba7906)

// Robert

Quoted 4 lines

Cheers,
Paul

#9 lore raw
Quoted 11 lines · On Tue, 24 May 2016 11:38:24 Robert Yang wrote:
Quoted 7 lines · Paul Eggleton
Quoted 1 line · On Mon, 23 May 2016 20:25:36 Robert Yang wrote:

They were required by buildtools-tarball, now replaced by python3 ones.

It's not so much that they are required by buildtools-tarball, they are required by various scripts that we have. When you say unneeded, I assume only on the python3 branch? In master python-git very definitely is still needed.

I'm afraid no, my previous patch had been merged on master branch, so I think that python-git and others are not needed any more ?

I had missed that change; that puts us into a bit of an interesting situation. buildtools-tarball is provided in order to support bitbake builds on hosts that don't have the required tools, but the changes required to support python 3 in the build system itself haven't been merged to master yet. So unless I'm missing something at the moment have a version of buildtools that doesn't actually support running the build system?

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#10 lore raw
Quoted 13 lines · Paul Eggleton
Quoted 11 lines · On Tue, 24 May 2016 11:38:24 Robert Yang wrote:
Quoted 7 lines · Paul Eggleton
Quoted 1 line · On Mon, 23 May 2016 20:25:36 Robert Yang wrote:

They were required by buildtools-tarball, now replaced by python3 ones.

It's not so much that they are required by buildtools-tarball, they are required by various scripts that we have. When you say unneeded, I assume only on the python3 branch? In master python-git very definitely is still needed.

I'm afraid no, my previous patch had been merged on master branch, so I think that python-git and others are not needed any more ?

Quoted 6 lines

I had missed that change; that puts us into a bit of an interesting situation. buildtools-tarball is provided in order to support bitbake builds on hosts that don't have the required tools, but the changes required to support python 3 in the build system itself haven't been merged to master yet. So unless I'm missing something at the moment have a version of buildtools that doesn't actually support running the build system?

At the moment, I think yes.

// Robert

Quoted 4 lines

Cheers,
Paul

#11 lore raw
In reply to Paul Eggleton
Quoted 11 lines · Paul Eggleton

I had missed that change; that puts us into a bit of an interesting situation.
buildtools-tarball is provided in order to support bitbake builds on hosts
that don't have the required tools, but the changes required to support python
3 in the build system itself haven't been merged to master yet. So unless I'm
missing something at the moment have a version of buildtools that doesn't
actually support running the build system?

Its a chicken and egg problem in that we have autobuilders which don't have python3 of the right version. Rather than build a special version of the tarball from a branch, I merged this patch set on the basis that anyone needing a python2 tarball could easily us the version from before the patches merged and that we would be moving to python3 soon everywhere.

Cheers,

Richard

#12 lore raw
In reply to Robert Yang
Quoted 1 line · Robert Yang

They were required by buildtools-tarball, now replaced by python3 ones.

Do you plan to add those recipes to meta-python?

I think quite a few of them are usefull for quite some situations.

Cheers,
Anders

Signature · 2 lines
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB
#13 lore raw
Quoted 7 lines · Anders Darander
Quoted 1 line · Robert Yang

They were required by buildtools-tarball, now replaced by python3 ones.

Do you plan to add those recipes to meta-python?

I think quite a few of them are usefull for quite some situations.

I will add them there if meta-python is happy.

// Robert

Quoted 4 lines

Cheers,
Anders

#14 lore raw
In reply to Anders Darander
Quoted 7 lines · Robert Yang
Quoted 2 lines

They were required by buildtools-tarball, now replaced by python3 ones.

Do you plan to add those recipes to meta-python?

I think quite a few of them are usefull for quite some situations.

Oe-core does provide Python 3 versions of these recipes. Does meta-python really need to add more Python 2 stuff which may not be actually used by anyone? Maybe it's time to draw the line?

Alex