From 831b50965bc659f88f9b262ea97f447f4602d42f Mon Sep 17 00:00:00 2001 From: suryaiyer95 Date: Tue, 21 Jan 2025 12:32:03 -0800 Subject: [PATCH 01/10] fix: remove extra forbid constraint --- src/datapilot/constants.py | 7 --- .../core/platforms/dbt/schemas/catalog.py | 26 ---------- .../core/platforms/dbt/schemas/manifest.py | 51 ------------------- 3 files changed, 84 deletions(-) delete mode 100644 src/datapilot/constants.py diff --git a/src/datapilot/constants.py b/src/datapilot/constants.py deleted file mode 100644 index aed1f35..0000000 --- a/src/datapilot/constants.py +++ /dev/null @@ -1,7 +0,0 @@ -from enum import Enum - - -class Extra(str, Enum): - allow = "allow" - forbid = "forbid" - ignore = "ignore" diff --git a/src/datapilot/core/platforms/dbt/schemas/catalog.py b/src/datapilot/core/platforms/dbt/schemas/catalog.py index 288557f..5f3bd53 100644 --- a/src/datapilot/core/platforms/dbt/schemas/catalog.py +++ b/src/datapilot/core/platforms/dbt/schemas/catalog.py @@ -5,17 +5,11 @@ from typing import Optional from typing import Union -from pydantic import ConfigDict from pydantic.main import BaseModel -from datapilot.constants import Extra class AltimateCatalogMetadata(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - dbt_schema_version: Optional[str] = "https://schemas.getdbt.com/dbt/catalog/v1.json" dbt_version: Optional[str] = "0.19.0" generated_at: Optional[datetime] = "2021-02-10T04:42:33.680487Z" @@ -24,10 +18,6 @@ class AltimateCatalogMetadata(BaseModel): class AltimateCatalogTableMetadata(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - type: str database: Optional[Optional[str]] = None schema_name: str @@ -37,10 +27,6 @@ class AltimateCatalogTableMetadata(BaseModel): class AltimateCatalogColumnMetadata(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - type: str comment: Optional[Optional[str]] = None index: int @@ -48,10 +34,6 @@ class AltimateCatalogColumnMetadata(BaseModel): class AltimateCatalogStatsItem(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - id: str label: str value: Optional[Optional[Union[bool, str, float]]] = None @@ -60,10 +42,6 @@ class AltimateCatalogStatsItem(BaseModel): class AltimateCatalogTable(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - metadata: AltimateCatalogTableMetadata columns: Dict[str, AltimateCatalogColumnMetadata] stats: Dict[str, AltimateCatalogStatsItem] @@ -71,10 +49,6 @@ class AltimateCatalogTable(BaseModel): class AltimateCatalogCatalogV1(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - metadata: AltimateCatalogMetadata nodes: Dict[str, AltimateCatalogTable] sources: Dict[str, AltimateCatalogTable] diff --git a/src/datapilot/core/platforms/dbt/schemas/manifest.py b/src/datapilot/core/platforms/dbt/schemas/manifest.py index bee2a07..93bde27 100644 --- a/src/datapilot/core/platforms/dbt/schemas/manifest.py +++ b/src/datapilot/core/platforms/dbt/schemas/manifest.py @@ -19,10 +19,6 @@ from dbt_artifacts_parser.parsers.manifest.manifest_v11 import ManifestV11 from dbt_artifacts_parser.parsers.manifest.manifest_v11 import SupportedLanguage from pydantic import BaseModel -from pydantic import ConfigDict - -from datapilot.constants import Extra - class DBTVersion(BaseModel): MAJOR: int @@ -48,9 +44,6 @@ class DBTVersion(BaseModel): class AltimateDocs(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) show: Optional[bool] = True node_color: Optional[Optional[str]] = None @@ -101,20 +94,12 @@ class AltimateAccess(Enum): class AltimateDBTContract(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - enforced: Optional[bool] = False alias_types: Optional[bool] = True checksum: Optional[Optional[str]] = None class AltimateHook(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - sql: str transaction: Optional[bool] = True index: Optional[Optional[int]] = None @@ -122,10 +107,6 @@ class AltimateHook(BaseModel): # TODO: Need to add the rest of the fields class AltimateNodeConfig(BaseModel): - model_config = ConfigDict( - extra=Extra.allow, - ) - _extra: Optional[Dict[str, Any]] = None enabled: Optional[bool] = True alias: Optional[Optional[str]] = None @@ -209,10 +190,6 @@ class AltimateSourceConfig(BaseModel): class AltimateDeferRelation(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - database: Optional[str] schema_name: str alias: str @@ -220,10 +197,6 @@ class AltimateDeferRelation(BaseModel): class AltimateSeedConfig(BaseModel): - model_config = ConfigDict( - extra=Extra.allow, - ) - _extra: Optional[Dict[str, Any]] = None enabled: Optional[bool] = True alias: Optional[Optional[str]] = None @@ -322,10 +295,6 @@ class AltimateExposureType(Enum): class AltimateOwner(BaseModel): - model_config = ConfigDict( - extra=Extra.allow, - ) - _extra: Optional[Dict[str, Any]] = None email: Optional[Optional[str]] = None name: Optional[Optional[str]] = None @@ -338,20 +307,12 @@ class AltimateMaturityEnum(Enum): class AltimateRefArgs(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - name: str package: Optional[Optional[str]] = None version: Optional[Optional[Union[str, float]]] = None class AltimateExposureConfig(BaseModel): - model_config = ConfigDict( - extra=Extra.allow, - ) - _extra: Optional[Dict[str, Any]] = None enabled: Optional[bool] = True @@ -382,20 +343,12 @@ class AltimateManifestExposureNode(BaseModel): class AltimateTestMetadata(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - name: str kwargs: Optional[Dict[str, Any]] = None namespace: Optional[Optional[str]] = None class AltimateTestConfig(BaseModel): - model_config = ConfigDict( - extra=Extra.allow, - ) - _extra: Optional[Dict[str, Any]] = None enabled: Optional[bool] = True alias: Optional[Optional[str]] = None @@ -446,10 +399,6 @@ class AltimateManifestTestNode(BaseModel): class AltimateMacroArgument(BaseModel): - model_config = ConfigDict( - extra=Extra.forbid, - ) - name: str type: Optional[Optional[str]] = None description: Optional[Optional[str]] = "" From 38dad6dd30a16958f55f472d51c875c86ce615bb Mon Sep 17 00:00:00 2001 From: suryaiyer95 Date: Tue, 21 Jan 2025 12:33:43 -0800 Subject: [PATCH 02/10] fix: formatting black --- src/datapilot/core/platforms/dbt/schemas/catalog.py | 1 - src/datapilot/core/platforms/dbt/schemas/manifest.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/datapilot/core/platforms/dbt/schemas/catalog.py b/src/datapilot/core/platforms/dbt/schemas/catalog.py index 5f3bd53..2f182d4 100644 --- a/src/datapilot/core/platforms/dbt/schemas/catalog.py +++ b/src/datapilot/core/platforms/dbt/schemas/catalog.py @@ -8,7 +8,6 @@ from pydantic.main import BaseModel - class AltimateCatalogMetadata(BaseModel): dbt_schema_version: Optional[str] = "https://schemas.getdbt.com/dbt/catalog/v1.json" dbt_version: Optional[str] = "0.19.0" diff --git a/src/datapilot/core/platforms/dbt/schemas/manifest.py b/src/datapilot/core/platforms/dbt/schemas/manifest.py index 93bde27..4af4e8e 100644 --- a/src/datapilot/core/platforms/dbt/schemas/manifest.py +++ b/src/datapilot/core/platforms/dbt/schemas/manifest.py @@ -20,6 +20,7 @@ from dbt_artifacts_parser.parsers.manifest.manifest_v11 import SupportedLanguage from pydantic import BaseModel + class DBTVersion(BaseModel): MAJOR: int MINOR: int @@ -44,7 +45,6 @@ class DBTVersion(BaseModel): class AltimateDocs(BaseModel): - show: Optional[bool] = True node_color: Optional[Optional[str]] = None From 43a5d845dea3c7262e297376bd933894ed3321db Mon Sep 17 00:00:00 2001 From: suryaiyer95 Date: Tue, 21 Jan 2025 12:47:32 -0800 Subject: [PATCH 03/10] fix: tests for multiple pydantic version and removing tests for (3.8 EOL and failing due to rust also for now) --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 8b1227d..0d9b638 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ envlist = clean, check, docs, - {py38,py39,py310,py311,py312,pypy38,pypy39,pypy310}-{cover,nocov}, + {py39,py310,py311,py312,pypy38,pypy39,pypy310}-{pydantic28,pydantic210}-{cover,nocov}, report ignore_basepython_conflict = true @@ -40,6 +40,8 @@ usedevelop = deps = pytest cover: pytest-cov + pydantic28: pydantic>=2.8,<2.9 + pydantic210: pydantic>=2.10,<2.11 commands = nocov: {posargs:pytest -vv --ignore=src} cover: {posargs:pytest --cov --cov-report=term-missing --cov-report=xml -vv} From e4098013e2010ca0a540919ddae565f59c68d43e Mon Sep 17 00:00:00 2001 From: suryaiyer95 Date: Tue, 21 Jan 2025 12:52:33 -0800 Subject: [PATCH 04/10] fix: tests --- .github/workflows/github-actions.yml | 102 +++++++++++++++++++++++++++ tox.ini | 3 +- 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index c905cae..4227f1f 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -73,12 +73,30 @@ jobs: python_arch: 'x64' tox_env: 'py39-cover' os: 'macos-13' + - name: 'py39-pydantic28-cover (ubuntu)' + python: '3.9' + toxpython: 'python3.9' + python_arch: 'x64' + tox_env: 'py39-pydantic28-cover' + os: 'ubuntu-latest' + - name: 'py39-pydantic210-cover (ubuntu)' + 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)' + 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' @@ -109,12 +127,30 @@ jobs: python_arch: 'x64' tox_env: 'py310-cover' os: 'macos-13' + - name: 'py310-pydantic28-cover (ubuntu)' + python: '3.10' + toxpython: 'python3.10' + python_arch: 'x64' + tox_env: 'py310-pydantic28-cover' + os: 'ubuntu-latest' + - name: 'py310-pydantic210-cover (ubuntu)' + 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)' + 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' @@ -151,6 +187,18 @@ jobs: python_arch: 'x64' tox_env: 'py311-nocov' os: 'ubuntu-latest' + - name: 'py311-pydantic28-cover (ubuntu)' + python: '3.11' + toxpython: 'python3.11' + python_arch: 'x64' + tox_env: 'py311-pydantic28-cover' + os: 'ubuntu-latest' + - name: 'py311-pydantic210-cover (ubuntu)' + python: '3.11' + toxpython: 'python3.11' + python_arch: 'x64' + tox_env: 'py311-pydantic210-cover' + os: 'ubuntu-latest' - name: 'py311-nocov (windows)' python: '3.11' toxpython: 'python3.11' @@ -187,6 +235,24 @@ jobs: python_arch: 'x64' tox_env: 'py312-nocov' os: 'ubuntu-latest' + - name: 'py312-pydantic28-cover (ubuntu)' + python: '3.12' + toxpython: 'python3.12' + python_arch: 'x64' + tox_env: 'py312-pydantic28-cover' + os: 'ubuntu-latest' + - name: 'py312-pydantic210-cover (ubuntu)' + python: '3.12' + toxpython: 'python3.12' + python_arch: 'x64' + tox_env: 'py312-pydantic210-cover' + os: 'ubuntu-latest' + - name: 'py312-pydantic28-nocov (ubuntu)' + 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' @@ -253,12 +319,30 @@ jobs: python_arch: 'x64' tox_env: 'pypy39-cover' os: 'macos-13' + - name: 'pypy39-pydantic28-cover (ubuntu)' + python: 'pypy-3.9' + toxpython: 'pypy3.9' + python_arch: 'x64' + tox_env: 'pypy39-pydantic28-cover' + os: 'ubuntu-latest' + - name: 'pypy39-pydantic210-cover (ubuntu)' + 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)' + 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' @@ -289,12 +373,30 @@ jobs: python_arch: 'x64' tox_env: 'pypy310-cover' os: 'macos-13' + - name: 'pypy310-pydantic28-cover (ubuntu)' + python: 'pypy-3.10' + toxpython: 'pypy3.10' + python_arch: 'x64' + tox_env: 'pypy310-pydantic28-cover' + os: 'ubuntu-latest' + - name: 'pypy310-pydantic210-cover (ubuntu)' + 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)' + 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' diff --git a/tox.ini b/tox.ini index 0d9b638..13eb580 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,8 @@ envlist = clean, check, docs, - {py39,py310,py311,py312,pypy38,pypy39,pypy310}-{pydantic28,pydantic210}-{cover,nocov}, + {py39,py310,py311,py312,pypy39,pypy310}-{pydantic28,pydantic210}-{cover,nocov}, + {py39,py310,py311,py312,pypy39,pypy310}-{cover,nocov}, report ignore_basepython_conflict = true From cde2195d719d604b88ab7fd2c223c202b9f3ab34 Mon Sep 17 00:00:00 2001 From: suryaiyer95 Date: Tue, 21 Jan 2025 12:55:32 -0800 Subject: [PATCH 05/10] fix: ignore warnings --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 13eb580..0b9ca6b 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ envlist = check, docs, {py39,py310,py311,py312,pypy39,pypy310}-{pydantic28,pydantic210}-{cover,nocov}, - {py39,py310,py311,py312,pypy39,pypy310}-{cover,nocov}, + {py38,py39,py310,py311,py312,pypy38,pypy39,pypy310}-{cover,nocov}, report ignore_basepython_conflict = true @@ -44,8 +44,8 @@ deps = pydantic28: pydantic>=2.8,<2.9 pydantic210: pydantic>=2.10,<2.11 commands = - nocov: {posargs:pytest -vv --ignore=src} - cover: {posargs:pytest --cov --cov-report=term-missing --cov-report=xml -vv} + nocov: {posargs:pytest -vv --ignore=src -p no:warnings} + cover: {posargs:pytest --cov --cov-report=term-missing --cov-report=xml -vv -p no:warnings} [testenv:check] deps = From f71767308d7431edb21b5e2b3e998061d3f2f707 Mon Sep 17 00:00:00 2001 From: suryaiyer95 Date: Tue, 21 Jan 2025 12:58:32 -0800 Subject: [PATCH 06/10] fix: disable tests --- .github/workflows/github-actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 4227f1f..85d2195 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -265,7 +265,7 @@ jobs: python_arch: 'x64' tox_env: 'py312-nocov' os: 'macos-13' - - name: 'pypy38-cover (ubuntu)' + {# - name: 'pypy38-cover (ubuntu)' python: 'pypy-3.8' toxpython: 'pypy3.8' python_arch: 'x64' @@ -300,7 +300,7 @@ jobs: toxpython: 'pypy3.8' python_arch: 'x64' tox_env: 'pypy38-nocov' - os: 'macos-13' + os: 'macos-13' #} - name: 'pypy39-cover (ubuntu)' python: 'pypy-3.9' toxpython: 'pypy3.9' From 72d22ce660f6c0a323ed0b875b05dd8302b35ba4 Mon Sep 17 00:00:00 2001 From: suryaiyer95 Date: Tue, 21 Jan 2025 12:59:28 -0800 Subject: [PATCH 07/10] fix: remove pyp38 tests --- .github/workflows/github-actions.yml | 36 ---------------------------- 1 file changed, 36 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 85d2195..17d339c 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -265,42 +265,6 @@ jobs: python_arch: 'x64' tox_env: 'py312-nocov' os: 'macos-13' - {# - name: 'pypy38-cover (ubuntu)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' - python_arch: 'x64' - tox_env: 'pypy38-cover' - os: 'ubuntu-latest' - - name: 'pypy38-cover (windows)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' - python_arch: 'x64' - tox_env: 'pypy38-cover' - os: 'windows-latest' - - name: 'pypy38-cover (macos)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' - python_arch: 'x64' - tox_env: 'pypy38-cover' - os: 'macos-13' - - name: 'pypy38-nocov (ubuntu)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' - python_arch: 'x64' - tox_env: 'pypy38-nocov' - os: 'ubuntu-latest' - - name: 'pypy38-nocov (windows)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' - python_arch: 'x64' - tox_env: 'pypy38-nocov' - os: 'windows-latest' - - name: 'pypy38-nocov (macos)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' - python_arch: 'x64' - tox_env: 'pypy38-nocov' - os: 'macos-13' #} - name: 'pypy39-cover (ubuntu)' python: 'pypy-3.9' toxpython: 'pypy3.9' From ffae1f8ce5e478d21a29ce75175cea12c43ed500 Mon Sep 17 00:00:00 2001 From: suryaiyer95 Date: Tue, 21 Jan 2025 13:07:25 -0800 Subject: [PATCH 08/10] 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 From e598b5e7652f59446455a3f9eda2216be2f4f10a Mon Sep 17 00:00:00 2001 From: suryaiyer95 Date: Tue, 21 Jan 2025 13:10:21 -0800 Subject: [PATCH 09/10] fix: ci --- .github/workflows/github-actions.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index e99fb69..8053f90 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -19,8 +19,6 @@ jobs: toxpython: 'python3.11' tox_env: 'docs' os: 'ubuntu-latest' - - # Python 3.9 - name: 'py39-pydantic28-cover (ubuntu)' python: '3.9' toxpython: 'python3.9' @@ -57,8 +55,6 @@ jobs: python_arch: 'x64' tox_env: 'py39-pydantic210-nocov' os: 'ubuntu-latest' - - # Python 3.10 - name: 'py310-pydantic28-cover' python: '3.10' toxpython: 'python3.10' @@ -83,8 +79,6 @@ jobs: python_arch: 'x64' tox_env: 'py310-pydantic210-nocov' os: 'ubuntu-latest' - - # Python 3.11 - name: 'py311-pydantic28-cover' python: '3.11' toxpython: 'python3.11' @@ -109,8 +103,6 @@ jobs: python_arch: 'x64' tox_env: 'py311-pydantic210-nocov' os: 'ubuntu-latest' - - # Python 3.12 - name: 'py312-pydantic28-cover' python: '3.12' toxpython: 'python3.12' @@ -135,8 +127,6 @@ jobs: python_arch: 'x64' tox_env: 'py312-pydantic210-nocov' os: 'ubuntu-latest' - - # PyPy 3.9 - name: 'pypy39-pydantic28-cover' python: 'pypy-3.9' toxpython: 'pypy3.9' @@ -161,8 +151,6 @@ jobs: python_arch: 'x64' tox_env: 'pypy39-pydantic210-nocov' os: 'ubuntu-latest' - - # PyPy 3.10 - name: 'pypy310-pydantic28-cover' python: 'pypy-3.10' toxpython: 'pypy3.10' From 1514bf1b774b398b8c71c498a6bce99a6e96e556 Mon Sep 17 00:00:00 2001 From: suryaiyer95 Date: Tue, 21 Jan 2025 13:13:01 -0800 Subject: [PATCH 10/10] fix: actions --- .github/workflows/github-actions.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 8053f90..1478e85 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -175,7 +175,6 @@ jobs: python_arch: 'x64' tox_env: 'pypy310-pydantic210-nocov' os: 'ubuntu-latest' - steps: - uses: actions/checkout@v4 with: