From 9ecd8ca3fc4daf32c09c959dea6fd3740f24e2c0 Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Tue, 5 May 2026 09:16:03 -0400 Subject: [PATCH 1/8] install `conda_packages:` directly with micromamba --- .github/workflows/test_tox.yml | 7 ++++--- .github/workflows/tox.yml | 26 ++++++++++---------------- docs/source/tox.rst | 11 ++++------- tools/tox_matrix.py | 19 +++---------------- 4 files changed, 21 insertions(+), 42 deletions(-) diff --git a/.github/workflows/test_tox.yml b/.github/workflows/test_tox.yml index a430d4a..b9a8478 100644 --- a/.github/workflows/test_tox.yml +++ b/.github/workflows/test_tox.yml @@ -125,10 +125,11 @@ jobs: test_conda: uses: ./.github/workflows/tox.yml with: + conda_packages: hstcal envs: | - - linux: py312-conda - - macos: py311-conda - - windows: py310-conda + - linux: py312 + - macos: py311 + - windows: py310 test_setenv: uses: ./.github/workflows/tox.yml diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index c2b52ae..17c7e1e 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -57,11 +57,11 @@ on: required: false default: '' type: string - conda: - description: Whether to test with conda (deprecated) - required: false - default: 'auto' + conda_packages: type: string + description: extra packages to install with `mamba` + required: false + default: "" setenv: description: A map of environment variables to be available when testing required: false @@ -172,7 +172,7 @@ jobs: shell: sh - run: echo $TOX_MATRIX_SCRIPT | base64 --decode > tox_matrix.py env: - TOX_MATRIX_SCRIPT: # /// script
# requires-python = "==3.12"
# dependencies = [
#     "click==8.2.1",
#     "pyyaml==6.0.2",
# ]
# ///
import json
import os
import re
import warnings

import click
import yaml


@click.command()
@click.option("--envs", default="")
@click.option("--libraries", default="")
@click.option("--posargs", default="")
@click.option("--toxdeps", default="")
@click.option("--toxargs", default="")
@click.option("--pytest", default="true")
@click.option("--pytest-results-summary", default="false")
@click.option("--coverage", default="")
@click.option("--conda", default="auto")
@click.option("--setenv", default="")
@click.option("--display", default="false")
@click.option("--cache-path", default="")
@click.option("--cache-key", default="")
@click.option("--cache-restore-keys", default="")
@click.option("--artifact-path", default="")
@click.option("--artifact-archive", default="true")
@click.option("--artifact-include-hidden-files", default="false")
@click.option("--artifact-if-no-files-found", default="warn")
@click.option("--runs-on", default="")
@click.option("--default-python", default="")
@click.option("--timeout-minutes", default="360")
def load_tox_targets(
    envs,
    libraries,
    posargs,
    toxdeps,
    toxargs,
    pytest,
    pytest_results_summary,
    coverage,
    conda,
    setenv,
    display,
    cache_path,
    cache_key,
    cache_restore_keys,
    artifact_path,
    artifact_archive,
    artifact_include_hidden_files,
    artifact_if_no_files_found,
    runs_on,
    default_python,
    timeout_minutes,
):
    """Script to load tox targets for GitHub Actions workflow."""
    # Load envs config
    envs = yaml.load(envs.replace("\\n", "\n"), Loader=yaml.BaseLoader)
    print(json.dumps(envs, indent=2))

    # Load global libraries config
    global_libraries = {
        "brew": [],
        "brew-cask": [],
        "apt": [],
        "choco": [],
    }
    libraries = yaml.load(libraries, Loader=yaml.BaseLoader)
    if libraries is not None:
        global_libraries.update(libraries)
    print(json.dumps(global_libraries, indent=2))

    # Default images to use for runners
    default_runs_on = {
        "linux": "ubuntu-latest",
        "macos": "macos-latest",
        "windows": "windows-latest",
    }
    custom_runs_on = yaml.load(runs_on, Loader=yaml.BaseLoader)
    if isinstance(custom_runs_on, dict):
        default_runs_on.update(custom_runs_on)
    print(json.dumps(default_runs_on, indent=2))

    # Default string parameters which can be overwritten by each env
    string_parameters = {
        "posargs": posargs,
        "toxdeps": toxdeps,
        "toxargs": toxargs,
        "pytest": pytest,
        "pytest-results-summary": pytest_results_summary,
        "coverage": coverage,
        "conda": conda,
        "setenv": setenv,
        "display": display,
        "cache-path": cache_path,
        "cache-key": cache_key,
        "cache-restore-keys": cache_restore_keys,
        "artifact-path": artifact_path,
        "artifact-archive": artifact_archive,
        "artifact-include-hidden-files": artifact_include_hidden_files,
        "artifact-if-no-files-found": artifact_if_no_files_found,
        "timeout-minutes": timeout_minutes,
    }

    # Create matrix
    matrix = {"include": []}
    for env in envs:
        matrix["include"].append(
            get_matrix_item(
                env,
                global_libraries=global_libraries,
                global_string_parameters=string_parameters,
                runs_on=default_runs_on,
                default_python=default_python,
            )
        )

    # Output matrix
    print(json.dumps(matrix, indent=2))
    with open(os.environ["GITHUB_OUTPUT"], "a") as f:
        f.write(f"matrix={json.dumps(matrix)}\n")


