Skip to contentSkip to conversation

bitbake: python2 -> python3

PATCH New Robert Yang 1 participant 3 messages Jun 27, 2019

lore
Share & tools
lore
#1 lore raw

PATCH 1/2 bitbake: lib: Cleanup /usr/bin/env python

In reply to Robert Yang
---
 bitbake/lib/bb/cooker.py                     | 1 -
 bitbake/lib/bb/cookerdata.py                 | 1 -
 bitbake/lib/bb/main.py                       | 1 -
 bitbake/lib/bb/monitordisk.py                | 1 -
 bitbake/lib/bb/namedtuple_with_abc.py        | 1 -
 bitbake/lib/bb/parse/parse_py/BBHandler.py   | 1 -
 bitbake/lib/bb/parse/parse_py/ConfHandler.py | 1 -
 bitbake/lib/bb/parse/parse_py/__init__.py    | 1 -
 bitbake/lib/bb/runqueue.py                   | 1 -
 bitbake/lib/bb/taskdata.py                   | 1 -
 bitbake/lib/pyinotify.py                     | 3 +--
 11 files changed, 1 insertion(+), 12 deletions(-)
bitbake/lib/bb/cooker.py +0 -1
index 0008c2f..b4851e1 100644
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright (C) 2003, 2004  Chris Larson
 # Copyright (C) 2003, 2004  Phil Blundell
bitbake/lib/bb/cookerdata.py +0 -1
index 842275d..e64c6c5 100644
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright (C) 2003, 2004  Chris Larson
 # Copyright (C) 2003, 2004  Phil Blundell
bitbake/lib/bb/main.py +0 -1
index ca59eb9..bd11619 100755
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright (C) 2003, 2004  Chris Larson
 # Copyright (C) 2003, 2004  Phil Blundell
bitbake/lib/bb/monitordisk.py +0 -1
index 69b25c7..1a25b00 100644
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright (C) 2012 Robert Yang
 #
bitbake/lib/bb/namedtuple_with_abc.py +0 -1
index c8e1d55..646aed6 100644
@@ -1,5 +1,4 @@
 # http://code.activestate.com/recipes/577629-namedtupleabc-abstract-base-class-mix-in-for-named/
-#!/usr/bin/env python
 # Copyright (c) 2011 Jan Kaliszewski (zuo). Available under the MIT License.
 #
 # SPDX-License-Identifier: MIT
bitbake/lib/bb/parse/parse_py/BBHandler.py +0 -1
index 889f230..6f7cf82 100644
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
    class for handling .bb files
 
bitbake/lib/bb/parse/parse_py/ConfHandler.py +0 -1
index 71bf61b..2e84b91 100644
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
    class for handling configuration data files
 
bitbake/lib/bb/parse/parse_py/__init__.py +0 -1
index cdebe44..f508afa 100644
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 BitBake Parsers
 
bitbake/lib/bb/runqueue.py +0 -1
index 010b085..58707db 100644
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 BitBake 'RunQueue' implementation
 
bitbake/lib/bb/taskdata.py +0 -1
index d13bd7c..8c25e09 100644
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 BitBake 'TaskData' implementation
 
bitbake/lib/pyinotify.py +1 -2
index 9dcfd0d..1528a22 100644
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-
+#
 # pyinotify.py - python interface to inotify
 # Copyright (c) 2005-2015 Sebastien Martini <[email protected]>
 #
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/2 bitbake: toaster:tests: python -> python3

