Skip to content

Commit 25404c7

Browse files
authored
Merge pull request #3202 from ytausch/pydantic-210
remove pydantic pin
2 parents d0a4214 + 9af64ec commit 25404c7

File tree

3 files changed

+43
-39
lines changed

3 files changed

+43
-39
lines changed

conda-lock.yml

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ metadata:
33
- url: conda-forge
44
used_env_vars: []
55
content_hash:
6-
linux-64: 47e27eadf78b024984ba2246127d65e7524c60bcb407b978498c1135cec23162
7-
osx-64: 5e63598ecaacbfd5f9f0e91975968b3d3bc12fae95d5cee457dd9b23b569ac98
8-
osx-arm64: 0f204f64b92bd922585ecf919b03561a9dccf5481b70ff29f89ea97b40c8ffb8
6+
linux-64: edc493578310dc74fcd551d5647c4dd82fccb14c36ea1174f0f1df543ba2131a
7+
osx-64: 3c78f8ba137712dabf12aca8d5402b7881e7c94157dfbe0ee5c5d72e908631cf
8+
osx-arm64: b7238ce176b67715c2ba4974d42237d44b3b6955b2b361b32d7a3f2f0339228f
99
platforms:
1010
- osx-arm64
1111
- linux-64
@@ -9948,48 +9948,51 @@ package:
99489948
- category: main
99499949
dependencies:
99509950
annotated-types: '>=0.6.0'
9951-
pydantic-core: 2.23.4
9952-
python: '>=3.7'
9951+
pydantic-core: 2.27.1
9952+
python: '>=3.9'
99539953
typing-extensions: '>=4.6.1'
9954+
typing_extensions: '>=4.12.2'
99549955
hash:
9955-
md5: 1eb533bb8eb2199e3fef3e4aa147319f
9956-
sha256: 1b7b0dc9f6af4da156bf22b0263be70829364a08145c696d3670facff2f6441a
9956+
md5: c15343c9dbdb30766a07e5b70e46c7d3
9957+
sha256: b1872231d26ee3ded32bd1fe3ee1b3c7d9834ad72bf28aed70e5cd1235341584
99579958
manager: conda
99589959
name: pydantic
99599960
optional: false
99609961
platform: linux-64
9961-
url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.9.2-pyhd8ed1ab_0.conda
9962-
version: 2.9.2
9962+
url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.10.1-pyh10f6f8f_0.conda
9963+
version: 2.10.1
99639964
- category: main
99649965
dependencies:
99659966
annotated-types: '>=0.6.0'
9966-
pydantic-core: 2.23.4
9967-
python: '>=3.7'
9967+
pydantic-core: 2.27.1
9968+
python: '>=3.9'
99689969
typing-extensions: '>=4.6.1'
9970+
typing_extensions: '>=4.12.2'
99699971
hash:
9970-
md5: 1eb533bb8eb2199e3fef3e4aa147319f
9971-
sha256: 1b7b0dc9f6af4da156bf22b0263be70829364a08145c696d3670facff2f6441a
9972+
md5: c15343c9dbdb30766a07e5b70e46c7d3
9973+
sha256: b1872231d26ee3ded32bd1fe3ee1b3c7d9834ad72bf28aed70e5cd1235341584
99729974
manager: conda
99739975
name: pydantic
99749976
optional: false
99759977
platform: osx-64
9976-
url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.9.2-pyhd8ed1ab_0.conda
9977-
version: 2.9.2
9978+
url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.10.1-pyh10f6f8f_0.conda
9979+
version: 2.10.1
99789980
- category: main
99799981
dependencies:
99809982
annotated-types: '>=0.6.0'
9981-
pydantic-core: 2.23.4
9982-
python: '>=3.7'
9983+
pydantic-core: 2.27.1
9984+
python: '>=3.9'
99839985
typing-extensions: '>=4.6.1'
9986+
typing_extensions: '>=4.12.2'
99849987
hash:
9985-
md5: 1eb533bb8eb2199e3fef3e4aa147319f
9986-
sha256: 1b7b0dc9f6af4da156bf22b0263be70829364a08145c696d3670facff2f6441a
9988+
md5: c15343c9dbdb30766a07e5b70e46c7d3
9989+
sha256: b1872231d26ee3ded32bd1fe3ee1b3c7d9834ad72bf28aed70e5cd1235341584
99879990
manager: conda
99889991
name: pydantic
99899992
optional: false
99909993
platform: osx-arm64
9991-
url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.9.2-pyhd8ed1ab_0.conda
9992-
version: 2.9.2
9994+
url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.10.1-pyh10f6f8f_0.conda
9995+
version: 2.10.1
99939996
- category: main
99949997
dependencies:
99959998
__glibc: '>=2.17,<3.0.a0'
@@ -9998,47 +10001,47 @@ package:
999810001
python_abi: 3.11.*
999910002
typing-extensions: '>=4.6.0,!=4.7.0'
1000010003
hash:
10001-
md5: 5e24fd648b7926bec16e535efda533c2
10002-
sha256: 3cdbe29c2b4aec34aabcf03cf2b34a6284563c03bdb43b63d204e6d9f6f0dbfc
10004+
md5: e5192dfb2dae866470c3eec81dbe5727
10005+
sha256: 0ae49448c55affa0e9df0e876d02aee77ad42678500a34679f9689bf3682000e
1000310006
manager: conda
1000410007
name: pydantic-core
1000510008
optional: false
1000610009
platform: linux-64
1000710010
url:
10008-
https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.23.4-py311h9e33e62_0.conda
10009-
version: 2.23.4
10011+
https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.27.1-py311h9e33e62_0.conda
10012+
version: 2.27.1
1001010013
- category: main
1001110014
dependencies:
1001210015
__osx: '>=10.13'
1001310016
python: '>=3.11,<3.12.0a0'
1001410017
python_abi: 3.11.*
1001510018
typing-extensions: '>=4.6.0,!=4.7.0'
1001610019
hash:
10017-
md5: 78401e8334f544491d76a426f3cc5ad5
10018-
sha256: c13a8ba4c3eb5014eba9a28b1925e0a8802c43a199f788642dee1acd518e0815
10020+
md5: bf4260289161c2c5dab79ae4927039b9
10021+
sha256: 37bf1415f98aff626f200381391b0130bf9d4460edcc866e9960f2c6d7960920
1001910022
manager: conda
1002010023
name: pydantic-core
1002110024
optional: false
1002210025
platform: osx-64
1002310026
url:
10024-
https://conda.anaconda.org/conda-forge/osx-64/pydantic-core-2.23.4-py311h95688db_0.conda
10025-
version: 2.23.4
10027+
https://conda.anaconda.org/conda-forge/osx-64/pydantic-core-2.27.1-py311h3b9c2be_0.conda
10028+
version: 2.27.1
1002610029
- category: main
1002710030
dependencies:
1002810031
__osx: '>=11.0'
1002910032
python: '>=3.11,<3.12.0a0'
1003010033
python_abi: 3.11.*
1003110034
typing-extensions: '>=4.6.0,!=4.7.0'
1003210035
hash:
10033-
md5: 9d638548f9a18cab78220984c0fda22b
10034-
sha256: cfb1342c6363a01b1315ac8298a44e56f686d7e82cfdbb04d1ab156939f98ef1
10036+
md5: 9a65f7d97aaa139bd8471429e192ac61
10037+
sha256: fda69a0024647c988a1571a78f31d05cefb95c8580c7fea29106dc5e08b654fa
1003510038
manager: conda
1003610039
name: pydantic-core
1003710040
optional: false
1003810041
platform: osx-arm64
1003910042
url:
10040-
https://conda.anaconda.org/conda-forge/osx-arm64/pydantic-core-2.23.4-py311h481aa64_0.conda
10041-
version: 2.23.4
10043+
https://conda.anaconda.org/conda-forge/osx-arm64/pydantic-core-2.27.1-py311h3ff9189_0.conda
10044+
version: 2.27.1
1004210045
- category: main
1004310046
dependencies:
1004410047
pydantic: '>=2.5.2'

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies:
3737
- numpy
3838
- packaging
3939
- psutil
40-
- pydantic <2.10
40+
- pydantic
4141
- pydantic-extra-types
4242
- pygithub
4343
- pymongo