def get_matrix_item(env, global_libraries, global_string_parameters, runs_on, default_python):

    # define spec for each matrix include (+ global_string_parameters)
    item = {
        "os": None,
        "toxenv": None,
        "python_version": None,
        "name": None,
        "pytest_flag": None,
        "libraries_brew": None,
        "libraries_brew_cask": None,
        "libraries_apt": None,
        "libraries_choco": None,
        "cache-path": None,
        "cache-key": None,
        "cache-restore-keys": None,
        "artifact-name": None,
        "artifact-path": None,
        "artifact-archive": None,
        "artifact-include-hidden-files": None,
        "artifact-if-no-files-found": None,
        "timeout-minutes": None,
    }
    for string_param, default in global_string_parameters.items():
        env_value = env.get(string_param)
        item[string_param] = default if env_value is None else env_value

    # set os and toxenv
    for k, v in runs_on.items():
        if k in env:
            platform = k
            item["os"] = env.get("runs-on", v)
            item["toxenv"] = env[k]
    assert item["os"] is not None and item["toxenv"] is not None

    # set python_version
    python_version = env.get("python-version")
    m = re.search("^py(2|3)([0-9]+t?)", item["toxenv"])
    if python_version is not None:
        item["python_version"] = python_version
    elif m is not None:
        major, minor = m.groups()
        item["python_version"] = f"{major}.{minor}"
    else:
        item["python_version"] = env.get("default_python") or default_python

    # set name
    item["name"] = env.get("name") or f"{item['toxenv']} ({item['os']})"

    # set artifact-name (replace invalid path characters)
    item["artifact-name"] = re.sub(r"[\\ /:<>|*?\"']", "-", item["name"])
    item["artifact-name"] = re.sub(r"-+", "-", item["artifact-name"])

    # set pytest_flag
    item["pytest_flag"] = ""
    sep = r"\\" if platform == "windows" else "/"
    if item["pytest"] == "true":
        if item["pytest-results-summary"] == "true":
            item["pytest_flag"] += rf"--junitxml ${{GITHUB_WORKSPACE}}{sep}results.xml "

    # set libraries
    env_libraries = env.get("libraries")
    if isinstance(env_libraries, str) and len(env_libraries.strip()) == 0:
        env_libraries = {}  # no libraries requested for environment
    libraries = global_libraries if env_libraries is None else env_libraries
    for manager in ["brew", "brew_cask", "apt", "choco"]:
        item[f"libraries_{manager}"] = " ".join(libraries.get(manager, []))

    if item["conda"]:
        warnings.warn("`conda` parameter is deprecated")

        # set "auto" conda value
        if item["conda"] == "auto":
            item["conda"] = "true" if "conda" in item["toxenv"] else "false"

        # inject toxdeps for conda
        if item["conda"] == "true" and "tox-conda" not in item["toxdeps"].lower():
            item["toxdeps"] = ("tox-conda " + item["toxdeps"]).strip()

    # make timeout-minutes a number
    item["timeout-minutes"] = int(item["timeout-minutes"])

    # verify values
    assert item["pytest"] in {"true", "false"}
    assert item["conda"] in {"true", "false"}
    assert item["display"] in {"true", "false"}

    return item


if __name__ == "__main__":
    load_tox_targets()
 + TOX_MATRIX_SCRIPT: # /// script
# requires-python = "==3.12"
# dependencies = [
#     "click==8.2.1",
#     "pyyaml==6.0.2",
# ]
# ///
import json
import os
import re

import click
import yaml


@click.command()
@click.option("--envs", default="")
@click.option("--libraries", default="")
@click.option("--posargs", default="")
@click.option("--toxdeps", default="")
@click.option("--toxargs", default="")
@click.option("--pytest", default="true")
@click.option("--pytest-results-summary", default="false")
@click.option("--coverage", default="")
@click.option("--conda-packages", default="auto")
@click.option("--setenv", default="")
@click.option("--display", default="false")
@click.option("--cache-path", default="")
@click.option("--cache-key", default="")
@click.option("--cache-restore-keys", default="")
@click.option("--artifact-path", default="")
@click.option("--artifact-archive", default="true")
@click.option("--artifact-include-hidden-files", default="false")
@click.option("--artifact-if-no-files-found", default="warn")
@click.option("--runs-on", default="")
@click.option("--default-python", default="")
@click.option("--timeout-minutes", default="360")
def load_tox_targets(
    envs,
    libraries,
    posargs,
    toxdeps,
    toxargs,
    pytest,
    pytest_results_summary,
    coverage,
    conda_packages,
    setenv,
    display,
    cache_path,
    cache_key,
    cache_restore_keys,
    artifact_path,
    artifact_archive,
    artifact_include_hidden_files,
    artifact_if_no_files_found,
    runs_on,
    default_python,
    timeout_minutes,
):
    """Script to load tox targets for GitHub Actions workflow."""
    # Load envs config
    envs = yaml.load(envs.replace("\\n", "\n"), Loader=yaml.BaseLoader)
    print(json.dumps(envs, indent=2))

    # Load global libraries config
    global_libraries = {
        "brew": [],
        "brew-cask": [],
        "apt": [],
        "choco": [],
    }
    libraries = yaml.load(libraries, Loader=yaml.BaseLoader)
    if libraries is not None:
        global_libraries.update(libraries)
    print(json.dumps(global_libraries, indent=2))

    # Default images to use for runners
    default_runs_on = {
        "linux": "ubuntu-latest",
        "macos": "macos-latest",
        "windows": "windows-latest",
    }
    custom_runs_on = yaml.load(runs_on, Loader=yaml.BaseLoader)
    if isinstance(custom_runs_on, dict):
        default_runs_on.update(custom_runs_on)
    print(json.dumps(default_runs_on, indent=2))

    # Default string parameters which can be overwritten by each env
    string_parameters = {
        "posargs": posargs,
        "toxdeps": toxdeps,
        "toxargs": toxargs,
        "pytest": pytest,
        "pytest-results-summary": pytest_results_summary,
        "coverage": coverage,
        "conda-packages": conda_packages,
        "setenv": setenv,
        "display": display,
        "cache-path": cache_path,
        "cache-key": cache_key,
        "cache-restore-keys": cache_restore_keys,
        "artifact-path": artifact_path,
        "artifact-archive": artifact_archive,
        "artifact-include-hidden-files": artifact_include_hidden_files,
        "artifact-if-no-files-found": artifact_if_no_files_found,
        "timeout-minutes": timeout_minutes,
    }

    # Create matrix
    matrix = {"include": []}
    for env in envs:
        matrix["include"].append(
            get_matrix_item(
                env,
                global_libraries=global_libraries,
                global_string_parameters=string_parameters,
                runs_on=default_runs_on,
                default_python=default_python,
            )
        )

    # Output matrix
    print(json.dumps(matrix, indent=2))
    with open(os.environ["GITHUB_OUTPUT"], "a") as f:
        f.write(f"matrix={json.dumps(matrix)}\n")


