Make Labcontroller compatible with Python 2 and Python 3 #227

StykMartin · 2024-07-25T17:52:39Z

No description provided.

Signed-off-by: Martin Styk <mart.styk@gmail.com>

…n function Signed-off-by: Martin Styk <mart.styk@gmail.com>

Signed-off-by: Martin Styk <mart.styk@gmail.com>

packit-as-a-service · 2024-07-25T18:58:03Z

We were not able to find or create Copr project packit/beaker-project-beaker-227 specified in the config with the following error:

Packit received HTTP 500 Internal Server Error from Copr Service. Check the Copr status page: https://copr.fedorainfracloud.org/status/stats/, or ask for help in Fedora Build System matrix channel https://matrix.to/#/#buildsys:fedoraproject.org.

Unless the HTTP status code above is >= 500, please check your configuration for:

typos in owner and project name (groups need to be prefixed with @)
whether the project name doesn't contain not allowed characters (only letters, digits, underscores, dashes and dots must be used)
whether the project itself exists (Packit creates projects only in its own namespace)
whether Packit is allowed to build in your Copr project
whether your Copr project/group is not private

cbouchar · 2024-07-30T12:05:25Z

Makefile

-DEPCMD  :=  $(shell if [ -f /usr/bin/dnf ]; then echo "dnf builddep"; else echo "yum-builddep"; fi)
-SUBDIRS :=  $(shell if [[ $(BKR_PY3) == 0 ]]; then echo "Common Client documentation Server LabController IntegrationTests"; else echo "Common Client documentation"; fi)
+ifeq ($(BKR_PY3),1)
+	DEPCMD := dnf builddep


Your expectation is RHEL-7 will only run with python2 (the default) since dnf does not exist in RHEL-7.

cbouchar · 2024-07-30T12:26:34Z

LabController/src/bkr/labcontroller/watchdog.py

 import logging
-import time
-import socket
+import signal


Did you want to sort import files in alpha order? I think you did this last time. Up to you.

Definitely, this should be fixed.

LabController/src/bkr/labcontroller/proxy.py

cbouchar · 2024-07-30T16:16:01Z

LabController/src/bkr/labcontroller/proxy.py

-            stop_type = ['stop', 'abort', 'cancel']
-            msg to record if issuing Abort or Cancel """
+    def task_stop(self, task_id, stop_type, msg=None):
+        """tell the scheduler that we are stoping a task


Don't know if you want to fix the typo s/b 'stopping'? Up to you.

I'll fix it.

StykMartin · 2024-07-30T16:24:52Z

/packit build

cbouchar · 2024-07-31T14:03:23Z

LabController/src/bkr/labcontroller/provision.py

