Merge pull request #3536 from davidhewitt/maturin-build-args

examples: remove requirements-dev.txt files
2023-10-29 13:27:15 +00:00 · 2023-10-29 13:27:15 +00:00 · 7a2c63da76
parent bb808dad5c 391687dab6
commit 7a2c63da76
26 changed files with 56 additions and 54 deletions
--- a/examples/decorator/.template/pyproject.toml
+++ b/examples/decorator/.template/pyproject.toml
@ -5,3 +5,6 @@ build-backend = "maturin"
 [project]
 name = "{{project-name}}"
 version = "0.1.0"
+
+[project.optional-dependencies]
+dev = ["pytest"]
--- a/examples/decorator/noxfile.py
+++ b/examples/decorator/noxfile.py
@ -2,8 +2,7 @@ import nox


@nox.session
-def python(session):
-    session.install("-rrequirements-dev.txt")
-    session.install("maturin")
-    session.run_always("maturin", "develop")
+def python(session: nox.Session):
+    session.env["MATURIN_PEP517_ARGS"] = "--profile=dev"
+    session.install(".[dev]")
    session.run("pytest")
--- a/examples/decorator/pyproject.toml
+++ b/examples/decorator/pyproject.toml
@ -14,3 +14,6 @@ classifiers = [
    "Operating System :: POSIX",
    "Operating System :: MacOS :: MacOS X",
 ]
+
+[project.optional-dependencies]
+dev = ["pytest"]
--- a/examples/decorator/requirements-dev.txt
+++ b/examples/decorator/requirements-dev.txt
@ -1,3 +0,0 @@
-pytest>=3.5.0
-pip>=21.3
-maturin>=0.12,<0.13
--- a/examples/getitem/.template/pyproject.toml
+++ b/examples/getitem/.template/pyproject.toml
@ -5,3 +5,6 @@ build-backend = "maturin"
 [project]
 name = "{{project-name}}"
 version = "0.1.0"
+
+[project.optional-dependencies]
+dev = ["pytest"]
--- a/examples/getitem/noxfile.py
+++ b/examples/getitem/noxfile.py
@ -2,8 +2,7 @@ import nox


@nox.session
-def python(session):
-    session.install("-rrequirements-dev.txt")
-    session.install("maturin")
-    session.run_always("maturin", "develop")
+def python(session: nox.Session):
+    session.env["MATURIN_PEP517_ARGS"] = "--profile=dev"
+    session.install(".[dev]")
    session.run("pytest")
--- a/examples/getitem/pyproject.toml
+++ b/examples/getitem/pyproject.toml
@ -14,3 +14,6 @@ classifiers = [
    "Operating System :: POSIX",
    "Operating System :: MacOS :: MacOS X",
 ]
+
+[project.optional-dependencies]
+dev = ["pytest"]
--- a/examples/getitem/requirements-dev.txt
+++ b/examples/getitem/requirements-dev.txt
@ -1,3 +0,0 @@
-pytest>=3.5.0
-pip>=21.3
-maturin>=1,<2
--- a/examples/maturin-starter/.template/pyproject.toml
+++ b/examples/maturin-starter/.template/pyproject.toml
@ -5,3 +5,6 @@ build-backend = "maturin"
 [project]
 name = "{{project-name}}"
 version = "0.1.0"
+
+[project.optional-dependencies]
+dev = ["pytest"]
--- a/examples/maturin-starter/noxfile.py
+++ b/examples/maturin-starter/noxfile.py
@ -3,7 +3,6 @@ import nox

@nox.session
 def python(session):
-    session.install("-rrequirements-dev.txt")
-    session.install("maturin")
-    session.run_always("maturin", "develop")
+    session.env["MATURIN_PEP517_ARGS"] = "--profile=dev"
+    session.install(".[dev]")
    session.run("pytest")
--- a/examples/maturin-starter/pyproject.toml
+++ b/examples/maturin-starter/pyproject.toml
@ -14,3 +14,6 @@ classifiers = [
    "Operating System :: POSIX",
    "Operating System :: MacOS :: MacOS X",
 ]
+
+[project.optional-dependencies]
+dev = ["pytest"]
--- a/examples/maturin-starter/requirements-dev.txt
+++ b/examples/maturin-starter/requirements-dev.txt
@ -1,3 +0,0 @@
-pytest>=3.5.0
-pip>=21.3
-maturin>=0.12,<0.13
--- a/examples/plugin/plugin_api/noxfile.py
+++ b/examples/plugin/plugin_api/noxfile.py
@ -3,7 +3,6 @@ import nox

@nox.session
 def python(session):
-    session.install("-rrequirements-dev.txt")
-    session.install("maturin")
-    session.run_always("maturin", "develop", "--features", "extension-module")
+    session.env["MATURIN_PEP517_ARGS"] = "--profile=dev"
+    session.install(".[dev]")
    session.run("pytest")
--- a/examples/plugin/plugin_api/pyproject.toml
+++ b/examples/plugin/plugin_api/pyproject.toml
@ -10,3 +10,6 @@ classifiers = [
    "Programming Language :: Python :: Implementation :: CPython",
    "Programming Language :: Python :: Implementation :: PyPy",
 ]