def get_matrix_item(env, global_libraries, global_string_parameters, runs_on, default_python):

    # define spec for each matrix include (+ global_string_parameters)
    item = {
        "os": None,
        "toxenv": None,
        "python_version": None,
        "name": None,
        "pytest_flag": None,
        "libraries_brew": None,
        "libraries_brew_cask": None,
        "libraries_apt": None,
        "libraries_choco": None,
        "cache-path": None,
        "cache-key": None,
        "cache-restore-keys": None,
        "artifact-name": None,
        "artifact-path": None,
        "artifact-archive": None,
        "artifact-include-hidden-files": None,
        "artifact-if-no-files-found": None,
        "timeout-minutes": None,
    }
    for string_param, default in global_string_parameters.items():
        env_value = env.get(string_param)
        item[string_param] = default if env_value is None else env_value

    # set os and toxenv
    for k, v in runs_on.items():
        if k in env:
            platform = k
            item["os"] = env.get("runs-on", v)
            item["toxenv"] = env[k]
    assert item["os"] is not None and item["toxenv"] is not None

    # set python_version
    python_version = env.get("python-version")
    m = re.search("^py(2|3)([0-9]+t?)", item["toxenv"])
    if python_version is not None:
        item["python_version"] = python_version
    elif m is not None:
        major, minor = m.groups()
        item["python_version"] = f"{major}.{minor}"
    else:
        item["python_version"] = env.get("default_python") or default_python

    # set name
    item["name"] = env.get("name") or f"{item['toxenv']} ({item['os']})"

    # set artifact-name (replace invalid path characters)
    item["artifact-name"] = re.sub(r"[\\ /:<>|*?\"']", "-", item["name"])
    item["artifact-name"] = re.sub(r"-+", "-", item["artifact-name"])

    # set pytest_flag
    item["pytest_flag"] = ""
    sep = r"\\" if platform == "windows" else "/"
    if item["pytest"] == "true":
        if item["pytest-results-summary"] == "true":
            item["pytest_flag"] += rf"--junitxml ${{GITHUB_WORKSPACE}}{sep}results.xml "

    # set libraries
    env_libraries = env.get("libraries")
    if isinstance(env_libraries, str) and len(env_libraries.strip()) == 0:
        env_libraries = {}  # no libraries requested for environment
    libraries = global_libraries if env_libraries is None else env_libraries
    for manager in ["brew", "brew_cask", "apt", "choco"]:
        item[f"libraries_{manager}"] = " ".join(libraries.get(manager, []))

    # make timeout-minutes a number
    item["timeout-minutes"] = int(item["timeout-minutes"])

    # verify values
    assert item["pytest"] in {"true", "false"}
    assert item["display"] in {"true", "false"}

    return item


