Skip to content

Commit 9544d24

Browse files
committed
Mark hypothesis patch upstreamed
1 parent 2f6e2fb commit 9544d24

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

graalpython/lib-graalpython/patches/metadata.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,27 +178,28 @@ patch = 'hmmlearn.patch'
178178
license = 'BSD-3-Clause'
179179

180180
[[hypothesis.rules]]
181-
# can be removed once [GR-65570] is done
181+
# Upstreamed
182182
patch = 'hypothesis-6.135.0.patch'
183-
version = '>= 6.120.0'
183+
version = '>= 6.120.0, < 6.136.7'
184+
install-priority = 0
184185
license = 'MPL-2.0'
185186

186187
[[hypothesis.rules]]
187-
# can be removed once [GR-65570] is done
188188
patch = 'hypothesis-6.118.5.patch'
189189
version = '>= 6.118.5, < 6.120.0'
190+
install-priority = 0
190191
license = 'MPL-2.0'
191192

192193
[[hypothesis.rules]]
193-
# can be removed once [GR-65570] is done
194194
patch = 'hypothesis-6.105.2.patch'
195195
version = '>= 6.105.2, < 6.118.5'
196+
install-priority = 0
196197
license = 'MPL-2.0'
197198

198199
[[hypothesis.rules]]
199-
# can be removed once [GR-65570] is done
200200
patch = 'hypothesis-6.104.1.patch'
201201
version = '>= 6.99.0, < 6.105.2'
202+
install-priority = 0
202203
license = 'MPL-2.0'
203204

204205
[[hypothesis.rules]]

mx.graalpython/downstream_tests.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,8 @@ def downstream_test_pydantic_core(graalpy, testdir):
155155
run(['uv', 'sync', '--python', graalpy, '--group', 'testing'], cwd=src)
156156
# XXX UNSAFE_PYO3_SKIP_VERSION_CHECK should not be necessary once pydantic-core updates to a newer pyo3 version
157157
run(['uv', 'pip', 'install', '-e', '.'], cwd=src, env={**os.environ, 'UNSAFE_PYO3_SKIP_VERSION_CHECK': '1'})
158-
# XXX remove after hypothesis PR merged and released
159-
run(['uv', 'pip', 'install',
160-
'git+https://github.com/msimacek/hypothesis@msimacek/graalpy#egg=hypothesis&subdirectory=hypothesis-python'],
161-
cwd=src)
158+
# XXX remove after pydantic-core updates to hypothesis >= 6.136.7
159+
run(['uv', 'pip', 'install', 'hypothesis==6.136.7'], cwd=src)
162160
run(['uv', 'run', 'pytest', '-v', '--tb=short'], cwd=src)
163161

164162

0 commit comments

Comments
 (0)