From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../0001-sqlparse-change-shebang-to-python3.patch | 51 ++++++++++++++++++++++ .../python/python3-sqlparse/run-ptest | 3 ++ 2 files changed, 54 insertions(+) create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/run-ptest (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse') diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch new file mode 100644 index 000000000..ad6c50ff7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch @@ -0,0 +1,51 @@ +From 10c9d3341d64d697f678a64ae707f6bda21565bb Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Mon, 9 Mar 2020 13:10:37 +0800 +Subject: [PATCH] sqlparse: change shebang to python3 + +Upstream-Status: Pending + +Don't send upstream since upstream still support python2, +we can only make this change after python2 is offcially +dropped. + +Signed-off-by: Changqing Li +--- + setup.py | 2 +- + sqlparse/__main__.py | 2 +- + sqlparse/cli.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 345d0ce..ce3abc3 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2009-2018 the sqlparse authors and contributors +diff --git a/sqlparse/__main__.py b/sqlparse/__main__.py +index 867d75d..dd0c074 100644 +--- a/sqlparse/__main__.py ++++ b/sqlparse/__main__.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2009-2018 the sqlparse authors and contributors +diff --git a/sqlparse/cli.py b/sqlparse/cli.py +index 25555a5..8bf050a 100755 +--- a/sqlparse/cli.py ++++ b/sqlparse/cli.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2009-2018 the sqlparse authors and contributors +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/run-ptest new file mode 100644 index 000000000..3385d6893 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/run-ptest @@ -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/SKIPED/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}}' -- cgit v1.2.3