if __name__ == "__main__":
    load_tox_targets()
 - run: cat tox_matrix.py - id: set-outputs run: | # zizmor: ignore[template-injection] @@ -182,7 +182,7 @@ jobs: --posargs "${{ inputs.posargs }}" --toxdeps "${{ inputs.toxdeps }}" \ --toxargs "${{ inputs.toxargs }}" --pytest "${{ inputs.pytest }}" \ --pytest-results-summary "${{ inputs.pytest-results-summary }}" \ - --coverage "${{ inputs.coverage }}" --conda "${{ inputs.conda }}" \ + --coverage "${{ inputs.coverage }}" --conda-packages "${{ inputs.conda-packages }}" \ --setenv "${{ inputs.setenv }}" \ --display "${{ inputs.display }}" --cache-path "${{ inputs.cache-path }}" \ --cache-key "${{ inputs.cache-key }}" --cache-restore-keys "${{ inputs.cache-restore-keys }}" \ @@ -236,15 +236,15 @@ jobs: choco: ${{ matrix.libraries_choco }} - name: Setup Python ${{ matrix.python_version }} - if: ${{ matrix.conda != 'true' }} + if: ${{ matrix.conda_packages == '' }} uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # 8.1.0 with: python-version: ${{ matrix.python_version }} activate-environment: "true" ignore-empty-workdir: "true" - - name: Setup conda (deprecated) - if: ${{ matrix.conda == 'true' }} + - name: Setup Micromamba with Python ${{ matrix.python_version }} + if: ${{ matrix.conda_packages != '' }} uses: mamba-org/setup-micromamba@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0 with: environment-name: test @@ -253,19 +253,13 @@ jobs: - conda-forge use_uv: true create-args: >- - conda python=${{ matrix.python_version }} uv=0.10.6 + ${{ inputs.conda_packages }} init-shell: bash cache-environment: true cache-downloads: true - - name: warn that using the `conda` parameter is deprecated - if: ${{ matrix.conda == 'true' }} - run: | - echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> The conda parameter is deprecated (see https://github.com/OpenAstronomy/github-actions-workflows/issues/354)." >> $GITHUB_STEP_SUMMARY - - id: set-env if: ${{ matrix.setenv != '' }} run: | diff --git a/docs/source/tox.rst b/docs/source/tox.rst index 56c5348..6a2c6e4 100644 --- a/docs/source/tox.rst +++ b/docs/source/tox.rst @@ -218,15 +218,12 @@ To use the token set the ``CODECOV_TOKEN`` environment variable or pass it as a To use oidc you need to give the job the ``id-token: write`` permission, we recommend you set this on the job level not the workflow level, and set ``coverage: codecov-oidc``. -conda -^^^^^ +conda_packages +^^^^^^^^^^^^^^ -Whether to test within a conda environment using ``tox-conda``. Options -are ``'auto'`` (default), ``'true'`` and ``'false'``. +If populated, will set up a conda environment and install the requested packages from `conda-forge`. -If ``'auto'``, conda will be used if the tox environment names contains -“conda”. For example, ``'auto'`` would enable conda for tox environments -named ``py39-conda``, ``conda-test`` or even ``py38-secondary``. +Remember to use `allowlist_externals` in your Tox configuration if using non-Python Conda packages. setenv ^^^^^^ diff --git a/tools/tox_matrix.py b/tools/tox_matrix.py index a1153cf..37ab160 100644 --- a/tools/tox_matrix.py +++ b/tools/tox_matrix.py @@ -8,7 +8,6 @@ import json import os import re -import warnings import click import yaml @@ -23,7 +22,7 @@ @click.option("--pytest", default="true") @click.option("--pytest-results-summary", default="false") @click.option("--coverage", default="") -@click.option("--conda", default="auto") +@click.option("--conda-packages", default="auto") @click.option("--setenv", default="") @click.option("--display", default="false") @click.option("--cache-path", default="") @@ -45,7 +44,7 @@ def load_tox_targets( pytest, pytest_results_summary, coverage, - conda, + conda_packages, setenv, display, cache_path, @@ -95,7 +94,7 @@ def load_tox_targets( "pytest": pytest, "pytest-results-summary": pytest_results_summary, "coverage": coverage, - "conda": conda, + "conda-packages": conda_packages, "setenv": setenv, "display": display, "cache-path": cache_path, @@ -195,23 +194,11 @@ def get_matrix_item(env, global_libraries, global_string_parameters, runs_on, de for manager in ["brew", "brew_cask", "apt", "choco"]: item[f"libraries_{manager}"] = " ".join(libraries.get(manager, [])) - if item["conda"]: - warnings.warn("`conda` parameter is deprecated") - - # set "auto" conda value - if item["conda"] == "auto": - item["conda"] = "true" if "conda" in item["toxenv"] else "false" - - # inject toxdeps for conda - if item["conda"] == "true" and "tox-conda" not in item["toxdeps"].lower(): - item["toxdeps"] = ("tox-conda " + item["toxdeps"]).strip() - # make timeout-minutes a number item["timeout-minutes"] = int(item["timeout-minutes"]) # verify values assert item["pytest"] in {"true", "false"} - assert item["conda"] in {"true", "false"} assert item["display"] in {"true", "false"} return item From 723e3eff54123ad6daa589d255102692ceee06b3 Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Wed, 3 Jun 2026 14:29:55 -0400 Subject: [PATCH 2/8] fix called wrong context --- .github/workflows/tox.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 17c7e1e..a873cf1 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -236,7 +236,7 @@ jobs: choco: ${{ matrix.libraries_choco }} - name: Setup Python ${{ matrix.python_version }} - if: ${{ matrix.conda_packages == '' }} + if: inputs.conda_packages == '' uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # 8.1.0 with: python-version: ${{ matrix.python_version }} @@ -244,7 +244,7 @@ jobs: ignore-empty-workdir: "true" - name: Setup Micromamba with Python ${{ matrix.python_version }} - if: ${{ matrix.conda_packages != '' }} + if: inputs.conda_packages != '' uses: mamba-org/setup-micromamba@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0 with: environment-name: test From 3955ef1c866a1bbb7553553ffbc6413545624847 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:30:49 +0000 Subject: [PATCH 3/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci From 66816179b8772521433a7d586782547066b01d95 Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Wed, 3 Jun 2026 14:30:27 -0400 Subject: [PATCH 4/8] add `conda_channels` input --- .github/workflows/tox.yml | 8 ++++++-- docs/source/tox.rst | 10 ++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index a873cf1..ba45996 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -62,6 +62,11 @@ on: description: extra packages to install with `mamba` required: false default: "" + conda_channels: + type: string + description: Conda channel(s) to use when installing packages (separated by commas) + required: false + default: "conda-forge" setenv: description: A map of environment variables to be available when testing required: false @@ -249,8 +254,7 @@ jobs: with: environment-name: test condarc: | - channels: - - conda-forge + channels: [${{ inputs.conda_channels }}] use_uv: true create-args: >- python=${{ matrix.python_version }} diff --git a/docs/source/tox.rst b/docs/source/tox.rst index 6a2c6e4..aabaeca 100644 --- a/docs/source/tox.rst +++ b/docs/source/tox.rst @@ -221,9 +221,15 @@ To use oidc you need to give the job the ``id-token: write`` permission, we reco conda_packages ^^^^^^^^^^^^^^ -If populated, will set up a conda environment and install the requested packages from `conda-forge`. +If populated, will set up a conda environment and install the requested packages from ``conda-forge``. + +Remember to use ``allowlist_externals`` in your Tox configuration if using non-Python Conda packages. -Remember to use `allowlist_externals` in your Tox configuration if using non-Python Conda packages. +conda_channels +^^^^^^^^^^^^^^ + +Conda channel(s) to use with ``conda_packages`` (defaults to ``conda-forge``). +If multiple, make sure they're separated by commas. setenv ^^^^^^ From 95c4096cedfddb3f4ed1f69d7e2ab315fc31d723 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:36:42 +0000 Subject: [PATCH 5/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/source/tox.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/tox.rst b/docs/source/tox.rst index aabaeca..17f57d4 100644 --- a/docs/source/tox.rst +++ b/docs/source/tox.rst @@ -222,7 +222,7 @@ conda_packages ^^^^^^^^^^^^^^ If populated, will set up a conda environment and install the requested packages from ``conda-forge``. - + Remember to use ``allowlist_externals`` in your Tox configuration if using non-Python Conda packages. conda_channels From 3a274fdc9f1f5508e52600896535e0dfafe2b3b8 Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Wed, 3 Jun 2026 14:45:18 -0400 Subject: [PATCH 6/8] remove conda test toxenvs --- tox.ini | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index c4d2ae9..fefbe0b 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = pep8 py3{10,11,12} - py3{10,11,12}-inputs-{linux,macos,windows,conda,con_da} + py3{10,11,12}-inputs-{linux,macos,windows} default_python py{,py}3{10,13}-python_version libraries @@ -37,9 +37,6 @@ commands = linux: python -c "import platform; assert platform.system() == 'Linux'" macos: python -c "import platform; assert platform.system() == 'Darwin'" windows: python -c "import platform; assert platform.system() == 'Windows'" - # Check is conda is being used - !conda-!con_da: python -c "import os, sys; assert not os.path.exists(os.path.join(sys.prefix, 'conda-meta', 'history'))" - conda,con_da: python -c "import os, sys; assert {posargs} os.path.exists(os.path.join(sys.prefix, 'conda-meta', 'history'))" # Run a command that should only succeed is the library is installed libraries: {posargs} # Verify that setenv is working @@ -59,22 +56,19 @@ description = verify pep8 deps = ruff commands = ruff check . -[testenv:py3{10-16}{,-conda,-tmpdir,-tmpdir_warning}] +[testenv:py3{10-16}{,-tmpdir,-tmpdir_warning}] description = run pytest skip_install = false dependency_groups = test covcheck -conda_deps = pytest changedir = tmpdir,tmpdir_warning: .tmp/{envname} setenv = tmpdir: COVERAGE_FILE={toxinidir}/.coverage commands = - conda: python -c "import os, sys; assert os.path.exists(os.path.join(sys.prefix, 'conda-meta', 'history'))" - conda: micromamba list pytest --pyargs test_package {posargs} - + [testenv:build_docs] changedir = docs description = Invoke sphinx-build to build the HTML docs From e7c5a611ba2dfcf5d7a4427354ce686d26cf02b6 Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Wed, 3 Jun 2026 14:56:10 -0400 Subject: [PATCH 7/8] actually insert conda packages and channels into matrix --- .github/workflows/test_tox.yml | 2 +- .github/workflows/tox.yml | 13 +++++++------ docs/source/tox.rst | 2 +- tools/tox_matrix.py | 10 +++++++++- tox.ini | 2 +- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test_tox.yml b/.github/workflows/test_tox.yml index b9a8478..afc9c9e 100644 --- a/.github/workflows/test_tox.yml +++ b/.github/workflows/test_tox.yml @@ -125,7 +125,7 @@ jobs: test_conda: uses: ./.github/workflows/tox.yml with: - conda_packages: hstcal + conda_packages: requests envs: | - linux: py312 - macos: py311 diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index ba45996..43290ca 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -177,7 +177,7 @@ jobs: shell: sh - run: echo $TOX_MATRIX_SCRIPT | base64 --decode > tox_matrix.py env: - TOX_MATRIX_SCRIPT: # /// script
