Merge pull request #348 from wdpypere/py2vs3

remove py2vs3 module
hpcugent · Feb 6, 2024 · 1e2da47 · 1e2da47
2 parents a18708d + f97db86
commit 1e2da47
Show file tree

Hide file tree

Showing 42 changed files with 51 additions and 351 deletions.
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -16,7 +16,7 @@ jobs:
     - name: add mandatory git remote
       run: git remote add hpcugent https://github.com/hpcugent/vsc-base.git
     - name: Run tox
-      run: tox -e py
+      run: tox -e py$(echo ${{ matrix.python }} | sed 's/\.//g')
     strategy:
       matrix:
         python:

diff --git a/bin/logdaemon.py b/bin/logdaemon.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2011-2023 Ghent University
+# Copyright 2011-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/__init__.py b/lib/vsc/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2023 Ghent University
+# Copyright 2015-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/__init__.py b/lib/vsc/utils/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2023 Ghent University
+# Copyright 2015-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/affinity.py b/lib/vsc/utils/affinity.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/dateandtime.py b/lib/vsc/utils/dateandtime.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/docs.py b/lib/vsc/utils/docs.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2023 Ghent University
+# Copyright 2015-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/exceptions.py b/lib/vsc/utils/exceptions.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2023 Ghent University
+# Copyright 2015-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/fancylogger.py b/lib/vsc/utils/fancylogger.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2023 Ghent University
+# Copyright 2011-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/generaloption.py b/lib/vsc/utils/generaloption.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2023 Ghent University
+# Copyright 2011-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/groups.py b/lib/vsc/utils/groups.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2018-2023 Ghent University
+# Copyright 2018-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/mail.py b/lib/vsc/utils/mail.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/missing.py b/lib/vsc/utils/missing.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/patterns.py b/lib/vsc/utils/patterns.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/py2vs3/__init__.py b/lib/vsc/utils/py2vs3/__init__.py
diff --git a/lib/vsc/utils/py2vs3/py3.py b/lib/vsc/utils/py2vs3/py3.py
diff --git a/lib/vsc/utils/run.py b/lib/vsc/utils/run.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2023 Ghent University
+# Copyright 2009-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/lib/vsc/utils/testing.py b/lib/vsc/utils/testing.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2023 Ghent University
+# Copyright 2014-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/setup.py b/setup.py
@@ -33,12 +33,12 @@
 """
 
 import vsc.install.shared_setup as shared_setup
-from vsc.install.shared_setup import ag, kh, jt, sdw
+from vsc.install.shared_setup import ag, kh, jt, sdw, wdp
 
 PACKAGE = {
-    'version': '3.6.0',
+    'version': '3.6.1',
     'author': [sdw, jt, ag, kh],
-    'maintainer': [sdw, jt, ag, kh],
+    'maintainer': [sdw, jt, ag, kh, wdp],
     'install_requires': [
         'vsc-install >= 0.17.19',
     ],

diff --git a/test/00-import.py b/test/00-import.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2023 Ghent University
+# Copyright 2016-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/test/__init__.py b/test/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/test/asyncprocess.py b/test/asyncprocess.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/test/dateandtime.py b/test/dateandtime.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/test/docs.py b/test/docs.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2023 Ghent University
+# Copyright 2015-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/test/exceptions.py b/test/exceptions.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2023 Ghent University
+# Copyright 2015-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/test/fancylogger.py b/test/fancylogger.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2013-2023 Ghent University
+# Copyright 2013-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -531,16 +531,8 @@ def test_zzz_fancylogger_as_rootlogger_logging(self):
         msg = 'this is my string'
         logging.debug(msg)
 
-
-
-        if sys.version_info < (3,7):
-            # logging stream handling was changed in python 3.7
-            # this is a good thing as messages can no longer go missing
-            expected_msg = ''
-        else:
-            expected_msg = f'DEBUG:root:{msg}\n'
-        self.assertEqual(stringfile.getvalue(), expected_msg,
-                         msg="logging.debug reports expected message (or not) when fancylogger loglevel is debug")
+        self.assertEqual(stringfile.getvalue(), '',
+                         msg="logging.debug reports nothing when fancylogger loglevel is debug")
 
         fancylogger.setroot()
         self.assertTrue(isinstance(logging.root, fancylogger.FancyLogger),

diff --git a/test/generaloption.py b/test/generaloption.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/test/groups.py b/test/groups.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/test/mail.py b/test/mail.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2023 Ghent University
+# Copyright 2014-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/test/missing.py b/test/missing.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

diff --git a/test/optcomplete.py b/test/optcomplete.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2013-2023 Ghent University
+# Copyright 2013-2024 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),