Skip to content

Support tox 4.x for testing modularized distributions #35208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
May 22, 2023
Merged

Support tox 4.x for testing modularized distributions #35208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dd0575d
pkgs/*/tox.ini, src/doc/en/developer: Update instructions for testing
mkoeppe Feb 22, 2023
829d567
pkgs/sagemath-categories/tox.ini: Change default toxenv to sagepython…
mkoeppe Feb 23, 2023
379c6a4
pkgs/sagemath-polyhedra/tox.ini: Update for tox 4
mkoeppe Feb 25, 2023
513eac0
pkgs/sagemath-*/tox.ini: Update for tox 4
mkoeppe Feb 26, 2023
4a35130
pkgs/sagemath-categories/tox.ini: Fix up
mkoeppe Feb 26, 2023
a156e2a
pkgs/sagemath-*/tox.ini: Configure testenv:.tox
mkoeppe Feb 27, 2023
353e625
pkgs/sagemath-*/tox.ini: Configure testenv:.tox (fixup)
mkoeppe Feb 27, 2023
b48a24c
pkgs/sagemath-categories/tox.ini: fix up
mkoeppe Feb 27, 2023
9597136
pkgs/sagemath-categories/tox.ini: Update instructions to include buil…
mkoeppe Mar 18, 2023
eabf6fd
Merge remote-tracking branch 'upstream/develop' into pkgs_tox_4
mkoeppe Mar 18, 2023
d205f56
Merge tag '10.0.rc1' into pkgs_tox_4
mkoeppe May 1, 2023
cf8f92e
src/sage/misc/package.py: Make doctests work within venvs
mkoeppe May 1, 2023
c350f06
pkgs/sagemath-standard/tox.ini: change_dir to fix shadowing by sage/ …
mkoeppe May 1, 2023
b46a2d3
src/sage/misc/package.py: Make doctests work within venvs, part 2
mkoeppe May 1, 2023
0c8bb55
Fixups
mkoeppe May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 53 additions & 16 deletions pkgs/sagemath-categories/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# To build and test in the tox environment:
#
# ./sage -sh -c '(cd pkgs/sagemath-categories && tox -v -v -v -e sagepython)'
# make SAGE_WHEELS=yes sagemath_categories-build-deps sagemath_repl && ./sage -sh -c '(cd pkgs/sagemath-categories && SAGE_NUM_THREADS=8 tox -v -v -v -e sagepython-sagewheels-nopypi-norequirements)'
#
# To test interactively:
# After this, to test interactively:
#
# pkgs/sagemath-categories/.tox/sagepython/bin/python
# pkgs/sagemath-categories/.tox/sagepython-sagewheels-nopypi-norequirements/bin/sage
#
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove initial two spaces.

[tox]
envlist =
sagepython-norequirements
sagepython-sagewheels-nopypi-norequirements

[testenv]
deps =
!norequirements: -rrequirements.txt
# tox 3.x does not handle extras when using --installpkg. https://github.com/tox-dev/tox/issues/1576
sagemath-repl

extras = test
requires =
# Auto-provision a modern tox.
# [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
tox>=4.2

[pkgenv]
# Environment in which to build the sdist.
# https://tox.wiki/en/latest/upgrading.html#packaging-environments
passenv =
# Variables set by .homebrew-build-env
CPATH
Expand All @@ -32,36 +32,73 @@ passenv =
sagewheels: SAGE_SPKG_WHEELS

setenv =
# Sage scripts such as sage-runtests like to use $HOME/.sage
HOME={envdir}
# We supply pip options by environment variables so that they
# apply both to the installation of the dependencies and of the package
sagewheels: PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
nopypi: PIP_NO_INDEX=true

[testenv]
deps =
!norequirements: -rrequirements.txt

extras = test

passenv = {[pkgenv]passenv}

setenv = {[pkgenv]setenv}
# Sage scripts such as sage-runtests like to use $HOME/.sage
HOME={envdir}

allowlist_externals =
bash

commands =
# Beware of the treacherous non-src layout. "./sage/" shadows the install sage package.
# Beware of the treacherous non-src layout. "./sage/" shadows the installed sage package.
{envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); import sage.cpython.builtin_types, sage.cpython.cython_metaclass, sage.cpython.debug, sage.structure.all, sage.categories.all'