In reply to Robert Yang
---
 bitbake/lib/toaster/tests/browser/selenium_helpers.py                   | 2 +-
 bitbake/lib/toaster/tests/browser/selenium_helpers_base.py              | 2 +-
 bitbake/lib/toaster/tests/browser/test_all_builds_page.py               | 2 +-
 bitbake/lib/toaster/tests/browser/test_all_projects_page.py             | 2 +-
 bitbake/lib/toaster/tests/browser/test_builddashboard_page.py           | 2 +-
 bitbake/lib/toaster/tests/browser/test_builddashboard_page_artifacts.py | 2 +-
 bitbake/lib/toaster/tests/browser/test_builddashboard_page_recipes.py   | 2 +-
 bitbake/lib/toaster/tests/browser/test_builddashboard_page_tasks.py     | 2 +-
 bitbake/lib/toaster/tests/browser/test_js_unit_tests.py                 | 2 +-
 bitbake/lib/toaster/tests/browser/test_landing_page.py                  | 2 +-
 bitbake/lib/toaster/tests/browser/test_layerdetails_page.py             | 2 +-
 bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py     | 2 +-
 bitbake/lib/toaster/tests/browser/test_new_custom_image_page.py         | 2 +-
 bitbake/lib/toaster/tests/browser/test_new_project_page.py              | 2 +-
 bitbake/lib/toaster/tests/browser/test_project_builds_page.py           | 2 +-
 bitbake/lib/toaster/tests/browser/test_project_config_page.py           | 2 +-
 bitbake/lib/toaster/tests/browser/test_project_page.py                  | 2 +-
 bitbake/lib/toaster/tests/browser/test_sample.py                        | 2 +-
 bitbake/lib/toaster/tests/browser/test_task_page.py                     | 2 +-
 bitbake/lib/toaster/tests/browser/test_toastertable_ui.py               | 2 +-
 bitbake/lib/toaster/tests/builds/buildtest.py                           | 2 +-
 bitbake/lib/toaster/tests/builds/test_core_image_min.py                 | 2 +-
 bitbake/lib/toaster/tests/commands/test_loaddata.py                     | 2 +-
 bitbake/lib/toaster/tests/commands/test_lsupdates.py                    | 2 +-
 bitbake/lib/toaster/tests/commands/test_runbuilds.py                    | 2 +-
 bitbake/lib/toaster/tests/eventreplay/__init__.py                       | 2 +-
 bitbake/lib/toaster/tests/functional/functional_helpers.py              | 2 +-
 bitbake/lib/toaster/tests/functional/test_functional_basic.py           | 2 +-
 bitbake/lib/toaster/tests/views/test_views.py                           | 2 +-
 bitbake/lib/toaster/toastermain/management/commands/checksocket.py      | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)
bitbake/lib/toaster/tests/browser/selenium_helpers.py +1 -1
index 6d9bb80..02d4f4b 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/selenium_helpers_base.py +1 -1
index 8417aa3..6c94684 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_all_builds_page.py +1 -1
index f402161..fba627b 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_all_projects_page.py +1 -1
index f86d19d..afd2d35 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_builddashboard_page.py +1 -1
index 53c125e..d972aff 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_builddashboard_page_artifacts.py +1 -1
index c560d7d..e2623e8 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_builddashboard_page_recipes.py +1 -1
index e4f3d68..c542d45 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_builddashboard_page_tasks.py +1 -1
index bdb0c27..22acb47 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_js_unit_tests.py +1 -1
index 63f3f4a..e8b4295 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_landing_page.py +1 -1
index 0a00fcc..0790198 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_layerdetails_page.py +1 -1
index e34aa13..f81e696 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py +1 -1
index d52b184..15d25dc 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_new_custom_image_page.py +1 -1
index 3b47a49..0aa3b7a 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_new_project_page.py +1 -1
index d250bd1..8e56bb0 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_project_builds_page.py +1 -1
index 065f3eb..47fb10b 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_project_config_page.py +1 -1
index 48508df..2816eb9 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_project_page.py +1 -1
index 5cb607d..8b5e1b6 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_sample.py +1 -1
index 008ba14..f4ad670 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_task_page.py +1 -1
index 47c8c1a..26f3dca 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/browser/test_toastertable_ui.py +1 -1
index b4f8344..ef78cbb 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/builds/buildtest.py +1 -1
index 9f40f97..872bbd3 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/builds/test_core_image_min.py +1 -1
index 3d3aa2a..44b6cbe 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/commands/test_loaddata.py +1 -1
index b633d97..9e8d555 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/commands/test_lsupdates.py +1 -1
index 23a84a2..3c4fbe0 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/commands/test_runbuilds.py +1 -1
index 29bc7c9..e223b95 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/eventreplay/__init__.py +1 -1
index 3606cba..8ed6792 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/tests/functional/functional_helpers.py +1 -1
index 6a3f74b..455c408 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster functional tests implementation
 #
bitbake/lib/toaster/tests/functional/test_functional_basic.py +1 -1
index 2b3a288..56c84fb 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster functional tests implementation
 #
bitbake/lib/toaster/tests/views/test_views.py +1 -1
index 477654e..68d9e9d 100644
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
bitbake/lib/toaster/toastermain/management/commands/checksocket.py +1 -1
index c1758f3..811fd5d 100644
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # BitBake Toaster Implementation
 #
Signature · 1 line
2.7.4
#0 lore raw

cover bitbake: python2 -> python3

Hi RP,