# requires-python = "==3.12"
# dependencies = [
#     "click==8.2.1",
#     "pyyaml==6.0.2",
# ]
# ///
import json
import os
import re

import click
import yaml


@click.command()
@click.option("--envs", default="")
@click.option("--libraries", default="")
@click.option("--posargs", default="")
@click.option("--toxdeps", default="")
@click.option("--toxargs", default="")
@click.option("--pytest", default="true")
@click.option("--pytest-results-summary", default="false")
@click.option("--coverage", default="")
@click.option("--conda-packages", default="auto")
@click.option("--setenv", default="")
@click.option("--display", default="false")
@click.option("--cache-path", default="")
@click.option("--cache-key", default="")
@click.option("--cache-restore-keys", default="")
@click.option("--artifact-path", default="")
@click.option("--artifact-archive", default="true")
@click.option("--artifact-include-hidden-files", default="false")
@click.option("--artifact-if-no-files-found", default="warn")
@click.option("--runs-on", default="")
@click.option("--default-python", default="")
@click.option("--timeout-minutes", default="360")
def load_tox_targets(
    envs,
    libraries,
    posargs,
    toxdeps,
    toxargs,
    pytest,
    pytest_results_summary,
    coverage,
    conda_packages,
    setenv,
    display,
    cache_path,
    cache_key,
    cache_restore_keys,
    artifact_path,
    artifact_archive,
    artifact_include_hidden_files,
    artifact_if_no_files_found,
    runs_on,
    default_python,
    timeout_minutes,
):
    """Script to load tox targets for GitHub Actions workflow."""
    # Load envs config
    envs = yaml.load(envs.replace("\\n", "\n"), Loader=yaml.BaseLoader)
    print(json.dumps(envs, indent=2))

    # Load global libraries config
    global_libraries = {
        "brew": [],
        "brew-cask": [],
        "apt": [],
        "choco": [],
    }
    libraries = yaml.load(libraries, Loader=yaml.BaseLoader)
    if libraries is not None:
        global_libraries.update(libraries)
    print(json.dumps(global_libraries, indent=2))

    # Default images to use for runners
    default_runs_on = {
        "linux": "ubuntu-latest",
        "macos": "macos-latest",
        "windows": "windows-latest",
    }
    custom_runs_on = yaml.load(runs_on, Loader=yaml.BaseLoader)
    if isinstance(custom_runs_on, dict):
        default_runs_on.update(custom_runs_on)
    print(json.dumps(default_runs_on, indent=2))

    # Default string parameters which can be overwritten by each env
    string_parameters = {
        "posargs": posargs,
        "toxdeps": toxdeps,
        "toxargs": toxargs,
        "pytest": pytest,
        "pytest-results-summary": pytest_results_summary,
        "coverage": coverage,
        "conda-packages": conda_packages,
        "setenv": setenv,
        "display": display,
        "cache-path": cache_path,
        "cache-key": cache_key,
        "cache-restore-keys": cache_restore_keys,
        "artifact-path": artifact_path,
        "artifact-archive": artifact_archive,
        "artifact-include-hidden-files": artifact_include_hidden_files,
        "artifact-if-no-files-found": artifact_if_no_files_found,
        "timeout-minutes": timeout_minutes,
    }

    # Create matrix
    matrix = {"include": []}
    for env in envs:
        matrix["include"].append(
            get_matrix_item(
                env,
                global_libraries=global_libraries,
                global_string_parameters=string_parameters,
                runs_on=default_runs_on,
                default_python=default_python,
            )
        )

    # Output matrix
    print(json.dumps(matrix, indent=2))
    with open(os.environ["GITHUB_OUTPUT"], "a") as f:
        f.write(f"matrix={json.dumps(matrix)}\n")