# Test that importing sage.categories.all initializes categories
{envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); from sage.categories.all import *; SimplicialComplexes(); FunctionFields()'

bash -c 'cd {temp_dir} && SAGE_SRC=$(python -c "from sage.env import SAGE_SRC; print(SAGE_SRC)") && sage-runtests --initial --environment=sage.all__sagemath_categories --optional=sage $SAGE_SRC/sage/structure || echo "(lots of doctest failures are expected)"'
bash -c 'cd $(python -c "import sys; \"\" in sys.path and sys.path.remove(\"\"); from sage.env import SAGE_LIB; print(SAGE_LIB)") \
&& sage-runtests -p --initial --environment=sage.all__sagemath_categories --optional=sage sage/structure || echo "(lots of doctest failures are expected)"'

[testenv:.tox]
# Allow access to PyPI for auto-provisioning a suitable tox version
passenv =
setenv = PIP_NO_INDEX=false

[testenv:.pkg-sagepython]
# Environment in which to build the sdist.
# inherits from [pkgenv] - https://tox.wiki/en/latest/upgrading.html#packaging-environments
basepython = {env:SAGE_VENV}/bin/python3

[testenv:.pkg-sagepython-sagewheels-nopypi]
passenv = {[pkgenv]passenv}
SAGE_VENV
SAGE_SPKG_WHEELS

setenv = {[pkgenv]setenv}
PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
PIP_NO_INDEX=true

basepython = {env:SAGE_VENV}/bin/python3

[testenv:sagepython]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython

[testenv:sagepython-sagewheels-nopypi]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython-sagewheels-nopypi

[testenv:sagepython-sagewheels-nopypi-norequirements]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython-sagewheels-nopypi

[testenv:sagepython-sagewheels]
basepython = {env:SAGE_VENV}/bin/python3
basepython = {env:SAGE_VENV}/bin/python
package_env = .pkg-sagepython

[testenv:sagepython-norequirements]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython
62 changes: 52 additions & 10 deletions pkgs/sagemath-environment/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
# To build and test in the tox environment:
#
# ./sage -sh -c '(cd pkgs/sagemath-environment && tox -v -v -e sagepython)'
# ./sage -sh -c '(cd pkgs/sagemath-environment && tox -v -v -e sagepython-norequirements)'
#
# To test interactively:
#
# pkgs/sagemath-environment/.tox/sagepython/bin/python
# pkgs/sagemath-environment/.tox/sagepython-norequirements/bin/python
#
[tox]
envlist =
sagepython-norequirements

isolated_build = True

[testenv]
deps =
!norequirements: -rrequirements.txt
requires =
# Auto-provision a modern tox.
# [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
tox>=4.2

[pkgenv]
# Environment in which to build the sdist.
# https://tox.wiki/en/latest/upgrading.html#packaging-environments
passenv =
# Variables set by .homebrew-build-env
CPATH
LIBRARY_PATH
PKG_CONFIG_PATH
# Parallel build
SAGE_NUM_THREADS
SAGE_NUM_THREADS_PARALLEL
Expand All @@ -26,31 +32,67 @@ passenv =
sagewheels: SAGE_SPKG_WHEELS

setenv =
# Sage scripts such as sage-runtests like to use $HOME/.sage
HOME={envdir}
# We supply pip options by environment variables so that they
# apply both to the installation of the dependencies and of the package
sagewheels: PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
nopypi: PIP_NO_INDEX=true

[testenv]
deps =
!norequirements: -rrequirements.txt

extras = test

passenv = {[pkgenv]passenv}

setenv = {[pkgenv]setenv}
# Sage scripts such as sage-runtests like to use $HOME/.sage
HOME={envdir}

allowlist_externals =
bash

commands =
# Beware of the treacherous non-src layout. "./sage/" shadows the installed sage package.
{envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); from sage.features.all import all_features; print(sorted(all_features(), key=lambda x: x.name)); import sage.misc.package'

[testenv:.tox]
# Allow access to PyPI for auto-provisioning a suitable tox version
passenv =
setenv = PIP_NO_INDEX=false

