Updated to Python3 / Gtk3 for >= Ubuntu 20.04 support

.github/workflows/packagedeb.yml

@@ -0,0 +1,38 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        python-version: [3.11.3]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install PyGObject
+        sudo apt install python3-all debhelper python3-setuptools devscripts
+        pip install stdeb setuptools wheel twine
+    - name: Build with stdeb
+      run: |
+        python3 setup.py install
+
+
+
+

.gitignore

@@ -17,6 +17,16 @@
 /version.txt
 /FAHControl*.tar.gz
 /fahcontrol*.pkg
+/gui
+/.pybuild
+
+# debian packaging files
+/debian/.debhelper/
+/debian/debhelper-build-stamp
+/debian/fahcontrol/
+/debian/*.debhelper
+/debian/*.substvars
+/debian/files
 
 # Temporary files
 *~

FAHControl

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 '''
   Folding@Home Client Control (FAHControl)
   Copyright (C) 2010-2020 foldingathome.org
@@ -36,7 +36,7 @@ def set_proc_name(name):
     libc.prctl(15, byref(buff), 0, 0, 0)
 
 
-if sys.platform.startswith('linux'): set_proc_name('FAHControl')
+if sys.platform.startswith('linux'): set_proc_name(b'FAHControl')
 
 # If present, remove the Launch Services -psn_xxx_xxx argument
 if len(sys.argv) > 1 and sys.argv[1][:4] == '-psn':
@@ -53,7 +53,7 @@ if options.exit:
     try:
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         sock.connect(single_app_addr)
-        sock.send('EXIT')
+        sock.send(b'EXIT')
         if sock.recv(1024).strip() == 'OK': print ('Ok')
     except Exception as e:
         pass

README.md

@@ -13,9 +13,19 @@ See: https://foldingathome.org/
 
 ## Debian / Ubuntu
 
-    sudo apt-get install -y python-stdeb python-gtk2 python-all debhelper \
-      dh-python
+    sudo apt-get install -y python3-stdeb python3-gi python3-all python3-six debhelper \
+      dh-python gir1.2-gtk-3.0
 
 ## RedHat / CentOS
 
-    sudo yum install -y pygtk2
+    sudo yum install -y python3-gobject python3-six
+
+## Arch Linux / Manjaro
+
+    sudo pacman -S python python-setuptools python-gobject python-six
+
+Alternatively, use the unofficial [AUR package](https://aur.archlinux.org/packages/fahcontrol/) (or [this one for the GTK3/Python3 fork](https://aur.archlinux.org/packages/fahcontrol-gtk3-git)
+
+## Windows (MinGW in MSYS2)
+
+    pacman -S mingw-w64-x86_64-{gtk3,python-{cx_Freeze,gobject,six}}

SConstruct

@@ -3,8 +3,8 @@ import os
 env = Environment(ENV = os.environ)
 try:
     env.Tool('config', toolpath = [os.environ.get('CBANG_HOME')])
-except Exception, e:
-    raise Exception, 'CBANG_HOME not set?\n' + str(e)
+except Exception as e:
+    raise Exception('CBANG_HOME not set?\n' + str(e))
 
 env.CBLoadTools('packager run_distutils osx fah-client-version')
 env.CBAddVariables(
@@ -14,7 +14,7 @@ conf = env.CBConfigure()
 # Version
 try:
     version = env.FAHClientVersion()
-except Exception, e:
+except Exception as e:
     print(e)
     version = '0.0.0'
     env.Replace(PACKAGE_VERSION = version)
@@ -51,7 +51,7 @@ if env.GetPackageType() != 'rpm':
 
     if int(env.get('cross_mingw', 0)):
         # Use the cross compiled Python
-        gui = env.Command(target_dir, 'setup.py', 'python2.exe setup.py build')
+        gui = env.Command(target_dir, 'setup.py', 'python3.exe setup.py build')
     else:
         gui = env.RunDistUtils(Dir(target_dir), 'setup.py')
 

debian/changelog

@@ -0,0 +1,5 @@
+fahcontrol (7.7.0) unstable; urgency=medium
+
+  * Initial release. (Closes: #XXXXXX)
+
+ -- Braiam Peguero <[email protected]>  Tue, 21 Apr 2020 07:25:35 -0400

debian/control

@@ -0,0 +1,32 @@
+Source: fahcontrol
+Section: science
+Priority: optional
+Maintainer: Braiam Peguero <[email protected]>
+Build-Depends: debhelper-compat (= 11),
+               dh-python,
+               gir1.2-gtk-3.0,
+               python3,
+               python3-gi,
+               python3-six,
+               python3-setuptools
+Standards-Version: 4.5.0
+Homepage: https://foldingathome.org/
+Vcs-Git: https://github.com/FoldingAtHome/fah-control.git
+Vcs-Browser: https://github.com/FoldingAtHome/fah-control
+Rules-Requires-Root: no
+X-Python-Version: >= 3.6
+
+Package: fahcontrol
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Suggests: fahclient, fahviewer
+Description: Folding@home Client Control
+ Folding@home is a distributed computing project using volunteered
+ computer resources.
+ .
+ This package contains FAHControl, a graphical monitor and control
+ utility for the Folding@home client. It gives an overview of running
+ projects on the local and optional (remote) machines. Starting,
+ stopping and pausing of the running projects is also possible, as is
+ viewing the logs. It provides an Advanced view with
+ additional information and settings for enthusiasts and gurus.

debian/fahcontrol.install

@@ -0,0 +1 @@
+FAHControl.desktop usr/share/applications

debian/rules

@@ -0,0 +1,7 @@
+#! /usr/bin/make -f
+
+#export DH_VERBOSE = 1
+export PYBUILD_NAME = fahcontrol
+
+%:
+	dh $@ --with python3 --buildsystem=pybuild

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

debian/source/local-options

@@ -0,0 +1,4 @@
+tar-ignore = ".git"
+tar-ignore = "__pycache__"
+tar-ignore = "theme-engines"
+tar-ignore = "FAHControl.egg-info"

ez_setup.py

@@ -13,7 +13,7 @@
 
 This file can also be run as a script to install or upgrade setuptools.
 """
-from __future__ import print_function
+
 
 import sys
 DEFAULT_VERSION = "0.6c11"
@@ -133,7 +133,7 @@ def download_setuptools(
     with a '/'). `to_dir` is the directory where the egg will be downloaded.
     `delay` is the number of seconds to pause before an actual download attempt.
     """
-    import urllib2, shutil
+    import urllib.request, urllib.error, urllib.parse, shutil
     egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
     url = download_base + egg_name
     saveto = os.path.join(to_dir, egg_name)
@@ -159,7 +159,7 @@ def download_setuptools(
                     version, download_base, delay, url
                 ); from time import sleep; sleep(delay)
             log.warn("Downloading %s", url)
-            src = urllib2.urlopen(url)
+            src = urllib.request.urlopen(url)
             # Read/write all in one block, so we don't create a corrupt file
             # if the download is interrupted.
             data = _validate_md5(egg_name, src.read())
@@ -256,7 +256,7 @@ def update_md5(filenames):
         md5_data[base] = md5(f.read()).hexdigest()
         f.close()
 
-    data = ["    %r: %r,\n" % it for it in md5_data.items()]
+    data = ["    %r: %r,\n" % it for it in list(md5_data.items())]
     data.sort()
     repl = "".join(data)