Merge pull request #337 from davidhewitt/pyproject

davidhewitt · web-flow · commit cb2eb67cf2e5 · 2023-05-16T23:02:01.000+01:00
migrate to pyproject.toml
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -4,6 +4,6 @@ tag = False
 current_version = 1.6.0
 message = release: {new_version}
 
-[bumpversion:file:setup.cfg]
+[bumpversion:file:pyproject.toml]
 
 [bumpversion:file:setuptools_rust/version.py]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -232,7 +232,7 @@ jobs:
 
           docker run --rm -v "$PWD":/io -w /io messense/manylinux2014-cross:${{ matrix.platform.arch }} bash build-wheels.sh
       - name: Install abi3 wheel and run tests
-        uses: uraimo/run-on-arch-action@v2.0.5
+        uses: uraimo/run-on-arch-action@v2.5.0
         with:
           arch: ${{ matrix.platform.arch }}
           distro: ubuntu20.04
@@ -275,7 +275,7 @@ jobs:
           python -m pip install wheel
           python setup.py bdist_wheel --plat-name manylinux2014_aarch64
           ls -la dist/
-      - uses: uraimo/run-on-arch-action@v2.1.1
+      - uses: uraimo/run-on-arch-action@v2.5.0
         name: Install built wheel
         with:
           arch: aarch64
@@ -320,7 +320,7 @@ jobs:
           python -m pip install wheel
           python setup.py bdist_wheel --plat-name manylinux2014_aarch64
           ls -la dist/
-      - uses: uraimo/run-on-arch-action@v2.1.1
+      - uses: uraimo/run-on-arch-action@v2.5.0
         name: Install built wheel
         with:
           arch: aarch64
diff --git a/examples/hello-world-script/noxfile.py b/examples/hello-world-script/noxfile.py
@@ -7,15 +7,13 @@
 
 @nox.session()
 def test(session: nox.Session):
-    session.install(SETUPTOOLS_RUST)
+    session.install(SETUPTOOLS_RUST, "wheel")
     session.install("--no-build-isolation", ".")
     session.run("hello-world-script", *session.posargs)
 
 
 @nox.session()
 def setuptools_install(session: nox.Session):
-    session.install("setuptools")
-    with session.chdir(SETUPTOOLS_RUST):
-        session.run("python", "setup.py", "install")
+    session.install(SETUPTOOLS_RUST)
     session.run("python", "setup.py", "install")
     session.run("hello-world-script", *session.posargs)
diff --git a/examples/hello-world-script/pyproject.toml b/examples/hello-world-script/pyproject.toml
@@ -1,2 +1,3 @@
 [build-system]
 requires = ["setuptools", "wheel", "setuptools-rust"]
+build-backend = "setuptools.build_meta"
diff --git a/examples/hello-world/noxfile.py b/examples/hello-world/noxfile.py
@@ -7,15 +7,13 @@
 
 @nox.session()
 def test(session: nox.Session):
-    session.install(SETUPTOOLS_RUST)
+    session.install(SETUPTOOLS_RUST, "wheel")
     session.install("--no-build-isolation", ".")
     session.run("hello-world", *session.posargs)
 
 
 @nox.session()
 def setuptools_install(session: nox.Session):
-    session.install("setuptools")
-    with session.chdir(SETUPTOOLS_RUST):
-        session.run("python", "setup.py", "install")
+    session.install(SETUPTOOLS_RUST)
     session.run("python", "setup.py", "install")
     session.run("hello-world", *session.posargs)
diff --git a/examples/hello-world/pyproject.toml b/examples/hello-world/pyproject.toml
@@ -1,2 +1,3 @@
 [build-system]
 requires = ["setuptools", "wheel", "setuptools-rust"]
+build-backend = "setuptools.build_meta"
diff --git a/examples/html-py-ever/noxfile.py b/examples/html-py-ever/noxfile.py
@@ -7,15 +7,15 @@
 
 @nox.session()
 def test(session: nox.Session):
-    session.install(SETUPTOOLS_RUST, "pytest", "pytest-benchmark", "beautifulsoup4")
+    session.install(
+        SETUPTOOLS_RUST, "wheel", "pytest", "pytest-benchmark", "beautifulsoup4"
+    )
     session.install("--no-build-isolation", ".")
     session.run("pytest", *session.posargs)
 
 
 @nox.session()
 def setuptools_install(session: nox.Session):
-    session.install("setuptools", "pytest", "pytest-benchmark", "beautifulsoup4")
-    with session.chdir(SETUPTOOLS_RUST):
-        session.run("python", "setup.py", "install")
+    session.install(SETUPTOOLS_RUST, "pytest", "pytest-benchmark", "beautifulsoup4")
     session.run("python", "setup.py", "install")
     session.run("pytest", *session.posargs)
