Skip to content

Bump pydantic version in the agent_requirements.in file#15320

Merged
FlorentClarret merged 1 commit into
masterfrom
florentclarret/base_check/bump_pydantic
Jul 20, 2023
Merged

Bump pydantic version in the agent_requirements.in file#15320
FlorentClarret merged 1 commit into
masterfrom
florentclarret/base_check/bump_pydantic

Conversation

@FlorentClarret

@FlorentClarret FlorentClarret commented Jul 20, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

What does this PR do?

Bump pydantic version in the agent_requirements.in file

Motivation

Run ddev validate dep $TARGET
  ddev validate dep $TARGET
  shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
  env:
    PYTHON_VERSION: 3.9
    TARGET: 
    pythonLocation: /opt/hostedtoolcache/Python/3.9.17/x64
    PKG_CONFIG_PATH: /opt/hostedtoolcache/Python/3.9.17/x64/lib/pkgconfig
    Python_ROOT_DIR: /opt/hostedtoolcache/Python/3.9.17/x64
    Python[2](https://github.com/DataDog/integrations-core/actions/runs/5604095001/jobs/10251613574#step:12:2)_ROOT_DIR: /opt/hostedtoolcache/Python/[3](https://github.com/DataDog/integrations-core/actions/runs/5604095001/jobs/10251613574#step:12:3).9.17/x6[4](https://github.com/DataDog/integrations-core/actions/runs/5604095001/jobs/10251613574#step:12:4)
    Python3_ROOT_DIR: /opt/hostedtoolcache/Python/3.9.17/x[6](https://github.com/DataDog/integrations-core/actions/runs/5604095001/jobs/10251613574#step:12:6)4
    LD_LIBRARY_PATH: /opt/hostedtoolcache/Python/3.9.1[7](https://github.com/DataDog/integrations-core/actions/runs/5604095001/jobs/10251613574#step:12:7)/x64/lib
Mismatch for dependency `pydantic`:
    Agent: pydantic==1.10.[8](https://github.com/DataDog/integrations-core/actions/runs/5604095001/jobs/10251613574#step:12:8); python_version > '3.0'
    Checks: pydantic==2.0; python_version > '3.0'
Error: Mismatch for dependency `pydantic`:
    Agent: pydantic==1.[10](https://github.com/DataDog/integrations-core/actions/runs/5604095001/jobs/10251613574#step:12:10).8; python_version > 3.0
    Checks: pydantic==2.0; python_version > 3.0
Error: Process completed with exit code 1.

Additional Notes

Agent build is going to fail until DataDog/datadog-agent#17978 is merged

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • PR title must be written as a CHANGELOG entry (see why)
  • Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)
  • PR must have changelog/ and integration/ labels attached
  • If the PR doesn't need to be tested during QA, please add a qa/skip-qa label.

@FlorentClarret
FlorentClarret requested a review from a team as a code owner July 20, 2023 05:45
@github-actions

github-actions Bot commented Jul 20, 2023

Copy link
Copy Markdown
Contributor

The validations job has failed; please review the Files changed tab for possible suggestions to resolve.

@FlorentClarret
FlorentClarret force-pushed the florentclarret/base_check/bump_pydantic branch from 1c0baca to d297044 Compare July 20, 2023 06:12
iliakur
iliakur approved these changes Jul 20, 2023
View reviewed changes

@iliakur iliakur left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

very baffling why this wasn't caught by CI in the original PR...

@FlorentClarret
FlorentClarret merged commit acdf389 into master Jul 20, 2023
@FlorentClarret
FlorentClarret deleted the florentclarret/base_check/bump_pydantic branch July 20, 2023 12:42
vivek-datadog added a commit that referenced this pull request Jul 21, 2023
@vivek-datadog
Revert "Bump pydantic version in the agent_requirements.in file (#15320…
63177fc 
…)"

This reverts commit acdf389.
vivek-datadog added a commit that referenced this pull request Jul 24, 2023
@vivek-datadog
Revert "Bump pydantic version in the agent_requirements.in file (#15320…
8e72bf3 
…)" (#15338)

This reverts commit acdf389.
FlorentClarret added a commit that referenced this pull request Jul 24, 2023
@FlorentClarret
Revert "Revert "Bump pydantic version in the agent_requirements.in fi…
c5f9399 
…le (#15320)" (#15338)"

This reverts commit 8e72bf3.
FlorentClarret added a commit that referenced this pull request Jul 27, 2023
@ofek @FlorentClarret
Upgrade pydantic (#15394)
31386ad 
* Revert "Revert "Bump pydantic version in the agent_requirements.in file (#15320)" (#15338)"

This reverts commit 8e72bf3.

* upgrade pydantic

* downgrade pydantic

* downgrade again

---------

Co-authored-by: Florent Clarret <[email protected]>
@vivek-datadog vivek-datadog added the qa/skip-qa Automatically skip this PR for the next QA label Aug 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iliakur iliakur iliakur approved these changes

Assignees

No one assigned

Labels

base_package dependencies qa/skip-qa Automatically skip this PR for the next QA

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@FlorentClarret @iliakur @vivek-datadog