Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Meta python merge #381

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ RDEPENDS_packagegroup-meta-python3 = "\
python3-pretend \
python3-prettytable \
python3-priority \
python3-process-tests \
python3-progress \
python3-prompt-toolkit \
python3-protobuf \
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
From d3ae6ac951cc5bbce29b9c987741e0a557c9b777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <[email protected]>
Date: Sun, 2 May 2021 09:50:43 +0300
Subject: [PATCH] Remove tornado<6 test constraint. Ref #15.

Upstream-Status: Backport [https://github.com/ionelmc/python-aspectlib/commit/7dccb198dfb426f529b81a28a755f3c02f8b50cb]
Signed-off-by: Khem Raj <[email protected]>
---
tests/test_integrations_py3.py | 5 ++++-
tox.ini | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/test_integrations_py3.py b/tests/test_integrations_py3.py
index e025eac..596589d 100644
--- a/tests/test_integrations_py3.py
+++ b/tests/test_integrations_py3.py
@@ -36,7 +36,10 @@ def test_decorate_tornado_coroutine():
@gen.coroutine
@debug.log(print_to=buf, module=False, stacktrace=2, result_repr=repr)
def coro():
- yield gen.Task(loop.add_timeout, timedelta(microseconds=10))
+ if hasattr(gen, 'Task'):
+ yield gen.Task(loop.add_timeout, timedelta(microseconds=10))
+ else:
+ yield gen.sleep(0.01)
return "result"

loop = ioloop.IOLoop.current()
diff --git a/tox.ini b/tox.ini
index 8c607de..08c31b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -55,7 +55,8 @@ deps =
pytest-clarity
pytest-cov
pytest-travis-fold
- tornado<6.0
+ six
+ tornado
commands =
{posargs:pytest --cov --cov-report=term-missing -vv --ignore=src}

--
2.32.0

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
16 changes: 15 additions & 1 deletion meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,21 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d58b3f20fd10347a9458b8a03793b62e"

SRC_URI[sha256sum] = "d275ec82c4c2712e564bb760e4accff8f061f648e38774feabeb8b241cf3a4aa"

inherit pypi setuptools3
inherit ptest pypi setuptools3

SRC_URI += "file://run-ptest \
file://0001-Remove-tornado-6-test-constraint.-Ref-15.patch \
"

do_install_ptest() {
install -d ${D}${PTEST_PATH}/tests
cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
}

RDEPENDS_${PN}-ptest += "\
python3-tornado \
python3-process-tests \
"

RDEPENDS_${PN} += "python3-core python3-fields"

Expand Down
3 changes: 3 additions & 0 deletions meta-python/recipes-devtools/python/python3-execnet/run-ptest
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
15 changes: 12 additions & 3 deletions meta-python/recipes-devtools/python/python3-execnet_1.9.0.bb
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,22 @@ HOMEPAGE = "https://execnet.readthedocs.io/en/latest/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=772fcdaca14b378878d05c7d857e6c3e"

DEPENDS += "python3-pip-native"

SRC_URI += "file://run-ptest \
"
SRC_URI[sha256sum] = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"

DEPENDS += "python3-pip-native"
inherit ptest pypi setuptools3

inherit pypi setuptools3
do_install_ptest() {
install -d ${D}${PTEST_PATH}/tests
cp -rf ${S}/testing/* ${D}${PTEST_PATH}/tests/
}

PACKAGECONFIG[testing] = ",,,python3-pre-commit"
RDEPENDS_${PN}-ptest += "\
python3-pytest \
"

RDEPENDS_${PN} += "python3-core python3-crypt python3-ctypes python3-fcntl python3-io python3-shell python3-threading"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,18 @@ HOMEPAGE = "https://github.com/python/mypy"
LICENSE = "MIT & Python-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=17b7180fcfc43c4e70c07c71588604c4"

RDEPENDS_${PN} = " \
${PYTHON_PN}-mypy-extensions \
${PYTHON_PN}-typed-ast \
${PYTHON_PN}-typing-extensions \
"

PYPI_PACKAGE = "mypy"

inherit pypi setuptools3

SRC_URI[sha256sum] = "9236c21194fde5df1b4d8ebc2ef2c1f2a5dc7f18bcbea54274937cae2e20a01c"
SRC_URI[sha256sum] = "704098302473cb31a218f1775a873b376b30b4c18229421e9e9dc8916fd16150"

BBCLASSEXTEND = "native"

RDEPENDS_${PN} += " \
${PYTHON_PN}-mypy-extensions \
${PYTHON_PN}-typed-ast \
${PYTHON_PN}-typing-extensions \
${PYTHON_PN}-json \
${PYTHON_PN}-compression \
${PYTHON_PN}-pprint \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ HOMEPAGE = "http://pandas.pydata.org/"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c2a8f987b2ce77c368c6b3e1b5b10774"

SRC_URI[sha256sum] = "649ecab692fade3cbfcf967ff936496b0cfba0af00a55dfaacd82bdda5cb2279"
SRC_URI[sha256sum] = "14abb8ea73fce8aebbb1fb44bec809163f1c55241bcc1db91c2c780e97265033"

inherit pypi setuptools3

Expand All @@ -21,4 +21,5 @@ RDEPENDS_${PN} += " \
${PYTHON_PN}-numpy \
${PYTHON_PN}-dateutil \
${PYTHON_PN}-pytz \
${PYTHON_PN}-profile \
"
15 changes: 15 additions & 0 deletions meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (C) 2021 Khem Raj <[email protected]>
# Released under the MIT license (see COPYING.MIT for the terms)

SUMMARY = "Tools for testing processes."
HOMEPAGE = "https://github.com/ionelmc/python-process-tests"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=37031056aff37e4b3310872a9a3d0b1e"

SRC_URI[sha256sum] = "a3747ad947bdfc93e5c986bdb17a6d718f3f26e8577a0807a00962f29e26deba"

inherit pypi setuptools3

RDEPENDS_${PN} += "python3-core"

BBCLASSEXTEND = "native nativesdk"
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
21 changes: 14 additions & 7 deletions meta-python/recipes-devtools/python/python3-py-cpuinfo_8.0.0.bb
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b0b97c022f12b14d9e02de0b283ee9e9"

SRC_URI[sha256sum] = "5f269be0e08e33fd959de96b34cd4aeeeacac014dd8305f70eb28d06de2345c5"

inherit pypi setuptools3
inherit ptest pypi setuptools3

RDEPENDS_${PN} += "python3-core python3-ctypes python3-datetime python3-json python3-mmap python3-multiprocessing python3-netclient python3-pickle python3-pprint python3-shell"
SRC_URI += "file://run-ptest \
"

do_install_ptest() {
install -d ${D}${PTEST_PATH}/tests
cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
}

RDEPENDS_${PN}-ptest += "\
python3-pytest \
"

RDEPENDS_${PN} += "python3-core python3-ctypes python3-datetime python3-json python3-io python3-mmap python3-multiprocessing python3-netclient python3-pickle python3-pprint python3-shell"

# WARNING: We were unable to map the following python package/module
# dependencies to the bitbake packages which include them:
# _winreg
# cStringIO
# winreg
BBCLASSEXTEND = "native nativesdk"

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
SUMMARY = "Send file to trash natively under Mac OS X, Windows and Linux"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=a02659c2d5f4cc626e4dcf6504b865eb"

inherit pypi setuptools3

SRC_URI[sha256sum] = "17730aa0a33ab82ed6ca76be3bb25f0433d0014f1ccf63c979bab13a5b9db2b2"

PYPI_PACKAGE = "Send2Trash"