+                predecessors.extend(
+                    self.greenlets[c["id"]]
+                    for c in six.itervalues(self.commands)
+                    if "power" in c


I would have expected an indent here on if. However, this is the original code.

cbouchar · 2024-07-31T15:48:52Z

LabController/src/bkr/labcontroller/log_storage.py


    def __enter__(self):
        makedirs_ignore(os.path.dirname(self.path), 0o755)
        created = False
        if self.create:
            try:
-                # stdio does not have any mode string which corresponds to this 
+                # stdio does not have any mode string which corresponds to this


You must be running a script to produce these changes. They're too consistent to be humanly done.

cbouchar · 2024-07-31T15:56:47Z

LabController/src/bkr/labcontroller/expire_distros.py

@@ -93,7 +93,7 @@ def check_all_trees(ignore_errors=False,
                        print('{0} is missing [Distro Tree ID {1}]'.format(


Should this be " instead of ' in this section? Looks like this change wasn't done in this file.

I think it's covered in another commit.

JohnVillalovos · 2024-08-01T16:11:04Z

1st commit: 557e290 looks good to me. Merge that commit! 🙂 Then only 80 more to go after that...

2nd commit: 6783017 Also LGTM

3rd commit: 046ec78 LGTM

JohnVillalovos · 2024-08-01T16:25:42Z

Can we get this rebased against the python-3 branch?

cbouchar · 2024-08-02T19:21:08Z

LabController/src/bkr/labcontroller/test_concurrency.py

+            [b"a" * 4096] * 1001 + [b"This line shouldn't be in output"] + [b""]  # EOT
+        )
+
+        result = _read_from_pipe(mock_file)


not sure I understand the purpose here. Did you want to assertEqual?

cbouchar · 2024-08-02T19:46:47Z

LabController/src/bkr/labcontroller/provision.py

-    env["power_user"] = (command["power"].get("user") or "").encode("utf8")
-    env["power_pass"] = (command["power"].get("passwd") or "").encode("utf8")
-    env["power_mode"] = command["action"].encode("utf8")
+    power_mapping = {


nice rewrite!

cbouchar

I believe I covered everything and I'm fine with your changes. Lots of format changes mostly.

cbouchar · 2024-09-06T19:26:54Z

LabController/setup.py

 from glob import glob

+try:


Martin: Further down in this file there exists a 'classifier' section which defines the following which perhaps you'd like to change?
'Programming Language :: Python :: 2.7',
I was looking at this file today and thought of you.

StykMartin added 30 commits January 21, 2024 19:05

feat: enable lab-controller build for Python 3

557e290

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(async): rename module to avoid use of reserved keyword

6783017

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(test): use range instead of xrange

046ec78

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(test): update exception syntax for Python 3 compatibility

b3b291c

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(watchdog): use six to provide xmlrpc client

8bd61eb

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(watchdog): update exception syntax for Python 3 compatibility

59ca7ed

Signed-off-by: Martin Styk <mart.styk@gmail.com>

chore(watchdog): format code and sort imports

2d257ed

Signed-off-by: Martin Styk <mart.styk@gmail.com>

chore(utils): format code and sort imports

d015ee2

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(transfer): update exception syntax for Python 3 compatibility

97f1633

Signed-off-by: Martin Styk <mart.styk@gmail.com>

chore(transfer): format code and sort imports

160f2d8

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(transfer): handle SSL error on Python 6

e182e16

Signed-off-by: Martin Styk <mart.styk@gmail.com>

chore(test): format code and sort imports

fe53e5a

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(test): use proper octal format

392ae39

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(pxemenu): use xmlrpc client and urllib from six

1babbbe

Signed-off-by: Martin Styk <mart.styk@gmail.com>

chore(pxemenu): format code and sort imports

b365a10

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(proxy): update exception syntax for Python 3 compatibility

6a00b9a

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(proxy): use xmlrpc move from six

f8c3eea

Signed-off-by: Martin Styk <mart.styk@gmail.com>

chore(proxy): format code and sort imports

4698017

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(provision): use xmlrpc move from six

df27135

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(provision): use unicode from six

257de1c

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(provision): update exception syntax for Python 3 compatibility

97b3d7b

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(provision): handle iterators and dict with six

ceb0a39

Signed-off-by: Martin Styk <mart.styk@gmail.com>

chore(provision): format code and sort imports

cd9aecd

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(netboot): import StringIO from six

f315c74

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(netboot): use urllib from six

087709f

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(netboot): use file mode compatible with six

08a8953

Signed-off-by: Martin Styk <mart.styk@gmail.com>

chore(netboot): format code and sort imports

a078345

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(proxy-main): update exception syntax for Python 3 compatibility

13505c8

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(proxy-main): make xmlrpc imports compatible

278181b

Signed-off-by: Martin Styk <mart.styk@gmail.com>

chore(proxy-main): format code and sort imports

8b842b6

Signed-off-by: Martin Styk <mart.styk@gmail.com>

StykMartin added 13 commits January 21, 2024 23:35

fix(proxy): use raw string notation for ANSI escape code regex

138a41d

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix: use warning instead of deprecated warn in logger

1932974

Signed-off-by: Martin Styk <mart.styk@gmail.com>

chore: noqa for broad exceptions in main loops

451e548

Signed-off-by: Martin Styk <mart.styk@gmail.com>

refactor(watchdog): remove shadowing for variable greenlet

11d6660

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(watchdog): handle missing 'Running' task in recipe abort process

f6e8b00

Signed-off-by: Martin Styk <mart.styk@gmail.com>

refactor(utils): remove unused code

932c4aa

Signed-off-by: Martin Styk <mart.styk@gmail.com>

refactor(test): rename 'id' to 'entity_id' to avoid shadowing built-i…

ab2bd02

…n function Signed-off-by: Martin Styk <mart.styk@gmail.com>

refactor(proxy): always close hub

3c38986

Signed-off-by: Martin Styk <mart.styk@gmail.com>

docs: generate man page for beaker-import

0ae7e70

Signed-off-by: Martin Styk <mart.styk@gmail.com>

ci: execute unit tests on fedora

7062f60

Signed-off-by: Martin Styk <mart.styk@gmail.com>

build: manage logrotate and log dir for py3 targets

584f728

Signed-off-by: Martin Styk <mart.styk@gmail.com>

refactor: use absolute import for utility bkr utility library

d84bcdd

Signed-off-by: Martin Styk <mart.styk@gmail.com>

fix(provision): encode power env fields on python 2

20896e9

Signed-off-by: Martin Styk <mart.styk@gmail.com>

cbouchar reviewed Jul 30, 2024

View reviewed changes

LabController/src/bkr/labcontroller/proxy.py Show resolved Hide resolved

cbouchar reviewed Jul 30, 2024

View reviewed changes

LabController/src/bkr/labcontroller/proxy.py Show resolved Hide resolved

cbouchar reviewed Jul 30, 2024

View reviewed changes

cbouchar reviewed Jul 31, 2024

View reviewed changes

JohnVillalovos mentioned this pull request Aug 1, 2024

First three commits from #227 #228

Closed

cbouchar reviewed Aug 2, 2024

View reviewed changes

cbouchar approved these changes Aug 2, 2024

View reviewed changes

cbouchar reviewed Sep 6, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make Labcontroller compatible with Python 2 and Python 3 #227

Make Labcontroller compatible with Python 2 and Python 3 #227

StykMartin commented Jul 25, 2024

packit-as-a-service bot commented Jul 25, 2024

cbouchar Jul 30, 2024

cbouchar Jul 30, 2024

StykMartin Jul 30, 2024

cbouchar Jul 30, 2024

StykMartin Jul 30, 2024

StykMartin commented Jul 30, 2024 •

edited

Loading

cbouchar Jul 31, 2024

cbouchar Jul 31, 2024

cbouchar Jul 31, 2024

cbouchar Jul 31, 2024

JohnVillalovos commented Aug 1, 2024 •

edited

Loading

JohnVillalovos commented Aug 1, 2024

cbouchar Aug 2, 2024

cbouchar Aug 2, 2024

cbouchar left a comment

cbouchar Sep 6, 2024

		@@ -93,7 +93,7 @@ def check_all_trees(ignore_errors=False,
		print('{0} is missing [Distro Tree ID {1}]'.format(

Make Labcontroller compatible with Python 2 and Python 3 #227

Are you sure you want to change the base?

Make Labcontroller compatible with Python 2 and Python 3 #227

Conversation

StykMartin commented Jul 25, 2024

packit-as-a-service bot commented Jul 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StykMartin commented Jul 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JohnVillalovos commented Aug 1, 2024 • edited Loading

JohnVillalovos commented Aug 1, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cbouchar left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StykMartin commented Jul 30, 2024 •

edited

Loading

JohnVillalovos commented Aug 1, 2024 •

edited

Loading