Skip to contentSkip to conversation

python3-docutils: Remove, moved to OE-core

PATCH New Adrian Bunk 1 participant 4 messages May 17, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 python3-docutils: Remove, moved to OE-core

---
 .../packagegroups/packagegroup-meta-python.bb     |  2 +-
 .../python/python3-docutils_0.15.2.bb             | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-docutils_0.15.2.bb
meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +1 -1
index 12a056255..4036e1e20 100644
@@ -23,7 +23,7 @@ RDEPENDS_packagegroup-meta-python3 = "\
     python3-pint python3-coverage python3-iso8601 python3-ndg-httpsclient python3-yappi python3-twofish \
     python3-speaklater python3-smbus python3-djangorestframework python3-msgpack python3-jsonpointer \
     python3-flask-script python3-cassandra-driver python3-cython python3-ujson python3-aws-iot-device-sdk-python \
-    python3-pytest-runner python3-pyiface python3-docutils python3-flask-login python3-markupsafe python3-setuptools-scm \
+    python3-pytest-runner python3-pyiface python3-flask-login python3-markupsafe python3-setuptools-scm \
     python3-semver python3-sdnotify python3-flask-user python3-tornado python3-jsonpatch python3-pexpect \
     python3-progress python3-jsonschema python3-xstatic python3-pyroute2 python3-idna python3-sqlalchemy \
     python3-urllib3 python3-flask-mail python3-asn1crypto python3-pyinotify python3-intervals python3-pyperclip \
meta-python/recipes-devtools/python/python3-docutils_0.15.2.bb deleted +0 -15
deleted file mode 100644
index 321f55572..000000000
@@ -1,15 +0,0 @@
-SUMMARY = "Text processing system for documentation"
-HOMEPAGE = "http://docutils.sourceforge.net"
-SECTION = "devel/python"
-LICENSE = "PSF & BSD-2-Clause & GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106"
-
-inherit pypi setuptools3
-
-PYPI_PACKAGE = "docutils"
-
-SRC_URI[md5sum] = "e26a308d8000b0bed7416a633217c676"
-SRC_URI[sha256sum] = "a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99"
-
-BBCLASSEXTEND = "native"
-
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/4 python3-dbusmock: Remove, moved to OE-core

---
 ...y-to-add-own-objects-to-internal-obj.patch | 52 -------------------
 ...ty-to-import-templates-from-packages.patch | 27 ----------
 .../python/python3-dbusmock_0.16.7.bb         | 25 ---------
 3 files changed, 104 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
 delete mode 100644 meta-python/recipes-devtools/python/python3-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch
 delete mode 100644 meta-python/recipes-devtools/python/python3-dbusmock_0.16.7.bb