def get_matrix_item(env, global_libraries, global_string_parameters, runs_on, default_python):

    # define spec for each matrix include (+ global_string_parameters)
    item = {
        "os": None,
        "toxenv": None,
        "python_version": None,
        "name": None,
        "pytest_flag": None,
        "libraries_brew": None,
        "libraries_brew_cask": None,
        "libraries_apt": None,
        "libraries_choco": None,
        "cache-path": None,
        "cache-key": None,
        "cache-restore-keys": None,
        "artifact-name": None,
        "artifact-path": None,
        "artifact-archive": None,
        "artifact-include-hidden-files": None,
        "artifact-if-no-files-found": None,
        "timeout-minutes": None,
    }
    for string_param, default in global_string_parameters.items():
        env_value = env.get(string_param)
        item[string_param] = default if env_value is None else env_value

    # set os and toxenv
    for k, v in runs_on.items():
        if k in env:
            platform = k
            item["os"] = env.get("runs-on", v)
            item["toxenv"] = env[k]
    assert item["os"] is not None and item["toxenv"] is not None

    # set python_version
    python_version = env.get("python-version")
    m = re.search("^py(2|3)([0-9]+t?)", item["toxenv"])
    if python_version is not None:
        item["python_version"] = python_version
    elif m is not None:
        major, minor = m.groups()
        item["python_version"] = f"{major}.{minor}"
    else:
        item["python_version"] = env.get("default_python") or default_python

    # set name
    item["name"] = env.get("name") or f"{item['toxenv']} ({item['os']})"

    # set artifact-name (replace invalid path characters)
    item["artifact-name"] = re.sub(r"[\\ /:<>|*?\"']", "-", item["name"])
    item["artifact-name"] = re.sub(r"-+", "-", item["artifact-name"])

    # set pytest_flag
    item["pytest_flag"] = ""
    sep = r"\\" if platform == "windows" else "/"
    if item["pytest"] == "true":
        if item["pytest-results-summary"] == "true":
            item["pytest_flag"] += rf"--junitxml ${{GITHUB_WORKSPACE}}{sep}results.xml "

    # set libraries
    env_libraries = env.get("libraries")
    if isinstance(env_libraries, str) and len(env_libraries.strip()) == 0:
        env_libraries = {}  # no libraries requested for environment
    libraries = global_libraries if env_libraries is None else env_libraries
    for manager in ["brew", "brew_cask", "apt", "choco"]:
        item[f"libraries_{manager}"] = " ".join(libraries.get(manager, []))

    # make timeout-minutes a number
    item["timeout-minutes"] = int(item["timeout-minutes"])

    # verify values
    assert item["pytest"] in {"true", "false"}
    assert item["display"] in {"true", "false"}

    return item


if __name__ == "__main__":
    load_tox_targets()
 + TOX_MATRIX_SCRIPT: # /// script
# requires-python = "==3.12"
# dependencies = [
#     "click==8.2.1",
#     "pyyaml==6.0.2",
# ]
# ///
import json
import os
import re

import click
import yaml


