merged. Bruce
On Tue, Nov 14, 2017 at 12:55 PM, Mark Asselstine <[email protected]> wrote: > Cleanup the various python-* recipes which download from pypi. The > biggest change is to "inherit pypi" which should result in us always > using current pypi best practices. This will for example ensure we are > using https and not http which is apparently going to be disabled > soon. > > Where the default behavior in the pypi class wasn't sufficient we make > use of the PYPI_* variables to overwrite the defaults. > > Signed-off-by: Mark Asselstine <[email protected]> > --- > recipes-devtools/python/python-gevent_1.0.1.bb | 7 +------ > recipes-devtools/python/python-m2crypto_0.22.3.bb | 11 +++++------ > recipes-devtools/python/python-sphinx_1.4.1.bb | 9 ++------- > 3 files changed, 8 insertions(+), 19 deletions(-) > > diff --git a/recipes-devtools/python/python-gevent_1.0.1.bb > b/recipes-devtools/python/python-gevent_1.0.1.bb > index 47f1267..7f1d262 100644 > --- a/recipes-devtools/python/python-gevent_1.0.1.bb > +++ b/recipes-devtools/python/python-gevent_1.0.1.bb > @@ -11,15 +11,10 @@ LIC_FILES_CHKSUM = > "file://LICENSE;md5=2dbb33d00e1fd31c7041460a81ac0bd2" > DEPENDS += "python-greenlet libevent" > RDEPENDS_${PN} += "python-greenlet python-mime python-pprint python-re" > > -SRCNAME = "gevent" > - > -SRC_URI = > "http://pypi.python.org/packages/source/g/gevent/${SRCNAME}-${PV}.tar.gz"; > SRC_URI[md5sum] = "7b952591d1a0174d6eb6ac47bd975ab6" > SRC_URI[sha256sum] = > "4627e215d058f71d95e6b26d9e7be4c263788a4756bd2858a93775f6c072df43" > > -S = "${WORKDIR}/${SRCNAME}-${PV}" > - > -inherit setuptools > +inherit setuptools pypi > > FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > SRC_URI += "file://libev-conf.patch" > diff --git a/recipes-devtools/python/python-m2crypto_0.22.3.bb > b/recipes-devtools/python/python-m2crypto_0.22.3.bb > index 95d6eec..2c2625d 100644 > --- a/recipes-devtools/python/python-m2crypto_0.22.3.bb > +++ b/recipes-devtools/python/python-m2crypto_0.22.3.bb > @@ -13,23 +13,22 @@ DESCRIPTION = "\ > LICENSE = "BSD" > LIC_FILES_CHKSUM = "file://PKG-INFO;md5=0ccca7097c1d29fa42e75e9c15c6ff2e" > > -SRCNAME = "M2Crypto" > -SRC_URI = > "http://pypi.python.org/packages/source/M/M2Crypto/${SRCNAME}-${PV}.tar.gz \ > +PYPI_PACKAGE = "M2Crypto" > + > +SRC_URI += " \ > file://m2crypto-Fix-build-with-SWIG-3.0.5.patch \ > " > > SRC_URI[md5sum] = "573f21aaac7d5c9549798e72ffcefedd" > SRC_URI[sha256sum] = > "6071bfc817d94723e9b458a010d565365104f84aa73f7fe11919871f7562ff72" > > -S = "${WORKDIR}/${SRCNAME}-${PV}" > - > -inherit setuptools > +inherit setuptools pypi > > DEPENDS += "openssl swig-native" > > DISTUTILS_BUILD_ARGS += "build_ext -I${STAGING_INCDIR}" > > -inherit setuptools > +inherit setuptools pypi > > SWIG_FEATURES_x86-64 = "-D__x86_64__" > SWIG_FEATURES ?= "" > diff --git a/recipes-devtools/python/python-sphinx_1.4.1.bb > b/recipes-devtools/python/python-sphinx_1.4.1.bb > index 835b369..476ff97 100644 > --- a/recipes-devtools/python/python-sphinx_1.4.1.bb > +++ b/recipes-devtools/python/python-sphinx_1.4.1.bb > @@ -4,14 +4,9 @@ SECTION = "devel/python" > LICENSE = "BSD" > LIC_FILES_CHKSUM = "file://LICENSE;md5=72f034adc6f7b05b09bc00d1a05bb065" > > -PR = "r0" > -SRCNAME = "Sphinx" > - > -SRC_URI = > "http://pypi.python.org/packages/source/S/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"; > +PYPI_PACKAGE = "Sphinx" > > SRC_URI[md5sum] = "4c4988e0306a04cef8dccc384281e585" > SRC_URI[sha256sum] = > "c6871a784d24aba9270b6b28541537a57e2fcf4d7c799410eba18236bc76d6bc" > > -S = "${WORKDIR}/${SRCNAME}-${PV}" > - > -inherit setuptools > +inherit setuptools pypi > -- > 2.7.4 > > -- > _______________________________________________ > meta-virtualization mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-virtualization -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
