Merge pull request #93 from stdweird/ny

boegel · web-flow · commit 5869c21298e2 · 2024-01-05T09:03:42.000+01:00
happy newyear and new vsc-install
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-utils.git
     - name: Run tox
-      run: tox -e py
+      run: tox -e py$(echo ${{ matrix.python }} | sed 's/\.//g')
     strategy:
       matrix:
         python:
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-utils,
 # 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-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/availability.py b/lib/vsc/utils/availability.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/cache.py b/lib/vsc/utils/cache.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/fs_store.py b/lib/vsc/utils/fs_store.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/lock.py b/lib/vsc/utils/lock.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/nagios.py b/lib/vsc/utils/nagios.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/pickle_files.py b/lib/vsc/utils/pickle_files.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/rest_oauth.py b/lib/vsc/utils/rest_oauth.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/script_tools.py b/lib/vsc/utils/script_tools.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/timestamp.py b/lib/vsc/utils/timestamp.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2023 Ghent University
+# Copyright 2009-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/timestamp_pid_lockfile.py b/lib/vsc/utils/timestamp_pid_lockfile.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
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-utils,
 # 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 2016-2023 Ghent University
+# Copyright 2016-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/cache.py b/test/cache.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/nagios.py b/test/nagios.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/nagios_results.py b/test/nagios_results.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/nagios_simple.py b/test/nagios_simple.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2023 Ghent University
+# Copyright 2012-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/script_tools.py b/test/script_tools.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2023 Ghent University
+# Copyright 2016-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/timestamp.py b/test/timestamp.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2018-2023 Ghent University
+# Copyright 2018-2024 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/tox.ini b/tox.ini
@@ -6,9 +6,17 @@
 envlist = py36,py39
 skipsdist = true
 
-[testenv]
+[testenv:py36]
 commands_pre =
     pip install 'setuptools<42.0'
     python -m easy_install -U vsc-install
+
+[testenv:py39]
+setenv = SETUPTOOLS_USE_DISTUTILS=local
+commands_pre =
+    pip install 'setuptools<54.0' wheel
+    python -c "from setuptools import setup;setup(script_args=['-q', 'easy_install', '-v', '-U', 'vsc-install'])"
+
+[testenv]
 commands = python setup.py test
 passenv = USER

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright 2015-2023 Ghent University`
	`2`	`+# Copyright 2015-2024 Ghent University`
`3`	`3`	`#`
`4`	`4`	`# This file is part of vsc-utils,`
`5`	`5`	`# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright 2012-2023 Ghent University`
	`2`	`+# Copyright 2012-2024 Ghent University`
`3`	`3`	`#`
`4`	`4`	`# This file is part of vsc-utils,`
`5`	`5`	`# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),`