@click.command()
@click.option("--envs", default="")
@click.option("--libraries", default="")
@click.option("--posargs", default="")
@click.option("--toxdeps", default="")
@click.option("--toxargs", default="")
@click.option("--pytest", default="true")
@click.option("--pytest-results-summary", default="false")
@click.option("--coverage", default="")
@click.option("--conda-packages")
@click.option("--conda-channels", default="conda-forge")
@click.option("--setenv", default="")
@click.option("--display", default="false")
@click.option("--cache-path", default="")
@click.option("--cache-key", default="")
@click.option("--cache-restore-keys", default="")
@click.option("--artifact-path", default="")
@click.option("--artifact-archive", default="true")
@click.option("--artifact-include-hidden-files", default="false")
@click.option("--artifact-if-no-files-found", default="warn")
@click.option("--runs-on", default="")
@click.option("--default-python", default="")
@click.option("--timeout-minutes", default="360")
def load_tox_targets(
    envs,
    libraries,
    posargs,
    toxdeps,
    toxargs,
    pytest,
    pytest_results_summary,
    coverage,
    conda_packages,
    conda_channels,
    setenv,
    display,
    cache_path,
    cache_key,
    cache_restore_keys,
    artifact_path,
    artifact_archive,
    artifact_include_hidden_files,
    artifact_if_no_files_found,
    runs_on,
    default_python,
    timeout_minutes,
):
    """Script to load tox targets for GitHub Actions workflow."""
    # Load envs config
    envs = yaml.load(envs.replace("\\n", "\n"), Loader=yaml.BaseLoader)
    print(json.dumps(envs, indent=2))

    # Load global libraries config
    global_libraries = {
        "brew": [],
        "brew-cask": [],
        "apt": [],
        "choco": [],
    }
    libraries = yaml.load(libraries, Loader=yaml.BaseLoader)
    if libraries is not None:
        global_libraries.update(libraries)
    print(json.dumps(global_libraries, indent=2))

    # Default images to use for runners
    default_runs_on = {
        "linux": "ubuntu-latest",
        "macos": "macos-latest",
        "windows": "windows-latest",
    }
    custom_runs_on = yaml.load(runs_on, Loader=yaml.BaseLoader)
    if isinstance(custom_runs_on, dict):
        default_runs_on.update(custom_runs_on)
    print(json.dumps(default_runs_on, indent=2))

    # Default string parameters which can be overwritten by each env
    string_parameters = {
        "posargs": posargs,
        "toxdeps": toxdeps,
        "toxargs": toxargs,
        "pytest": pytest,
        "pytest-results-summary": pytest_results_summary,
        "coverage": coverage,
        "conda-packages": conda_packages,
        "conda-channels": json.dumps(conda_channels.split()),
        "setenv": setenv,
        "display": display,
        "cache-path": cache_path,
        "cache-key": cache_key,
        "cache-restore-keys": cache_restore_keys,
        "artifact-path": artifact_path,
        "artifact-archive": artifact_archive,
        "artifact-include-hidden-files": artifact_include_hidden_files,
        "artifact-if-no-files-found": artifact_if_no_files_found,
        "timeout-minutes": timeout_minutes,
    }

    # Create matrix
    matrix = {"include": []}
    for env in envs:
        matrix["include"].append(
            get_matrix_item(
                env,
                global_libraries=global_libraries,
                global_string_parameters=string_parameters,
                runs_on=default_runs_on,
                default_python=default_python,
            )
        )

    # Output matrix
    print(json.dumps(matrix, indent=2))
    with open(os.environ["GITHUB_OUTPUT"], "a") as f:
        f.write(f"matrix={json.dumps(matrix)}\n")


def get_matrix_item(env, global_libraries, global_string_parameters, runs_on, default_python):

    # define spec for each matrix include (+ global_string_parameters)
    item = {
        "os": None,
        "toxenv": None,
        "python_version": None,
        "name": None,
        "pytest_flag": None,
        "libraries_brew": None,
        "libraries_brew_cask": None,
        "libraries_apt": None,
        "libraries_choco": None,
        "conda-packages": None,
        "cache-path": None,
        "cache-key": None,
        "cache-restore-keys": None,
        "artifact-name": None,
        "artifact-path": None,
        "artifact-archive": None,
        "artifact-include-hidden-files": None,
        "artifact-if-no-files-found": None,
        "timeout-minutes": None,
    }
    for string_param, default in global_string_parameters.items():
        env_value = env.get(string_param)
        item[string_param] = default if env_value is None else env_value

    # set os and toxenv
    for k, v in runs_on.items():
        if k in env:
            platform = k
            item["os"] = env.get("runs-on", v)
            item["toxenv"] = env[k]
    assert item["os"] is not None and item["toxenv"] is not None

    # set python_version
    python_version = env.get("python-version")
    m = re.search("^py(2|3)([0-9]+t?)", item["toxenv"])
    if python_version is not None:
        item["python_version"] = python_version
    elif m is not None:
        major, minor = m.groups()
        item["python_version"] = f"{major}.{minor}"
    else:
        item["python_version"] = env.get("default_python") or default_python

    # set name
    item["name"] = env.get("name") or f"{item['toxenv']} ({item['os']})"

    # set artifact-name (replace invalid path characters)
    item["artifact-name"] = re.sub(r"[\\ /:<>|*?\"']", "-", item["name"])
    item["artifact-name"] = re.sub(r"-+", "-", item["artifact-name"])

    # set pytest_flag
    item["pytest_flag"] = ""
    sep = r"\\" if platform == "windows" else "/"
    if item["pytest"] == "true":
        if item["pytest-results-summary"] == "true":
            item["pytest_flag"] += rf"--junitxml ${{GITHUB_WORKSPACE}}{sep}results.xml "

    env_conda_channels = env.get("conda-channels")
    if isinstance(env_conda_channels, str) and len(env_conda_channels.strip()) == 0:
        item["conda-channels"] = json.dumps(env_conda_channels.split())

    # set libraries
    env_libraries = env.get("libraries")
    if isinstance(env_libraries, str) and len(env_libraries.strip()) == 0:
        env_libraries = {}  # no libraries requested for environment
    libraries = global_libraries if env_libraries is None else env_libraries
    for manager in ["brew", "brew_cask", "apt", "choco"]:
        item[f"libraries_{manager}"] = " ".join(libraries.get(manager, []))

    # make timeout-minutes a number
    item["timeout-minutes"] = int(item["timeout-minutes"])

    # verify values
    assert item["pytest"] in {"true", "false"}
    assert item["display"] in {"true", "false"}

    return item


