Merge branch 'main' into type-hints

Author: prandla

cmscommon/archive.py

@@ -184,8 +184,10 @@ def namelist(self) -> list[str]:
             names = []
             for path, _, filenames in os.walk(self.temp_dir):
                 for filename in filenames:
-                    names.append(os.path.relpath(os.path.join(path, filename),
-                                                 self.temp_dir))
+                    filepath = os.path.join(path, filename)
+                    if os.path.islink(filepath) or not os.path.isfile(filepath):
+                        continue
+                    names.append(os.path.relpath(filepath, self.temp_dir))
             return names
 
     def read(self, file_path: str) -> typing.BinaryIO:

setup.py

@@ -194,7 +194,7 @@ class build_py_and_l10n(build_py):
         ],
     },
     keywords="ioi programming contest grader management system",
-    license_expression="AGPL-3.0-only",
+    license_expression="AGPL-3.0-or-later",
     python_requires=">=3.11",
     classifiers=[
         "Development Status :: 5 - Production/Stable",