Changes for building rpms (#1248)

Author: joachimmetz

data/projects.ini

@@ -507,7 +507,6 @@ dpkg_dependencies: python3-click,python3-itsdangerous,python3-jinja2,python3-wer
 dpkg_name: python-flor
 dpkg_source_name: flor
 rpm_template_spec: Flor.spec
-wheel_name: flor
 maintainer: Andreas Dewes <andreas.dewes@dcso.de>
 homepage_url: https://github.com/DCSO/flor
 download_url: https://pypi.org/project/Flor
@@ -1665,6 +1664,7 @@ version: >=1.5.5.1
 maintainer: Sergey Dryabzhinsky <sergey.dryabzhinsky@gmail.com>
 rpm_template_spec: zstd.spec
 setup_name: zstd
+wheel_name: zstd
 homepage_url: https://github.com/sergey-dryabzhinsky/python-zstd
 download_url: https://pypi.org/project/zstd/
 git_url: https://github.com/sergey-dryabzhinsky/python-zstd.git
@@ -1998,7 +1998,7 @@ build_system: setuptools
 disabled: windows
 dpkg_build_dependencies: python3-cffi,python3-setuptools,python3-toml,python3-wheel
 dpkg_name: python-xattr
-rpm_build_dependencies: python3-cffi,python3-pip,python3-setuptools,python3-wheel
+rpm_build_dependencies: python3-cffi,python3-pip,python3-setuptools,python3-wheel,tox
 rpm_name: python-xattr
 maintainer: John Machin <sjmachin@lexicon.net>
 license: MIT

data/templates/github_actions/test_tox.yml

@@ -14,8 +14,6 @@ jobs:
     strategy:
       matrix:
         include:
-        - python-version: '3.9'
-          toxenv: 'py39,wheel'
         - python-version: '3.10'
           toxenv: 'py310,wheel'
         - python-version: '3.11'

data/templates/setup.cfg/metadata

@@ -22,4 +22,4 @@ install_requires = file:requirements.txt
 package_dir =
   ${python_module_name} = ${python_module_name}
 packages = find:
-python_requires = >=3.9
+python_requires = >=3.10

tools/update.py

@@ -265,14 +265,27 @@ class DependencyUpdater(object):
       'org.python.pypi.',
       'net.sourceforge.projects.']
 
+  # Some projects have different PyPI names than their project names.
+  _PYPI_ALIASES = {
+      'flor': 'Flor',
+      'lz4': 'python-lz4',
+      'redis': 'redis-py',
+      'snappy': 'python-snappy',
+      'zstd': 'python-zstd'}
+
+  # Some projects have different wheel names in l2tbinaries than defined
+  # in their project definitions.
+  # TODO: remove after l2tbinaries Python 3.14 upgrade.
+  _WHEEL_ALIASES = {
+      'bencode.py': 'bencode_py',
+      'PyYAML': 'pyyaml',
+      'XlsxWriter': 'xlsxwriter'}
+
   # Some projects have different wheel names than their project names.
-  _ALTERNATE_NAMES = {
-      # TODO: remove bencode.py after Python 3.14 upgrade.
+  _PROJECT_ALIASES = {
       'bencode.py': 'bencode',
       'bencode_py': 'bencode',
-      'flor': 'Flor',
       'lz4': 'python-lz4',
-      'pyyaml': 'PyYAML',
       'zstd': 'python-zstd'}
 
   def __init__(
@@ -376,18 +389,18 @@ def _GetAvailableWheelPackages(self):
 
   def _GetWheelPackageFilenamesAndVersions(
       self, project_definitions, available_packages,
-      user_defined_package_names):
+      user_defined_wheel_package_names):
     """Determines the wheel package filenames and versions.
 
     Args:
       project_definitions (dist[str, ProjectDefinition]): project definitions
           per name.
       available_packages (list[PackageDownload]): packages available for
           download.
-      user_defined_package_names (list[str]): names of packages that should be
-          updated if an update is available. These package names are derived
-          from the user specified names of projects. An empty list represents
-          all available packages.
+      user_defined_wheel_package_names (list[str]): names of the wheels of
+          packages that should be updated if an update is available. These
+          package names are derived from the user specified names of projects.
+          An empty list represents all available packages.
 
     Returns:
       tuple: containing:
@@ -411,14 +424,15 @@ def _GetWheelPackageFilenamesAndVersions(
           self._download_directory, package_filename)
 
       # Ignore package names if user defined.
-      if user_defined_package_names:
-        in_package_names = package_name in user_defined_package_names
+      if user_defined_wheel_package_names:
+        in_package_names = package_name in user_defined_wheel_package_names
 
-        alternate_name = self._ALTERNATE_NAMES.get(package_name, None)
+        alternate_name = self._WHEEL_ALIASES.get(package_name, None)
         if alternate_name:
           if ((self._exclude_packages and in_package_names) or
               (not self._exclude_packages and not in_package_names)):
-            in_package_names = alternate_name in user_defined_package_names
+            in_package_names = (
+                alternate_name in user_defined_wheel_package_names)
 
         if ((self._exclude_packages and in_package_names) or
             (not self._exclude_packages and not in_package_names)):
@@ -438,7 +452,7 @@ def _GetWheelPackageFilenamesAndVersions(
       project_definition = project_definition_per_package_name.get(
           package_name, None)
       if not project_definition:
-        alternate_name = self._ALTERNATE_NAMES.get(package_name, None)
+        alternate_name = self._PROJECT_ALIASES.get(package_name, None)
         if alternate_name:
           project_definition = project_definitions.get(alternate_name, None)
 
@@ -494,11 +508,11 @@ def _GetUserDefinedWheelPackageNames(
           available. These package names are derived from the user specified
           names of projects. An empty list represents all available packages.
     """
-    user_defined_package_names = []
+    user_defined_wheel_package_names = []
     for project_name in user_defined_project_names:
       project_definition = project_definitions.get(project_name, None)
       if not project_definition:
-        alternate_name = self._ALTERNATE_NAMES.get(project_name, None)
+        alternate_name = self._PYPI_ALIASES.get(project_name, None)
         if alternate_name:
           project_definition = project_definitions.get(alternate_name, None)
 
@@ -511,9 +525,9 @@ def _GetUserDefinedWheelPackageNames(
           project_definition, 'wheel_name', None) or project_name
 
       package_name = package_name.lower()
-      user_defined_package_names.append(package_name)
+      user_defined_wheel_package_names.append(package_name)
 
-    return user_defined_package_names
+    return user_defined_wheel_package_names
 
   def _InstallWheelPackagesWindows(self, package_filenames, package_versions):
     """Installs wheel packages on Windows.
@@ -582,7 +596,7 @@ def UpdatePackages(self, projects_file, user_defined_project_names):
     """
     project_definitions = self._GetProjectDefinitions(projects_file)
 
-    user_defined_package_names = self._GetUserDefinedWheelPackageNames(
+    user_defined_wheel_package_names = self._GetUserDefinedWheelPackageNames(
         project_definitions, user_defined_project_names)
 
     available_packages = self._GetAvailableWheelPackages()
@@ -596,7 +610,7 @@ def UpdatePackages(self, projects_file, user_defined_project_names):
     package_filenames, package_versions = (
         self._GetWheelPackageFilenamesAndVersions(
             project_definitions, available_packages,
-            user_defined_package_names))
+            user_defined_wheel_package_names))
 
     if self._download_only:
       return True