+
+[project.optional-dependencies]
+dev = ["pytest"]
--- a/examples/plugin/plugin_api/requirements-dev.txt
+++ b/examples/plugin/plugin_api/requirements-dev.txt
@ -1,3 +0,0 @@
-pytest>=3.5.0
-pip>=21.3
-maturin>=0.14
--- a/examples/setuptools-rust-starter/noxfile.py
+++ b/examples/setuptools-rust-starter/noxfile.py
@ -2,7 +2,7 @@ import nox


@nox.session
-def python(session):
+def python(session: nox.Session):
    session.install("-rrequirements-dev.txt")
    session.run_always(
        "pip", "install", "-e", ".", "--no-build-isolation", env={"BUILD_DEBUG": "1"}
--- a/examples/string-sum/.template/pyproject.toml
+++ b/examples/string-sum/.template/pyproject.toml
@ -5,3 +5,6 @@ build-backend = "maturin"
 [project]
 name = "{{project-name}}"
 version = "0.1.0"
+
+[project.optional-dependencies]
+dev = ["pytest"]
--- a/examples/string-sum/noxfile.py
+++ b/examples/string-sum/noxfile.py
@ -2,8 +2,7 @@ import nox


@nox.session
-def python(session):
-    session.install("-rrequirements-dev.txt")
-    session.install("maturin")
-    session.run_always("maturin", "develop")
+def python(session: nox.Session):
+    session.env["MATURIN_PEP517_ARGS"] = "--profile=dev"
+    session.install(".[dev]")
    session.run("pytest")
--- a/examples/string-sum/pyproject.toml
+++ b/examples/string-sum/pyproject.toml
@ -3,7 +3,7 @@ requires = ["maturin>=1,<2"]
 build-backend = "maturin"

 [project]
-name = "string sum"
+name = "string_sum"
 version = "0.1.0"
 classifiers = [
    "License :: OSI Approved :: MIT License",
@ -14,3 +14,6 @@ classifiers = [
    "Operating System :: POSIX",
    "Operating System :: MacOS :: MacOS X",
 ]
+
+[project.optional-dependencies]
+dev = ["pytest"]
--- a/examples/string-sum/requirements-dev.txt
+++ b/examples/string-sum/requirements-dev.txt
@ -1,3 +0,0 @@
-pytest>=3.5.0
-pip>=21.3
-maturin>=0.12,<0.13
--- a/examples/word-count/.template/pre-script.rhai
+++ b/examples/word-count/.template/pre-script.rhai
@ -1,3 +1,4 @@
 variable::set("PYO3_VERSION", "0.20.0");
 file::rename(".template/Cargo.toml", "Cargo.toml");
+file::rename(".template/pyproject.toml", "pyproject.toml");
 file::delete(".template");
--- a/examples/word-count/.template/pyproject.toml
+++ b/examples/word-count/.template/pyproject.toml
@ -1,9 +1,13 @@
 [build-system]
-requires = ["setuptools>=41.0.0", "wheel", "setuptools_rust>=1.0.0"]
+requires = ["maturin>=1,<2"]
+build-backend = "maturin"

 [project]
 name = "{{project-name}}"
 version = "0.1.0"

+[project.optional-dependencies]
+dev = ["pytest"]
+
 [tool.pytest.ini_options]
 addopts = "--benchmark-disable"
--- a/examples/word-count/.template/setup.cfg
+++ b/examples/word-count/.template/setup.cfg
@ -1,9 +0,0 @@
-[metadata]
-name = {{project-name}}
-version = 0.1.0
-packages =
-    word_count
-
-[options]
-include_package_data = True
-zip_safe = False
--- a/examples/word-count/noxfile.py
+++ b/examples/word-count/noxfile.py
@ -4,15 +4,14 @@ nox.options.sessions = ["test"]


@nox.session
-def test(session):
-    session.install("-rrequirements-dev.txt")
-    session.install("maturin")
-    session.run_always("maturin", "develop")
+def test(session: nox.Session):
+    session.env["MATURIN_PEP517_ARGS"] = "--profile=dev"
+    session.install(".[dev]")
    session.run("pytest")


@nox.session
-def bench(session):
-    session.install("-rrequirements-dev.txt")
-    session.install(".")
+def bench(session: nox.Session):
+    session.env["MATURIN_PEP517_ARGS"] = "--profile=dev"
+    session.install(".[dev]")
    session.run("pytest", "--benchmark-enable")
--- a/examples/word-count/pyproject.toml
+++ b/examples/word-count/pyproject.toml
@ -15,6 +15,8 @@ classifiers = [
    "Operating System :: MacOS :: MacOS X",
 ]

+[project.optional-dependencies]
+dev = ["pytest", "pytest-benchmark"]

 [tool.pytest.ini_options]
 addopts = "--benchmark-disable"
--- a/examples/word-count/requirements-dev.txt
+++ b/examples/word-count/requirements-dev.txt
@ -1,2 +0,0 @@
-pytest>=3.5.0
-pytest-benchmark>=3.1.1