if __name__ == "__main__":
    load_tox_targets()
 - run: cat tox_matrix.py - id: set-outputs run: | # zizmor: ignore[template-injection] @@ -187,7 +187,8 @@ jobs: --posargs "${{ inputs.posargs }}" --toxdeps "${{ inputs.toxdeps }}" \ --toxargs "${{ inputs.toxargs }}" --pytest "${{ inputs.pytest }}" \ --pytest-results-summary "${{ inputs.pytest-results-summary }}" \ - --coverage "${{ inputs.coverage }}" --conda-packages "${{ inputs.conda-packages }}" \ + --coverage "${{ inputs.coverage }}" \ + --conda-packages "${{ inputs.conda_packages }}" --conda-channels "${{ inputs.conda_channels }}" \ --setenv "${{ inputs.setenv }}" \ --display "${{ inputs.display }}" --cache-path "${{ inputs.cache-path }}" \ --cache-key "${{ inputs.cache-key }}" --cache-restore-keys "${{ inputs.cache-restore-keys }}" \ @@ -224,7 +225,7 @@ jobs: ref: ${{ inputs.checkout_ref }} persist-credentials: false - - name: Cache ${{ matrix.cache_key }} + - name: Cache ${{ matrix.cache-key }} if: ${{ matrix.cache-path != '' && matrix.cache-key != '' }} uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 with: @@ -241,7 +242,7 @@ jobs: choco: ${{ matrix.libraries_choco }} - name: Setup Python ${{ matrix.python_version }} - if: inputs.conda_packages == '' + if: matrix.conda-packages == '' uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # 8.1.0 with: python-version: ${{ matrix.python_version }} @@ -249,12 +250,12 @@ jobs: ignore-empty-workdir: "true" - name: Setup Micromamba with Python ${{ matrix.python_version }} - if: inputs.conda_packages != '' + if: matrix.conda-packages != '' uses: mamba-org/setup-micromamba@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0 with: environment-name: test condarc: | - channels: [${{ inputs.conda_channels }}] + channels: ${{ matrix.conda-channels }} use_uv: true create-args: >- python=${{ matrix.python_version }} diff --git a/docs/source/tox.rst b/docs/source/tox.rst index 17f57d4..08a75fd 100644 --- a/docs/source/tox.rst +++ b/docs/source/tox.rst @@ -229,7 +229,7 @@ conda_channels ^^^^^^^^^^^^^^ Conda channel(s) to use with ``conda_packages`` (defaults to ``conda-forge``). -If multiple, make sure they're separated by commas. +If multiple, separate with spaces. setenv ^^^^^^ diff --git a/tools/tox_matrix.py b/tools/tox_matrix.py index 37ab160..f0376aa 100644 --- a/tools/tox_matrix.py +++ b/tools/tox_matrix.py @@ -22,7 +22,8 @@ @click.option("--pytest", default="true") @click.option("--pytest-results-summary", default="false") @click.option("--coverage", default="") -@click.option("--conda-packages", default="auto") +@click.option("--conda-packages") +@click.option("--conda-channels", default="conda-forge") @click.option("--setenv", default="") @click.option("--display", default="false") @click.option("--cache-path", default="") @@ -45,6 +46,7 @@ def load_tox_targets( pytest_results_summary, coverage, conda_packages, + conda_channels, setenv, display, cache_path, @@ -95,6 +97,7 @@ def load_tox_targets( "pytest-results-summary": pytest_results_summary, "coverage": coverage, "conda-packages": conda_packages, + "conda-channels": json.dumps(conda_channels.split()), "setenv": setenv, "display": display, "cache-path": cache_path, @@ -139,6 +142,7 @@ def get_matrix_item(env, global_libraries, global_string_parameters, runs_on, de "libraries_brew_cask": None, "libraries_apt": None, "libraries_choco": None, + "conda-packages": None, "cache-path": None, "cache-key": None, "cache-restore-keys": None, @@ -186,6 +190,10 @@ def get_matrix_item(env, global_libraries, global_string_parameters, runs_on, de if item["pytest-results-summary"] == "true": item["pytest_flag"] += rf"--junitxml ${{GITHUB_WORKSPACE}}{sep}results.xml " + env_conda_channels = env.get("conda-channels") + if isinstance(env_conda_channels, str) and len(env_conda_channels.strip()) == 0: + item["conda-channels"] = json.dumps(env_conda_channels.split()) + # set libraries env_libraries = env.get("libraries") if isinstance(env_libraries, str) and len(env_libraries.strip()) == 0: diff --git a/tox.ini b/tox.ini index fefbe0b..b919b21 100644 --- a/tox.ini +++ b/tox.ini @@ -68,7 +68,7 @@ setenv = tmpdir: COVERAGE_FILE={toxinidir}/.coverage commands = pytest --pyargs test_package {posargs} - + [testenv:build_docs] changedir = docs description = Invoke sphinx-build to build the HTML docs From 774778287b220e40bc68df72223b84e1a2667570 Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Wed, 3 Jun 2026 15:07:29 -0400 Subject: [PATCH 8/8] unpin uv --- .github/workflows/tox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 43290ca..83b150d 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -259,7 +259,7 @@ jobs: use_uv: true create-args: >- python=${{ matrix.python_version }} - uv=0.10.6 + uv ${{ inputs.conda_packages }} init-shell: bash cache-environment: true