Add pyproject.toml and move metadata from setup.py

.github/workflows/build-test.yml

@@ -81,10 +81,13 @@ jobs:
 
     - name: Build and install
       run: |
-        python setup.py bdist_wheel
+        python -m build
         pip install dist/staticx-*-py3-none-manylinux1_x86_64.whl
         staticx --version
 
+        # Make sure we only use the installed wheel
+        rm -r staticx bootloader
+
     - name: Run unit tests
       run: |
         pytest -v

.github/workflows/publish-pypi.yml

@@ -36,7 +36,6 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel
 
         sudo apt-get update
         sudo apt-get install -y musl-tools scons
@@ -50,7 +49,7 @@ jobs:
           export CI_VERSION_BUILD_NUMBER=${{ github.run_id }}
         fi
 
-        python setup.py sdist bdist_wheel
+        python -m build
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v3

VERSIONING.md

@@ -52,4 +52,5 @@ versioning scheme. Consider a base version of `1.2.3`:
    created via `python setup.py sdist`. In this case, the version comes from
    the egg info generated by setuptools.
 
-In any case, when StaticX is installed, the version comes from `pkg_resources`.
+In any case, when StaticX is installed, the version comes from
+`importlib.metadata`.

pyproject.toml

@@ -0,0 +1,47 @@
+[project]
+name = "staticx"
+dynamic = ["version"]
+
+authors = [
+    {name = "Jonathon Reinhart", email="[email protected]"},
+]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
+    "Natural Language :: English",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Topic :: Software Development :: Build Tools",
+]
+dependencies = [
+    "pyelftools",
+]
+description = "Build static self-extracting app from dynamic executable"
+license = {file = "LICENSE.txt"}
+readme = "README.md"
+requires-python = ">=3.7"
+
+[project.scripts]
+staticx = "staticx.__main__:main"
+sx-extract = "staticx.extract:main"
+
+[project.urls]
+documentation = "https://staticx.readthedocs.io/"
+repository = "https://github.com/JonathonReinhart/staticx"
+changelog = "https://github.com/JonathonReinhart/staticx/blob/main/CHANGELOG.md"
+
+[build-system]
+# Tells pip to install wheel before trying to install
+# from an sdist or from Github.
+requires = [
+    "wheel",
+    "setuptools >= 42.0.0",
+]

requirements.txt

@@ -1,14 +1,9 @@
 # These requirements are in addition to install_requires from setup.py
 # and are only used for development and testing.
+build
 patchelf-wrapper
 pyinstaller
-
-# https://github.com/pypa/setuptools/issues/1963
-# Exclude from 45.0.0 until 49.1.1
-setuptools !=45.*, !=46.*, !=47.*, !=48.*, !=49.1.0
-
 scuba
-wheel
 cffi        # Used for test/pyinstall-cffi/
 pytest
 -r docs/requirements.txt

setup.py

@@ -113,62 +113,22 @@ def get_platform():
 
 ################################################################################
 
-def read_project_file(path):
-    proj_dir = os.path.dirname(__file__)
-    path = os.path.join(proj_dir, path)
-    with open(path, 'r') as f:
-        return f.read()
-
 setup(
-    name = 'staticx',
+    #####
+    # Dynamic core metadata, in addition to pyproject.toml [project]
     version = get_dynamic_version(),
-    description = 'Build static self-extracting app from dynamic executable',
-    python_requires='>=3.7',
-    long_description = read_project_file('README.md'),
-    long_description_content_type = 'text/markdown',
-    classifiers = [
-        'Development Status :: 3 - Alpha',
-        'Environment :: Console',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
-        'Natural Language :: English',
-        'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Topic :: Software Development :: Build Tools',
-    ],
-    license = 'GPL v2 with special exception allowing StaticX to build and'
-              ' distribute non-free programs',
-    author = 'Jonathon Reinhart',
-    author_email = '[email protected]',
-    url = 'https://github.com/JonathonReinhart/staticx',
-    packages = find_packages(),
+    #####
+    # Setuptools-specific config
+    # We could put this in pyproject.toml [tool.setuptools], but choose not to:
+    # - The functionality is still in beta and requires setuptools >= 61.0.0
+    # - We need setup.py to provide build_hook, so we might as well keep all
+    #   setuptools-specific config here, in one file.
+    packages=find_packages(),
     package_data = {
         'staticx': ['assets/*/*'],
     },
-
-    # Ugh.
-    # https://github.com/JonathonReinhart/staticx/issues/22
-    # https://github.com/JonathonReinhart/scuba/issues/77
-    # https://github.com/pypa/setuptools/issues/1064
-    include_package_data = True,
-
+    include_package_data=True,  # https://github.com/pypa/setuptools/issues/1064
     zip_safe = False,   # http://stackoverflow.com/q/24642788/119527
-    entry_points = {
-        'console_scripts': [
-            'staticx = staticx.__main__:main',
-            'sx-extract = staticx.extract:main',
-        ]
-    },
-    install_requires = [
-        'pyelftools',
-    ],
-
     # http://stackoverflow.com/questions/17806485
     # http://stackoverflow.com/questions/21915469
     # PyInstaller setup.py