Merge "Migrate project metadata to pyproject.toml"

pyproject.toml

@@ -1,3 +1,77 @@
 [build-system]
 requires = ["pbr>=6.0.0", "setuptools>=64.0.0"]
 build-backend = "pbr.build"
+
+[project]
+name = "openstack-cyborg"
+description = "Distributed Acceleration Management as a Service"
+readme = {file = "README.rst", content-type = "text/x-rst"}
+license = {text = "Apache-2.0"}
+requires-python = ">=3.10"
+authors = [
+    {name = "OpenStack", email = "openstack-discuss@lists.openstack.org"},
+]
+classifiers = [
+    "Environment :: OpenStack",
+    "Intended Audience :: Information Technology",
+    "Intended Audience :: System Administrators",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+]
+dynamic = ["version", "dependencies"]
+
+[project.urls]
+"Bug Tracker" = "https://bugs.launchpad.net/cyborg/"
+"Documentation" = "https://docs.openstack.org/cyborg/latest/"
+"Source Code" = "https://opendev.org/openstack/cyborg"
+
+[project.scripts]
+cyborg-api = "cyborg.cmd.api:main"
+cyborg-conductor = "cyborg.cmd.conductor:main"
+cyborg-dbsync = "cyborg.cmd.dbsync:main"
+cyborg-agent = "cyborg.cmd.agent:main"
+cyborg-status = "cyborg.cmd.status:main"
+
+[project.entry-points."oslo.policy.policies"]
+"cyborg.api" = "cyborg.policies:list_policies"
+
+[project.entry-points."oslo.config.opts"]
+cyborg = "cyborg.conf.opts:list_opts"
+
+[project.entry-points."cyborg.database.migration_backend"]
+sqlalchemy = "cyborg.db.sqlalchemy.migration"
+
+[project.entry-points."cyborg.accelerator.driver"]
+intel_fpga_driver = "cyborg.accelerator.drivers.fpga.intel.driver:IntelFPGADriver"
+inspur_fpga_driver = "cyborg.accelerator.drivers.fpga.inspur.driver:InspurFPGADriver"
+xilinx_fpga_driver = "cyborg.accelerator.drivers.fpga.xilinx.driver:XilinxFPGADriver"
+nvmf_spdk_driver = "cyborg.accelerator.drivers.spdk.nvmf.nvmf:NVMFDRIVER"
+nvidia_gpu_driver = "cyborg.accelerator.drivers.gpu.nvidia.driver:NVIDIAGPUDriver"
+fake_driver = "cyborg.accelerator.drivers.fake:FakeDriver"
+huawei_ascend_driver = "cyborg.accelerator.drivers.aichip.huawei.ascend:AscendDriver"
+intel_qat_driver = "cyborg.accelerator.drivers.qat.intel.driver:IntelQATDriver"
+intel_nic_driver = "cyborg.accelerator.drivers.nic.intel.driver:IntelNICDriver"
+inspur_nvme_ssd_driver = "cyborg.accelerator.drivers.ssd.inspur.driver:InspurNVMeSSDDriver"
+pci_driver = "cyborg.accelerator.drivers.pci.pci.driver:PCIDriver"
+
+[tool.setuptools]
+packages = ["cyborg"]
+
+# NOTE: data-files is deprecated by setuptools in favour of package_data,
+# but package_data installs files inside the Python package tree and is not
+# a suitable replacement for operator-facing configuration files that must
+# be installed to system paths (e.g. /etc/cyborg/).  These two files are
+# required at runtime by PasteDeploy (api-paste.ini) and oslo.policy
+# (policy.yaml), so we keep data-files as the only available mechanism for
+# this use case.  Distribution packages (deb/rpm) typically override this
+# location via their own packaging rules.
+[tool.setuptools.data-files]
+"etc/cyborg" = ["etc/cyborg/policy.yaml", "etc/cyborg/api-paste.ini"]

releasenotes/notes/remove-wsgi-scripts-entry-point-4e4eeec78e174a07.yaml

@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    The ``cyborg-wsgi-api`` ``wsgi_scripts`` entry point has been removed.
+    This setuptools-specific mechanism for installing a WSGI script was
+    deprecated in the 2025.1 cycle. Deployments using mod_wsgi or uWSGI
+    should reference the WSGI application directly via
+    ``cyborg.wsgi.api:application`` as described in the WSGI deployment
+    documentation.

setup.cfg

@@ -1,64 +1,2 @@
 [metadata]
 name = openstack-cyborg
-summary = Distributed Acceleration Management as a Service
-description_file =
-    README.rst
-author = OpenStack
-author_email = openstack-discuss@lists.openstack.org
-home_page = https://docs.openstack.org/cyborg/latest/
-python_requires = >=3.10
-classifier =
-    Environment :: OpenStack
-    Intended Audience :: Information Technology
-    Intended Audience :: System Administrators
-    License :: OSI Approved :: Apache Software License
-    Operating System :: POSIX :: Linux
-    Programming Language :: Python
-    Programming Language :: Python :: Implementation :: CPython
-    Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-
-[files]
-packages =
-    cyborg
-data_files =
-    etc/cyborg =
-        etc/cyborg/policy.yaml
-        etc/cyborg/api-paste.ini
-
-[entry_points]
-oslo.policy.policies =
-    cyborg.api = cyborg.policies:list_policies
-
-console_scripts =
-    cyborg-api = cyborg.cmd.api:main
-    cyborg-conductor = cyborg.cmd.conductor:main
-    cyborg-dbsync = cyborg.cmd.dbsync:main
-    cyborg-agent = cyborg.cmd.agent:main
-    cyborg-status = cyborg.cmd.status:main
-
-# NOTE(sean-k-mooney): this should be removed in 2026.1
-# as this will eventually stop working entirely.
-wsgi_scripts =
-    cyborg-wsgi-api = cyborg.api.wsgi_app:init_application
-
-cyborg.database.migration_backend =
-    sqlalchemy = cyborg.db.sqlalchemy.migration
-
-cyborg.accelerator.driver =
-    intel_fpga_driver = cyborg.accelerator.drivers.fpga.intel.driver:IntelFPGADriver
-    inspur_fpga_driver = cyborg.accelerator.drivers.fpga.inspur.driver:InspurFPGADriver
-    xilinx_fpga_driver = cyborg.accelerator.drivers.fpga.xilinx.driver:XilinxFPGADriver
-    nvmf_spdk_driver = cyborg.accelerator.drivers.spdk.nvmf.nvmf:NVMFDRIVER
-    nvidia_gpu_driver = cyborg.accelerator.drivers.gpu.nvidia.driver:NVIDIAGPUDriver
-    fake_driver = cyborg.accelerator.drivers.fake:FakeDriver
-    huawei_ascend_driver = cyborg.accelerator.drivers.aichip.huawei.ascend:AscendDriver
-    intel_qat_driver = cyborg.accelerator.drivers.qat.intel.driver:IntelQATDriver
-    intel_nic_driver = cyborg.accelerator.drivers.nic.intel.driver:IntelNICDriver
-    inspur_nvme_ssd_driver = cyborg.accelerator.drivers.ssd.inspur.driver:InspurNVMeSSDDriver
-    pci_driver = cyborg.accelerator.drivers.pci.pci.driver:PCIDriver
-
-oslo.config.opts =
-    cyborg = cyborg.conf.opts:list_opts