- For bitbake/lib/bb's changes, I removed the line '#! /usr/bin/env python', and I've run bitbake-selftest, everything is fine except one test case which says can't clone git://git.infradead.org/mtd-utils.git, I can't clone it mannually, either.

- For toaster/tests, I read it's README, it needs a web browser to run the test cases, but I don't have it on my server, so I didn't run the test cases. I just changed python2 -> python3, but kept the line there, I used 2to3 to check these files, they are python3 indeed.

// Robert

The following changes since commit 67266331b0f557c01cde1cc1b1a1de7197443a6c:

local.conf.sample.extended: remove redundant RUNTIMETARGET assignment (2019-06-24 17:34:25 +0100)

are available in the git repository at:

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

Robert Yang (2):
bitbake: lib: Cleanup /usr/bin/env python
bitbake: toaster:tests: python -> python3

 bitbake/lib/bb/cooker.py                                               | 1 -
 bitbake/lib/bb/cookerdata.py                                           | 1 -
 bitbake/lib/bb/main.py                                                 | 1 -
 bitbake/lib/bb/monitordisk.py                                          | 1 -
 bitbake/lib/bb/namedtuple_with_abc.py                                  | 1 -
 bitbake/lib/bb/parse/parse_py/BBHandler.py                             | 1 -
 bitbake/lib/bb/parse/parse_py/ConfHandler.py                           | 1 -
 bitbake/lib/bb/parse/parse_py/__init__.py                              | 1 -
 bitbake/lib/bb/runqueue.py                                             | 1 -
 bitbake/lib/bb/taskdata.py                                             | 1 -
 bitbake/lib/pyinotify.py                                               | 3 +--
 bitbake/lib/toaster/tests/browser/selenium_helpers.py                  | 2 +-
 bitbake/lib/toaster/tests/browser/selenium_helpers_base.py             | 2 +-
 bitbake/lib/toaster/tests/browser/test_all_builds_page.py              | 2 +-
 bitbake/lib/toaster/tests/browser/test_all_projects_page.py            | 2 +-
 bitbake/lib/toaster/tests/browser/test_builddashboard_page.py          | 2 +-
 .../lib/toaster/tests/browser/test_builddashboard_page_artifacts.py    | 2 +-
 bitbake/lib/toaster/tests/browser/test_builddashboard_page_recipes.py  | 2 +-
 bitbake/lib/toaster/tests/browser/test_builddashboard_page_tasks.py    | 2 +-
 bitbake/lib/toaster/tests/browser/test_js_unit_tests.py                | 2 +-
 bitbake/lib/toaster/tests/browser/test_landing_page.py                 | 2 +-
 bitbake/lib/toaster/tests/browser/test_layerdetails_page.py            | 2 +-
 bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py    | 2 +-
 bitbake/lib/toaster/tests/browser/test_new_custom_image_page.py        | 2 +-
 bitbake/lib/toaster/tests/browser/test_new_project_page.py             | 2 +-
 bitbake/lib/toaster/tests/browser/test_project_builds_page.py          | 2 +-
 bitbake/lib/toaster/tests/browser/test_project_config_page.py          | 2 +-
 bitbake/lib/toaster/tests/browser/test_project_page.py                 | 2 +-
 bitbake/lib/toaster/tests/browser/test_sample.py                       | 2 +-
 bitbake/lib/toaster/tests/browser/test_task_page.py                    | 2 +-
 bitbake/lib/toaster/tests/browser/test_toastertable_ui.py              | 2 +-
 bitbake/lib/toaster/tests/builds/buildtest.py                          | 2 +-
 bitbake/lib/toaster/tests/builds/test_core_image_min.py                | 2 +-
 bitbake/lib/toaster/tests/commands/test_loaddata.py                    | 2 +-
 bitbake/lib/toaster/tests/commands/test_lsupdates.py                   | 2 +-
 bitbake/lib/toaster/tests/commands/test_runbuilds.py                   | 2 +-
 bitbake/lib/toaster/tests/eventreplay/__init__.py                      | 2 +-
 bitbake/lib/toaster/tests/functional/functional_helpers.py             | 2 +-
 bitbake/lib/toaster/tests/functional/test_functional_basic.py          | 2 +-
 bitbake/lib/toaster/tests/views/test_views.py                          | 2 +-
 bitbake/lib/toaster/toastermain/management/commands/checksocket.py     | 2 +-
 41 files changed, 31 insertions(+), 42 deletions(-)
Signature · 1 line
2.7.4