meta-python/recipes-devtools/python/python3-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch deleted +0 -52
deleted file mode 100644
index c4d817849..000000000
@@ -1,52 +0,0 @@
-From c4436fd42f2936e5fb0f95434d06e45aa9959ca0 Mon Sep 17 00:00:00 2001
-From: Simon Busch <[email protected]>
-Date: Wed, 9 Apr 2014 13:18:33 +0200
-Subject: [PATCH] Add functionality to add own objects to internal object
-
- list
-
-In some case the tests might want to create dynamically dbus objects which extended
-functionality from own class definitions within templates. In such cases we need to
-register those objects with the internal object manager of dbusmock.
-
-Signed-off-by: Simon Busch <[email protected]>
-
----
- dbusmock/__init__.py   | 4 ++--
- dbusmock/mockobject.py | 8 ++++++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/dbusmock/__init__.py b/dbusmock/__init__.py
-index 8a482ab..3d5d71a 100644
---- a/dbusmock/__init__.py
-+++ b/dbusmock/__init__.py
-@@ -14,8 +14,8 @@ __license__ = 'LGPL 3+'
- __version__ = '0.16.7'
- 
- from dbusmock.mockobject import (DBusMockObject, MOCK_IFACE,
--                                 OBJECT_MANAGER_IFACE, get_object, get_objects)
-+                                 OBJECT_MANAGER_IFACE, get_object, get_objects, add_object)
- from dbusmock.testcase import DBusTestCase
- 
- __all__ = ['DBusMockObject', 'MOCK_IFACE', 'OBJECT_MANAGER_IFACE',
--           'DBusTestCase', 'get_object', 'get_objects']
-+           'DBusTestCase', 'get_object', 'get_objects', 'add_object']
-diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py
-index 586dbad..e4f130f 100644
---- a/dbusmock/mockobject.py
-+++ b/dbusmock/mockobject.py
-@@ -688,6 +688,14 @@ dbus.service._method_lookup = _dbusmock_method_lookup
- # Helper API for templates
- #
- 
-+def add_object(path, obj):
-+    if path in objects:
-+        raise dbus.exceptions.DBusException(
-+                'org.freedesktop.DBus.Mock.NameError',
-+                'object %s already exists' % path)
-+
-+    objects[path] = obj
-+
- 
- def get_objects():
-     '''Return all existing object paths'''
meta-python/recipes-devtools/python/python3-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch deleted +0 -27
deleted file mode 100644
index 06ab1f05e..000000000
@@ -1,27 +0,0 @@
-From 03bd5cb77c54033857810bb17562859eefa41221 Mon Sep 17 00:00:00 2001
-From: Simon Busch <[email protected]>
-Date: Wed, 9 Apr 2014 13:20:33 +0200
-Subject: [PATCH] Add possibility to import templates from packages
-
-Does not have any unit tests yet.
-
-Signed-off-by: Simon Busch <[email protected]>
-
----
- dbusmock/mockobject.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py
-index e4f130f..389df70 100644
---- a/dbusmock/mockobject.py
-+++ b/dbusmock/mockobject.py
-@@ -46,6 +46,9 @@ def load_module(name):
-             exec(f.read(), mod.__dict__, mod.__dict__)
-         return mod
- 
-+    if '.' in name:
-+        return importlib.import_module(name)
-+
-     return importlib.import_module('dbusmock.templates.' + name)
- 
- 
meta-python/recipes-devtools/python/python3-dbusmock_0.16.7.bb deleted +0 -25
deleted file mode 100644
index cd760ab89..000000000
@@ -1,25 +0,0 @@
-# Copyright (c) 2014 LG Electronics, Inc.
-
-SUMMARY = "With this program/Python library you can easily create mock objects on D-Bus"
-AUTHOR = "Martin Pitt <[email protected]>"
-
-LICENSE = "GPL-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-SRC_URI[md5sum] = "80f8caa838fad96483a8751e11d384f9"
-SRC_URI[sha256sum] = "2d2ea892fa4633c3ec6ac1e912120ec493047a5c6522849b7d1c95ad755bce75"
-
-SRC_URI += " \
-    file://0001-Add-functionality-to-add-own-objects-to-internal-obj.patch \
-    file://0002-Add-possibility-to-import-templates-from-packages.patch \
-"
-
-PYPI_PACKAGE = "python-dbusmock"
-
-inherit pypi setuptools3
-
-RDEPENDS_${PN} += "\
-    ${PYTHON_PN}-dbus \
-    ${PYTHON_PN}-pygobject \
-    ${PYTHON_PN}-xml \
-    "
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/4 python3-cython: Remove, moved to OE-core

In reply to Adrian Bunk
---
 .../packagegroups/packagegroup-meta-python.bb |  2 +-
 .../recipes-devtools/python/python-cython.inc | 40 -------------------
 .../python/python3-cython_0.29.14.bb          | 18 ---------
 3 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-cython.inc
 delete mode 100644 meta-python/recipes-devtools/python/python3-cython_0.29.14.bb
meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +1 -1
index 4036e1e20..596c20a8c 100644
@@ -22,7 +22,7 @@ RDEPENDS_packagegroup-meta-python3 = "\
     python3-sijax python3-langtable python3-requests-file python3-crcmod python3-robotframework \
     python3-pint python3-coverage python3-iso8601 python3-ndg-httpsclient python3-yappi python3-twofish \
     python3-speaklater python3-smbus python3-djangorestframework python3-msgpack python3-jsonpointer \
-    python3-flask-script python3-cassandra-driver python3-cython python3-ujson python3-aws-iot-device-sdk-python \
+    python3-flask-script python3-cassandra-driver python3-ujson python3-aws-iot-device-sdk-python \
     python3-pytest-runner python3-pyiface python3-flask-login python3-markupsafe python3-setuptools-scm \
     python3-semver python3-sdnotify python3-flask-user python3-tornado python3-jsonpatch python3-pexpect \
     python3-progress python3-jsonschema python3-xstatic python3-pyroute2 python3-idna python3-sqlalchemy \
meta-python/recipes-devtools/python/python-cython.inc deleted +0 -40
deleted file mode 100644
index 3260e92ba..000000000
@@ -1,40 +0,0 @@
-DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \
-It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \
-and the messy, low-level world of C."
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa"
-PYPI_PACKAGE = "Cython"
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "6e2f139e30bb08d68366f9370d87964c"
-SRC_URI[sha256sum] = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414"
-
-inherit pypi
-
-RDEPENDS_${PN}_class-target += "\
-    ${PYTHON_PN}-misc \
-    ${PYTHON_PN}-netserver \
-    ${PYTHON_PN}-pkgutil \
-    ${PYTHON_PN}-pyparsing \
-    ${PYTHON_PN}-setuptools \
-    ${PYTHON_PN}-shell \
-    ${PYTHON_PN}-xml \
-"
-
-RDEPENDS_${PN}_class-nativesdk += "\
-    nativesdk-${PYTHON_PN}-misc \
-    nativesdk-${PYTHON_PN}-netserver \
-    nativesdk-${PYTHON_PN}-pkgutil \
-    nativesdk-${PYTHON_PN}-pyparsing \
-    nativesdk-${PYTHON_PN}-setuptools \
-    nativesdk-${PYTHON_PN}-shell \
-    nativesdk-${PYTHON_PN}-xml \
-"
-
-do_install_append() {
-	# Make sure we use /usr/bin/env python
-	for PYTHSCRIPT in `grep -rIl '^#!.*python' ${D}`; do
-		sed -i -e '1s|^#!.*|#!/usr/bin/env ${PYTHON_PN}|' $PYTHSCRIPT
-	done
-}
meta-python/recipes-devtools/python/python3-cython_0.29.14.bb deleted +0 -18
deleted file mode 100644
index 2ce6bdbd6..000000000
@@ -1,18 +0,0 @@
-inherit setuptools3
-require python-cython.inc
-
-RDEPENDS_${PN} += "\
-    python3-setuptools \
-"
-
-# running build_ext a second time during install fails, because Python
-# would then attempt to import cythonized modules built for the target
-# architecture.
-DISTUTILS_INSTALL_ARGS += "--skip-build"
-
-do_install_append() {
-    # rename scripts that would conflict with the Python 2 build of Cython
-    mv ${D}${bindir}/cython ${D}${bindir}/cython3
-    mv ${D}${bindir}/cythonize ${D}${bindir}/cythonize3
-    mv ${D}${bindir}/cygdb ${D}${bindir}/cygdb3
-}
Signature · 1 line
2.17.1
#3 lore raw

PATCH 4/4 python3-pyparsing: Remove, moved to OE-core

In reply to Adrian Bunk
---
 .../packagegroups/packagegroup-meta-python.bb |  2 +-
 .../python/python3-pyparsing_2.4.6.bb         | 21 -------------------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-pyparsing_2.4.6.bb
meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +1 -1
index 596c20a8c..c03f610da 100644
@@ -18,7 +18,7 @@ RDEPENDS_packagegroup-meta-python3 = "\
     python3-javaobj-py3 python3-sh python3-pycrypto python3-pyasn1 python3-pydbus python3-wtforms \
     python3-pybluez python3-babel python3-parse-type python3-bitarray python3-django-south \
     python3-pyusb python3-prctl python3-jinja2 python3-werkzeug python3-pyjks python3-requests-ftp \
-    python3-behave python3-pyparsing python3-pyyaml python3-tzlocal python3-pretend python3-stevedore \
+    python3-behave python3-pyyaml python3-tzlocal python3-pretend python3-stevedore \
     python3-sijax python3-langtable python3-requests-file python3-crcmod python3-robotframework \
     python3-pint python3-coverage python3-iso8601 python3-ndg-httpsclient python3-yappi python3-twofish \
     python3-speaklater python3-smbus python3-djangorestframework python3-msgpack python3-jsonpointer \
meta-python/recipes-devtools/python/python3-pyparsing_2.4.6.bb deleted +0 -21
deleted file mode 100644
index a6ec1cb9c..000000000
@@ -1,21 +0,0 @@
-SUMMARY = "Python parsing module"
-HOMEPAGE = "http://pyparsing.wikispaces.com/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1"
-
-SRC_URI[md5sum] = "29733ea8cbee0291aad121c69c6e51a1"
-SRC_URI[sha256sum] = "4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f"
-
-inherit pypi setuptools3
-
-RDEPENDS_${PN} += " \
-    ${PYTHON_PN}-datetime \
-    ${PYTHON_PN}-debugger \
-    ${PYTHON_PN}-json \
-    ${PYTHON_PN}-netclient \
-    ${PYTHON_PN}-pprint \
-    ${PYTHON_PN}-stringold \
-    ${PYTHON_PN}-threading \
-"
-
-BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1