Merge pull request hpcugent#337 from wdpypere/py3only

python3 only

Author: stdweird

.github/workflows/unittest.yml

@@ -1,24 +1,28 @@
-name: run python tests
-on: [push, pull_request]
-
+# .github/workflows/unittest.yml: configuration file for github actions worflow
+# This file was automatically generated using 'python -m vsc.install.ci'
+# DO NOT EDIT MANUALLY
 jobs:
   python_unittests:
-      runs-on: ubuntu-20.04
-      strategy:
-        matrix:
-          python: [2.7, 3.6, 3.7, 3.8, 3.9]
-      steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python }}
-      - name: install tox
-        run: pip install tox
-      - name: add mandatory git remote
-        # 'hpcugent' is a mandatory remote for setup.py to work (because of get_name_url)
-        run: git remote add hpcugent https://github.com/hpcugent/vsc-base.git
-      - name: Run tox
-        # Run tox using the version of Python in `PATH`
-        run: tox -e py
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+    - name: Setup Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python }}
+    - name: install tox
+      run: pip install tox
+    - name: add mandatory git remote
+      run: git remote add hpcugent https://github.com/hpcugent/vsc-base.git
+    - name: Run tox
+      run: tox -e py
+    strategy:
+      matrix:
+        python:
+        - 3.6
+        - 3.9
+name: run python tests
+'on':
+- push
+- pull_request

Jenkinsfile