[testenv:.pkg-sagepython]
# Environment in which to build the sdist.
# inherits from [pkgenv] - https://tox.wiki/en/latest/upgrading.html#packaging-environments
basepython = {env:SAGE_VENV}/bin/python3

[testenv:.pkg-sagepython-sagewheels-nopypi]
passenv = {[pkgenv]passenv}
SAGE_VENV
SAGE_SPKG_WHEELS

setenv = {[pkgenv]setenv}
PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
PIP_NO_INDEX=true

basepython = {env:SAGE_VENV}/bin/python3

[testenv:sagepython]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython

[testenv:sagepython-sagewheels-nopypi]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython-sagewheels-nopypi

[testenv:sagepython-sagewheels-nopypi-norequirements]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython-sagewheels-nopypi

[testenv:sagepython-sagewheels]
basepython = {env:SAGE_VENV}/bin/python3
basepython = {env:SAGE_VENV}/bin/python
package_env = .pkg-sagepython

[testenv:sagepython-norequirements]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython
60 changes: 49 additions & 11 deletions pkgs/sagemath-objects/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
# To build and test in the tox environment:
#
# ./sage -sh -c '(cd pkgs/sagemath-objects && tox -v -v -e sagepython)'
# ./sage -sh -c '(cd pkgs/sagemath-objects && SAGE_NUM_THREADS=8 tox -v -v -e sagepython-norequirements)'
#
# To test interactively:
# After this, to test interactively:
#
# pkgs/sagemath-objects/.tox/sagepython/bin/python
# pkgs/sagemath-objects/.tox/sagepython-norequirements/bin/python
#
[tox]
envlist =
sagepython-norequirements

[testenv]
deps =
!norequirements: -rrequirements.txt

extras = test
requires =
# Auto-provision a modern tox.
# [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
tox>=4.2

[pkgenv]
# Environment in which to build the sdist.
# https://tox.wiki/en/latest/upgrading.html#packaging-environments
passenv =
# Variables set by .homebrew-build-env
CPATH
Expand All @@ -30,13 +32,23 @@ passenv =
sagewheels: SAGE_SPKG_WHEELS

setenv =
# Sage scripts such as sage-runtests like to use $HOME/.sage
HOME={envdir}
# We supply pip options by environment variables so that they
# apply both to the installation of the dependencies and of the package
sagewheels: PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
nopypi: PIP_NO_INDEX=true

[testenv]
deps =
!norequirements: -rrequirements.txt

extras = test

passenv = {[pkgenv]passenv}

setenv = {[pkgenv]setenv}
# Sage scripts such as sage-runtests like to use $HOME/.sage
HOME={envdir}

allowlist_externals =
bash

Expand All @@ -48,17 +60,43 @@ commands =

#bash -c 'cd {temp_dir} && SAGE_SRC=$(python -c "from sage.env import SAGE_SRC; print(SAGE_SRC)") && sage-runtests --environment=sage.all__sagemath_objects --initial --optional=sage $SAGE_SRC/sage/structure || echo "(lots of doctest failures are expected)"'

[testenv:.tox]
# Allow access to PyPI for auto-provisioning a suitable tox version
passenv =
setenv = PIP_NO_INDEX=false

[testenv:.pkg-sagepython]
# Environment in which to build the sdist.
# inherits from [pkgenv] - https://tox.wiki/en/latest/upgrading.html#packaging-environments
basepython = {env:SAGE_VENV}/bin/python3

[testenv:.pkg-sagepython-sagewheels-nopypi]
passenv = {[pkgenv]passenv}
SAGE_VENV
SAGE_SPKG_WHEELS

setenv = {[pkgenv]setenv}
PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
PIP_NO_INDEX=true

basepython = {env:SAGE_VENV}/bin/python3

[testenv:sagepython]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython

[testenv:sagepython-sagewheels-nopypi]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython-sagewheels-nopypi

[testenv:sagepython-sagewheels-nopypi-norequirements]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython-sagewheels-nopypi

[testenv:sagepython-sagewheels]
basepython = {env:SAGE_VENV}/bin/python3
basepython = {env:SAGE_VENV}/bin/python
package_env = .pkg-sagepython

[testenv:sagepython-norequirements]
basepython = {env:SAGE_VENV}/bin/python3
package_env = .pkg-sagepython
Loading