From ffae1f8ce5e478d21a29ce75175cea12c43ed500 Mon Sep 17 00:00:00 2001 From: suryaiyer95 Date: Tue, 21 Jan 2025 13:07:25 -0800 Subject: [PATCH] fix: test envs --- .github/workflows/github-actions.yml | 287 +++++---------------------- tox.ini | 1 - 2 files changed, 51 insertions(+), 237 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 17d339c..e99fb69 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -19,360 +19,175 @@ jobs: toxpython: 'python3.11' tox_env: 'docs' os: 'ubuntu-latest' - - name: 'py38-cover (ubuntu)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-cover' - os: 'ubuntu-latest' - - name: 'py38-cover (windows)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-cover' - os: 'windows-latest' - - name: 'py38-cover (macos)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-cover' - os: 'macos-13' - - name: 'py38-nocov (ubuntu)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-nocov' - os: 'ubuntu-latest' - - name: 'py38-nocov (windows)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-nocov' - os: 'windows-latest' - - name: 'py38-nocov (macos)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-nocov' - os: 'macos-13' - - name: 'py39-cover (ubuntu)' + + # Python 3.9 + - name: 'py39-pydantic28-cover (ubuntu)' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' - tox_env: 'py39-cover' + tox_env: 'py39-pydantic28-cover' os: 'ubuntu-latest' - - name: 'py39-cover (windows)' + - name: 'py39-pydantic28-cover (windows)' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' - tox_env: 'py39-cover' + tox_env: 'py39-pydantic28-cover' os: 'windows-latest' - - name: 'py39-cover (macos)' - python: '3.9' - toxpython: 'python3.9' - python_arch: 'x64' - tox_env: 'py39-cover' - os: 'macos-13' - - name: 'py39-pydantic28-cover (ubuntu)' + - name: 'py39-pydantic28-cover (macos)' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' tox_env: 'py39-pydantic28-cover' - os: 'ubuntu-latest' - - name: 'py39-pydantic210-cover (ubuntu)' + os: 'macos-13' + - name: 'py39-pydantic210-cover' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' tox_env: 'py39-pydantic210-cover' os: 'ubuntu-latest' - - name: 'py39-nocov (ubuntu)' - python: '3.9' - toxpython: 'python3.9' - python_arch: 'x64' - tox_env: 'py39-nocov' - os: 'ubuntu-latest' - - name: 'py39-pydantic28-nocov (ubuntu)' + - name: 'py39-pydantic28-nocov' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' tox_env: 'py39-pydantic28-nocov' os: 'ubuntu-latest' - - name: 'py39-nocov (windows)' - python: '3.9' - toxpython: 'python3.9' - python_arch: 'x64' - tox_env: 'py39-nocov' - os: 'windows-latest' - - name: 'py39-nocov (macos)' + - name: 'py39-pydantic210-nocov' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' - tox_env: 'py39-nocov' - os: 'macos-13' - - name: 'py310-cover (ubuntu)' - python: '3.10' - toxpython: 'python3.10' - python_arch: 'x64' - tox_env: 'py310-cover' + tox_env: 'py39-pydantic210-nocov' os: 'ubuntu-latest' - - name: 'py310-cover (windows)' - python: '3.10' - toxpython: 'python3.10' - python_arch: 'x64' - tox_env: 'py310-cover' - os: 'windows-latest' - - name: 'py310-cover (macos)' - python: '3.10' - toxpython: 'python3.10' - python_arch: 'x64' - tox_env: 'py310-cover' - os: 'macos-13' - - name: 'py310-pydantic28-cover (ubuntu)' + + # Python 3.10 + - name: 'py310-pydantic28-cover' python: '3.10' toxpython: 'python3.10' python_arch: 'x64' tox_env: 'py310-pydantic28-cover' os: 'ubuntu-latest' - - name: 'py310-pydantic210-cover (ubuntu)' + - name: 'py310-pydantic210-cover' python: '3.10' toxpython: 'python3.10' python_arch: 'x64' tox_env: 'py310-pydantic210-cover' os: 'ubuntu-latest' - - name: 'py310-nocov (ubuntu)' - python: '3.10' - toxpython: 'python3.10' - python_arch: 'x64' - tox_env: 'py310-nocov' - os: 'ubuntu-latest' - - name: 'py310-pydantic28-nocov (ubuntu)' + - name: 'py310-pydantic28-nocov' python: '3.10' toxpython: 'python3.10' python_arch: 'x64' tox_env: 'py310-pydantic28-nocov' os: 'ubuntu-latest' - - name: 'py310-nocov (windows)' - python: '3.10' - toxpython: 'python3.10' - python_arch: 'x64' - tox_env: 'py310-nocov' - os: 'windows-latest' - - name: 'py310-nocov (macos)' + - name: 'py310-pydantic210-nocov' python: '3.10' toxpython: 'python3.10' python_arch: 'x64' - tox_env: 'py310-nocov' - os: 'macos-13' - - name: 'py311-cover (ubuntu)' - python: '3.11' - toxpython: 'python3.11' - python_arch: 'x64' - tox_env: 'py311-cover' - os: 'ubuntu-latest' - - name: 'py311-cover (windows)' - python: '3.11' - toxpython: 'python3.11' - python_arch: 'x64' - tox_env: 'py311-cover' - os: 'windows-latest' - - name: 'py311-cover (macos)' - python: '3.11' - toxpython: 'python3.11' - python_arch: 'x64' - tox_env: 'py311-cover' - os: 'macos-13' - - name: 'py311-nocov (ubuntu)' - python: '3.11' - toxpython: 'python3.11' - python_arch: 'x64' - tox_env: 'py311-nocov' + tox_env: 'py310-pydantic210-nocov' os: 'ubuntu-latest' - - name: 'py311-pydantic28-cover (ubuntu)' + + # Python 3.11 + - name: 'py311-pydantic28-cover' python: '3.11' toxpython: 'python3.11' python_arch: 'x64' tox_env: 'py311-pydantic28-cover' os: 'ubuntu-latest' - - name: 'py311-pydantic210-cover (ubuntu)' + - name: 'py311-pydantic210-cover' python: '3.11' toxpython: 'python3.11' python_arch: 'x64' tox_env: 'py311-pydantic210-cover' os: 'ubuntu-latest' - - name: 'py311-nocov (windows)' + - name: 'py311-pydantic28-nocov' python: '3.11' toxpython: 'python3.11' python_arch: 'x64' - tox_env: 'py311-nocov' - os: 'windows-latest' - - name: 'py311-nocov (macos)' + tox_env: 'py311-pydantic28-nocov' + os: 'ubuntu-latest' + - name: 'py311-pydantic210-nocov' python: '3.11' toxpython: 'python3.11' python_arch: 'x64' - tox_env: 'py311-nocov' - os: 'macos-13' - - name: 'py312-cover (ubuntu)' - python: '3.12' - toxpython: 'python3.12' - python_arch: 'x64' - tox_env: 'py312-cover' + tox_env: 'py311-pydantic210-nocov' os: 'ubuntu-latest' - - name: 'py312-cover (windows)' - python: '3.12' - toxpython: 'python3.12' - python_arch: 'x64' - tox_env: 'py312-cover' - os: 'windows-latest' - - name: 'py312-cover (macos)' - python: '3.12' - toxpython: 'python3.12' - python_arch: 'x64' - tox_env: 'py312-cover' - os: 'macos-13' - - name: 'py312-nocov (ubuntu)' - python: '3.12' - toxpython: 'python3.12' - python_arch: 'x64' - tox_env: 'py312-nocov' - os: 'ubuntu-latest' - - name: 'py312-pydantic28-cover (ubuntu)' + + # Python 3.12 + - name: 'py312-pydantic28-cover' python: '3.12' toxpython: 'python3.12' python_arch: 'x64' tox_env: 'py312-pydantic28-cover' os: 'ubuntu-latest' - - name: 'py312-pydantic210-cover (ubuntu)' + - name: 'py312-pydantic210-cover' python: '3.12' toxpython: 'python3.12' python_arch: 'x64' tox_env: 'py312-pydantic210-cover' os: 'ubuntu-latest' - - name: 'py312-pydantic28-nocov (ubuntu)' + - name: 'py312-pydantic28-nocov' python: '3.12' toxpython: 'python3.12' python_arch: 'x64' tox_env: 'py312-pydantic28-nocov' os: 'ubuntu-latest' - - name: 'py312-nocov (windows)' - python: '3.12' - toxpython: 'python3.12' - python_arch: 'x64' - tox_env: 'py312-nocov' - os: 'windows-latest' - - name: 'py312-nocov (macos)' + - name: 'py312-pydantic210-nocov' python: '3.12' toxpython: 'python3.12' python_arch: 'x64' - tox_env: 'py312-nocov' - os: 'macos-13' - - name: 'pypy39-cover (ubuntu)' - python: 'pypy-3.9' - toxpython: 'pypy3.9' - python_arch: 'x64' - tox_env: 'pypy39-cover' + tox_env: 'py312-pydantic210-nocov' os: 'ubuntu-latest' - - name: 'pypy39-cover (windows)' - python: 'pypy-3.9' - toxpython: 'pypy3.9' - python_arch: 'x64' - tox_env: 'pypy39-cover' - os: 'windows-latest' - - name: 'pypy39-cover (macos)' - python: 'pypy-3.9' - toxpython: 'pypy3.9' - python_arch: 'x64' - tox_env: 'pypy39-cover' - os: 'macos-13' - - name: 'pypy39-pydantic28-cover (ubuntu)' + + # PyPy 3.9 + - name: 'pypy39-pydantic28-cover' python: 'pypy-3.9' toxpython: 'pypy3.9' python_arch: 'x64' tox_env: 'pypy39-pydantic28-cover' os: 'ubuntu-latest' - - name: 'pypy39-pydantic210-cover (ubuntu)' + - name: 'pypy39-pydantic210-cover' python: 'pypy-3.9' toxpython: 'pypy3.9' python_arch: 'x64' tox_env: 'pypy39-pydantic210-cover' os: 'ubuntu-latest' - - name: 'pypy39-nocov (ubuntu)' - python: 'pypy-3.9' - toxpython: 'pypy3.9' - python_arch: 'x64' - tox_env: 'pypy39-nocov' - os: 'ubuntu-latest' - - name: 'pypy39-pydantic28-nocov (ubuntu)' + - name: 'pypy39-pydantic28-nocov' python: 'pypy-3.9' toxpython: 'pypy3.9' python_arch: 'x64' tox_env: 'pypy39-pydantic28-nocov' os: 'ubuntu-latest' - - name: 'pypy39-nocov (windows)' - python: 'pypy-3.9' - toxpython: 'pypy3.9' - python_arch: 'x64' - tox_env: 'pypy39-nocov' - os: 'windows-latest' - - name: 'pypy39-nocov (macos)' + - name: 'pypy39-pydantic210-nocov' python: 'pypy-3.9' toxpython: 'pypy3.9' python_arch: 'x64' - tox_env: 'pypy39-nocov' - os: 'macos-13' - - name: 'pypy310-cover (ubuntu)' - python: 'pypy-3.10' - toxpython: 'pypy3.10' - python_arch: 'x64' - tox_env: 'pypy310-cover' + tox_env: 'pypy39-pydantic210-nocov' os: 'ubuntu-latest' - - name: 'pypy310-cover (windows)' - python: 'pypy-3.10' - toxpython: 'pypy3.10' - python_arch: 'x64' - tox_env: 'pypy310-cover' - os: 'windows-latest' - - name: 'pypy310-cover (macos)' - python: 'pypy-3.10' - toxpython: 'pypy3.10' - python_arch: 'x64' - tox_env: 'pypy310-cover' - os: 'macos-13' - - name: 'pypy310-pydantic28-cover (ubuntu)' + + # PyPy 3.10 + - name: 'pypy310-pydantic28-cover' python: 'pypy-3.10' toxpython: 'pypy3.10' python_arch: 'x64' tox_env: 'pypy310-pydantic28-cover' os: 'ubuntu-latest' - - name: 'pypy310-pydantic210-cover (ubuntu)' + - name: 'pypy310-pydantic210-cover' python: 'pypy-3.10' toxpython: 'pypy3.10' python_arch: 'x64' tox_env: 'pypy310-pydantic210-cover' os: 'ubuntu-latest' - - name: 'pypy310-nocov (ubuntu)' - python: 'pypy-3.10' - toxpython: 'pypy3.10' - python_arch: 'x64' - tox_env: 'pypy310-nocov' - os: 'ubuntu-latest' - - name: 'pypy310-pydantic28-nocov (ubuntu)' + - name: 'pypy310-pydantic28-nocov' python: 'pypy-3.10' toxpython: 'pypy3.10' python_arch: 'x64' tox_env: 'pypy310-pydantic28-nocov' os: 'ubuntu-latest' - - name: 'pypy310-nocov (windows)' - python: 'pypy-3.10' - toxpython: 'pypy3.10' - python_arch: 'x64' - tox_env: 'pypy310-nocov' - os: 'windows-latest' - - name: 'pypy310-nocov (macos)' + - name: 'pypy310-pydantic210-nocov' python: 'pypy-3.10' toxpython: 'pypy3.10' python_arch: 'x64' - tox_env: 'pypy310-nocov' - os: 'macos-13' + tox_env: 'pypy310-pydantic210-nocov' + os: 'ubuntu-latest' + steps: - uses: actions/checkout@v4 with: diff --git a/tox.ini b/tox.ini index 0b9ca6b..91dfca0 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,6 @@ envlist = check, docs, {py39,py310,py311,py312,pypy39,pypy310}-{pydantic28,pydantic210}-{cover,nocov}, - {py38,py39,py310,py311,py312,pypy38,pypy39,pypy310}-{cover,nocov}, report ignore_basepython_conflict = true