From da885f696d8a08734f1b0beb2ca549c78711a0be Mon Sep 17 00:00:00 2001 From: David Hewitt <1939362+davidhewitt@users.noreply.github.com> Date: Wed, 13 Oct 2021 00:05:33 +0100 Subject: [PATCH] examples: use pip 21.3 --- examples/maturin-starter/requirements-dev.txt | 1 + examples/maturin-starter/tox.ini | 8 ++------ examples/pyo3-benchmarks/requirements-dev.txt | 1 + examples/pyo3-benchmarks/tox.ini | 9 ++------- examples/pyo3-pytests/requirements-dev.txt | 1 + examples/pyo3-pytests/tox.ini | 8 ++------ examples/setuptools-rust-starter/requirements-dev.txt | 1 + examples/setuptools-rust-starter/tox.ini | 9 ++------- examples/word-count/tox.ini | 9 ++------- 9 files changed, 14 insertions(+), 33 deletions(-) diff --git a/examples/maturin-starter/requirements-dev.txt b/examples/maturin-starter/requirements-dev.txt index a1fa3684..5c5fd612 100644 --- a/examples/maturin-starter/requirements-dev.txt +++ b/examples/maturin-starter/requirements-dev.txt @@ -1 +1,2 @@ pytest>=3.5.0 +pip>=21.3 diff --git a/examples/maturin-starter/tox.ini b/examples/maturin-starter/tox.ini index 0210b2c8..f03eeaa6 100644 --- a/examples/maturin-starter/tox.ini +++ b/examples/maturin-starter/tox.ini @@ -4,11 +4,7 @@ skipsdist = true [testenv] description = Run the unit tests under {basepython} -deps = - pip>=21.1 # for in-tree-build - -rrequirements-dev.txt +deps = -rrequirements-dev.txt commands = - # --use-feature=in-tree-build is necessary because this example is inside - # the PyO3 repo. - python -m pip install . --use-feature=in-tree-build + python -m pip install . pytest {posargs} diff --git a/examples/pyo3-benchmarks/requirements-dev.txt b/examples/pyo3-benchmarks/requirements-dev.txt index 83e561a6..8f7900ee 100644 --- a/examples/pyo3-benchmarks/requirements-dev.txt +++ b/examples/pyo3-benchmarks/requirements-dev.txt @@ -1,3 +1,4 @@ pytest>=3.5.0 setuptools-rust>=0.10.2 pytest-benchmark~=3.2 +pip>=21.3 diff --git a/examples/pyo3-benchmarks/tox.ini b/examples/pyo3-benchmarks/tox.ini index bd2fba74..1713e7eb 100644 --- a/examples/pyo3-benchmarks/tox.ini +++ b/examples/pyo3-benchmarks/tox.ini @@ -1,10 +1,5 @@ -[tox] -# can't install from sdist because local pyo3 repo can't be included in the sdist -skipsdist = true - [testenv] +usedevelop = True description = Run the unit tests under {basepython} deps = -rrequirements-dev.txt -commands = - python setup.py install - pytest --benchmark-sort=name {posargs} +commands = pytest --benchmark-sort=name {posargs} diff --git a/examples/pyo3-pytests/requirements-dev.txt b/examples/pyo3-pytests/requirements-dev.txt index 2ec263dd..cc06de69 100644 --- a/examples/pyo3-pytests/requirements-dev.txt +++ b/examples/pyo3-pytests/requirements-dev.txt @@ -1,3 +1,4 @@ hypothesis>=3.55 pytest>=3.5.0 psutil>=5.6 +pip>=21.3 diff --git a/examples/pyo3-pytests/tox.ini b/examples/pyo3-pytests/tox.ini index 0210b2c8..f03eeaa6 100644 --- a/examples/pyo3-pytests/tox.ini +++ b/examples/pyo3-pytests/tox.ini @@ -4,11 +4,7 @@ skipsdist = true [testenv] description = Run the unit tests under {basepython} -deps = - pip>=21.1 # for in-tree-build - -rrequirements-dev.txt +deps = -rrequirements-dev.txt commands = - # --use-feature=in-tree-build is necessary because this example is inside - # the PyO3 repo. - python -m pip install . --use-feature=in-tree-build + python -m pip install . pytest {posargs} diff --git a/examples/setuptools-rust-starter/requirements-dev.txt b/examples/setuptools-rust-starter/requirements-dev.txt index 7dc5c380..678a0650 100644 --- a/examples/setuptools-rust-starter/requirements-dev.txt +++ b/examples/setuptools-rust-starter/requirements-dev.txt @@ -1,2 +1,3 @@ pytest>=3.5.0 setuptools_rust~=0.11.0 +pip>=21.3 diff --git a/examples/setuptools-rust-starter/tox.ini b/examples/setuptools-rust-starter/tox.ini index e0d45bbc..2051de43 100644 --- a/examples/setuptools-rust-starter/tox.ini +++ b/examples/setuptools-rust-starter/tox.ini @@ -1,10 +1,5 @@ -[tox] -# can't install from sdist because local pyo3 repo can't be included in the sdist -skipsdist = true - [testenv] +usedevelop = true description = Run the unit tests under {basepython} deps = -rrequirements-dev.txt -commands = - python setup.py install - pytest {posargs} +commands = pytest {posargs} diff --git a/examples/word-count/tox.ini b/examples/word-count/tox.ini index 60d70417..2051de43 100644 --- a/examples/word-count/tox.ini +++ b/examples/word-count/tox.ini @@ -1,10 +1,5 @@ -[tox] -# can't install from sdist because local pyo3 repo can't be included in the sdist -skipsdist=true - [testenv] +usedevelop = true description = Run the unit tests under {basepython} deps = -rrequirements-dev.txt -commands = - python setup.py install - pytest {posargs} +commands = pytest {posargs}