diff --git a/examples/html-py-ever/pyproject.toml b/examples/html-py-ever/pyproject.toml
@@ -1,2 +1,3 @@
 [build-system]
 requires = ["setuptools", "wheel", "setuptools-rust"]
+build-backend = "setuptools.build_meta"
diff --git a/examples/namespace_package/noxfile.py b/examples/namespace_package/noxfile.py
@@ -7,15 +7,13 @@
 
 @nox.session()
 def test(session: nox.Session):
-    session.install(SETUPTOOLS_RUST, "pytest")
+    session.install(SETUPTOOLS_RUST, "wheel", "pytest")
     session.install("--no-build-isolation", ".")
     session.run("pytest", *session.posargs)
 
 
 @nox.session()
 def setuptools_install(session: nox.Session):
-    session.install("setuptools", "pytest")
-    with session.chdir(SETUPTOOLS_RUST):
-        session.run("python", "setup.py", "install")
+    session.install(SETUPTOOLS_RUST, "pytest")
     session.run("python", "setup.py", "install")
     session.run("pytest", *session.posargs)
diff --git a/examples/namespace_package/pyproject.toml b/examples/namespace_package/pyproject.toml
@@ -1,2 +1,3 @@
 [build-system]
 requires = ["setuptools", "wheel", "setuptools-rust"]
+build-backend = "setuptools.build_meta"
diff --git a/examples/rust_with_cffi/noxfile.py b/examples/rust_with_cffi/noxfile.py
@@ -7,15 +7,13 @@
 
 @nox.session()
 def test(session: nox.Session):
-    session.install(SETUPTOOLS_RUST, "pytest", "cffi")
+    session.install(SETUPTOOLS_RUST, "wheel", "pytest", "cffi")
     session.install("--no-build-isolation", ".")
     session.run("pytest", *session.posargs)
 
 
 @nox.session()
 def setuptools_install(session: nox.Session):
-    session.install("setuptools", "pytest", "cffi")
-    with session.chdir(SETUPTOOLS_RUST):
-        session.run("python", "setup.py", "install")
+    session.install(SETUPTOOLS_RUST, "pytest", "cffi")
     session.run("python", "setup.py", "install")
     session.run("pytest", *session.posargs)
diff --git a/examples/rust_with_cffi/pyproject.toml b/examples/rust_with_cffi/pyproject.toml
@@ -1,2 +1,3 @@
 [build-system]
 requires = ["setuptools", "wheel", "setuptools-rust"]
+build-backend = "setuptools.build_meta"
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,47 @@
+[project]
+name = "setuptools-rust"
+version = "1.6.0"
+description = "Setuptools Rust extension plugin"
+readme = "README.md"
+requires-python = ">=3.7"
+keywords = ["distutils", "setuptools", "rust"]
+authors = [
+    {name = "Nikolay Kim", email = "fafhrd91@gmail.com"},
+]
+classifiers = [
+    "Topic :: Software Development :: Version Control",
+    "License :: OSI Approved :: MIT License",
+    "Intended Audience :: Developers",
+    "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",
+    "Development Status :: 5 - Production/Stable",
+    "Operating System :: POSIX",
+    "Operating System :: MacOS :: MacOS X",
+    "Operating System :: Microsoft :: Windows",
+]
+
+dependencies = [
+    "setuptools>=62.4",
+    "semantic_version>=2.8.2,<3",
+    "typing_extensions>=3.7.4.3",
+]
+
+[project.entry-points."distutils.commands"]
+clean_rust = "setuptools_rust:clean_rust"
+build_rust = "setuptools_rust:build_rust"
+
+[project.entry-points."distutils.setup_keywords"]
+rust_extensions = "setuptools_rust.setuptools_ext:rust_extensions"
+
+[project.urls]
+repository = "https://github.com/PyO3/setuptools-rust"
+documentation = "https://setuptools-rust.readthedocs.io"
+changelog = "https://github.com/PyO3/setuptools-rust/blob/main/CHANGELOG.md"
+
 [build-system]
 requires = ["setuptools>=62.4"]
 build-backend = "setuptools.build_meta"
@@ -8,3 +52,7 @@ profile = "black"
 [tool.pytest.ini_options]
 minversion = "6.0"
 addopts = "--doctest-modules"
+
+[tool.setuptools]
+packages = ["setuptools_rust"]
+zip-safe = true
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/setuptools_rust/command.py b/setuptools_rust/command.py
@@ -1,10 +1,9 @@
 from abc import ABC, abstractmethod
 from distutils import log
-from distutils.cmd import Command
 from distutils.errors import DistutilsPlatformError
 from typing import List, Optional
 
-from setuptools.dist import Distribution
+from setuptools import Command, Distribution
 
 from .extension import RustExtension
 from .rustc_info import get_rust_version

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`[build-system]`
`2`	`2`	`requires = ["setuptools", "wheel", "setuptools-rust"]`
	`3`	`+build-backend = "setuptools.build_meta"`