tests/test_git_utils.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import github3.exceptions
1212
import pytest
1313
import requests
14-
from pydantic_core import Url
1514
from requests.structures import CaseInsensitiveDict
1615

1716
from conda_forge_tick.git_utils import (
@@ -1322,8 +1321,9 @@ def request_side_effect(method, _url, **_kwargs):
13221321
)
13231322
assert pr_data.head is not None
13241323
assert pr_data.head.ref == "HEAD_BRANCH"
1325-
assert pr_data.html_url == Url(
1326-
"https://github.com/conda-forge/pytest-feedstock/pull/1337"
1324+
assert (
1325+
str(pr_data.html_url)
1326+
== "https://github.com/conda-forge/pytest-feedstock/pull/1337"
13271327
)
13281328
assert pr_data.id == 1853804278
13291329
assert pr_data.labels == []
@@ -1724,8 +1724,9 @@ def test_dry_run_backend_create_pull_request(caplog):
17241724
assert pr_data.e_tag == "GITHUB_PR_ETAG"
17251725
assert pr_data.last_modified is not None
17261726
assert pr_data.id == 13371337
1727-
assert pr_data.html_url == Url(
1728-
"https://github.com/conda-forge/pytest-feedstock/pulls/1337"
1727+
assert (
1728+
str(pr_data.html_url)
1729+
== "https://github.com/conda-forge/pytest-feedstock/pulls/1337"
17291730
)
17301731
assert pr_data.created_at is not None
17311732
assert pr_data.number == 1337

0 commit comments

Comments
 (0)