@@ -9,7 +9,6 @@ node {
         sh 'git clean -fxd'
     }
     stage('test') {
-        sh 'python2.7 -V'
         sh 'pip3 install --ignore-installed --prefix $PWD/.vsc-tox tox'
         sh 'export PATH=$PWD/.vsc-tox/bin:$PATH && export PYTHONPATH=$PWD/.vsc-tox/lib/python$(python3 -c "import sys; print(\\"%s.%s\\" % sys.version_info[:2])")/site-packages:$PYTHONPATH && tox -v -c tox.ini'
         sh 'rm -r $PWD/.vsc-tox'

README.md

@@ -1,17 +1,9 @@
 # vsc-base
 
-### Build Status
-
-- Python 2.6 : [![Build Status](https://jenkins1.ugent.be/job/vsc-base-python26/badge/icon)](https://jenkins1.ugent.be/job/vsc-base-python26/)
-- Python 2.7 : [![Build Status](https://jenkins1.ugent.be/job/vsc-base-python27/badge/icon)](https://jenkins1.ugent.be/job/vsc-base-python27/)
-
 # Description
 
 Common tools used within our organization.
-Originally created by the HPC team of Ghent University (http://ugent.be/hpc).
-
-# Documentation
-https://jenkins1.ugent.be/job/vsc-base-python26/Documentation/
+Originally created by the HPC team of Ghent University (https://ugent.be/hpc).
 
 # Namespaces and tools
 
@@ -60,12 +52,9 @@ A collection of python scripts, these are examples of how you could use fancylog
 - __logdaemon.py__: A daemon that listens on a port for udp packets and logs them to file, works toghether with fancylogger.
 - __startlogdaemon.py__ : Script that will start the logdaemon for  you and set environment variables for fancylogger.
 
-# License
-vsc-base is made available under the GNU Library General Public License (LGPL) version 2 or any later version.
-
 # Acknowledgements
-vsc-base was created with support of [Ghent University](http://www.ugent.be/en),
+vsc-base was created with support of [Ghent University](https://www.ugent.be/en),
 the [Flemish Supercomputer Centre (VSC)](https://vscentrum.be/nl/en),
-the [Flemish Research Foundation (FWO)](http://www.fwo.be/en),
-and [the Department of Economy, Science and Innovation (EWI)](http://www.ewi-vlaanderen.be/en).
+the [Flemish Research Foundation (FWO)](https://www.fwo.be/en),
+and [the Department of Economy, Science and Innovation (EWI)](https://www.ewi-vlaanderen.be/en).
 

bin/logdaemon.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2011-2022 Ghent University
+# Copyright 2011-2023 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -36,7 +36,6 @@
 
 @author: Jens Timmerman (Ghent University)
 """
-from __future__ import print_function
 from optparse import OptionParser
 from vsc.utils import fancylogger
 from vsc.utils.daemon import Daemon
@@ -79,9 +78,8 @@ def start(self):
         """
         # Check for a pidfile to see if the daemon already runs
         try:
-            pidf = open(self.pidfile, 'r')
-            pid = int(pidf.read().strip())
-            pidf.close()
+            with open(self.pidfile, 'r') as pidf:
+                pid = int(pidf.read().strip())
         except IOError:
             pid = None
 

lib/vsc/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2022 Ghent University
+# Copyright 2015-2023 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

lib/vsc/utils/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2022 Ghent University
+# Copyright 2015-2023 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

lib/vsc/utils/affinity.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2022 Ghent University
+# Copyright 2012-2023 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

lib/vsc/utils/asyncprocess.py

@@ -73,9 +73,6 @@
 import subprocess
 import time
 
-from vsc.utils.py2vs3 import is_py3
-
-
 PIPE = subprocess.PIPE
 STDOUT = subprocess.STDOUT
 MESSAGE = "Other end disconnected!"
@@ -190,17 +187,12 @@ def send_all(p, data):
     """
     allsent = 0
 
-    # in Python 3, we must use a bytestring
-    if is_py3():
-        data = data.encode()
+    data = data.encode()
 
     while len(data):
         sent = p.send(data)
         if sent is None:
             raise Exception(MESSAGE)
         allsent += sent
-        if is_py3():
-            data = memoryview(data)[sent:]
-        else:
-            data = buffer(data, sent)  # noqa (to avoid prospector failing on undefined 'buffer' in Python 3)
+        data = memoryview(data)[sent:]
     return allsent

lib/vsc/utils/daemon.py

@@ -63,17 +63,18 @@ def daemonize(self):
         # redirect standard file descriptors
         sys.stdout.flush()
         sys.stderr.flush()
-        si = open(self.stdin, 'r')
-        so = open(self.stdout, 'a+')
-        se = open(self.stderr, 'ba+', 0)
-        os.dup2(si.fileno(), sys.stdin.fileno())
-        os.dup2(so.fileno(), sys.stdout.fileno())
-        os.dup2(se.fileno(), sys.stderr.fileno())
+        with open(self.stdin, 'r') as sti:
+            os.dup2(sti.fileno(), sys.stdin.fileno())
+        with open(self.stdout, 'a+') as sto:
+            os.dup2(sto.fileno(), sys.stdout.fileno())
+        with open(self.stderr, 'ba+', 0) as ste:
+            os.dup2(ste.fileno(), sys.stderr.fileno())
 
         # write pidfile
         atexit.register(self.delpid)
         pid = str(os.getpid())
-        open(self.pidfile, 'w+').write("%s\n" % pid)
+        with open(self.pidfile, 'w+') as pidf:
+            pidf.write("%s\n" % pid)
 
     def delpid(self):
         os.remove(self.pidfile)
@@ -84,9 +85,8 @@ def start(self):
         """
         # Check for a pidfile to see if the daemon already runs
         try:
-            pf = open(self.pidfile, 'r')
-            pid = int(pf.read().strip())
-            pf.close()
+            with open(self.pidfile, 'r') as pidf:
+                pid = int(pidf.read().strip())
         except IOError:
             pid = None
 
@@ -105,9 +105,8 @@ def stop(self):
         """
         # Get the pid from the pidfile
         try:
-            pf = open(self.pidfile, 'r')
-            pid = int(pf.read().strip())
-            pf.close()
+            with open(self.pidfile, 'r') as pidf:
+                pid = int(pidf.read().strip())
         except IOError:
             pid = None
 

lib/vsc/utils/dateandtime.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2022 Ghent University
+# Copyright 2012-2023 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),