Skip to content

Commit 1b68d19

Browse files
xhochyxhochy
authored
Merge pull request #432 from blue-yonder/numpy2
Support numpy>=2
2 parents 6c0f054 + 30ab8a5 commit 1b68d19

File tree

7 files changed

+41
-29
lines changed

7 files changed

+41
-29
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ pybind11
1212

1313
PyTest/PyTest
1414
contrib/sdist
15+
# pixi environments
16+
.pixi
17+
*.egg-info

‎CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ Version history / changelog
33

44
From version 2.0.0, turbodbc adapts semantic versioning.
55

6+
Version 4.14.0
7+
--------------
8+
9+
* Support ``pyarrow=2`
10+
611
Version 4.13.0
712
--------------
813

‎Earthfile

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ test-python3.10-arrow7.x.x:
136136
ARG PYTHON_VERSION="3.10.2"
137137
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
138138
--build-arg ARROW_VERSION_RULE=">=7,<8" \
139-
--build-arg NUMPY_VERSION_RULE=">=1.21.2,<2" \
139+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
140140
+test/result /result
141141

142142
SAVE ARTIFACT /result AS LOCAL result
@@ -145,7 +145,7 @@ test-python3.10-arrow8.x.x:
145145
ARG PYTHON_VERSION="3.10.2"
146146
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
147147
--build-arg ARROW_VERSION_RULE=">=8,<9" \
148-
--build-arg NUMPY_VERSION_RULE=">=1.21.2,<2" \
148+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
149149
+test/result /result
150150

151151
SAVE ARTIFACT /result AS LOCAL result
@@ -154,7 +154,7 @@ test-python3.10-arrow9.x.x:
154154
ARG PYTHON_VERSION="3.10.2"
155155
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
156156
--build-arg ARROW_VERSION_RULE=">=9,<10" \
157-
--build-arg NUMPY_VERSION_RULE=">=1.21.2,<2" \
157+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
158158
+test/result /result
159159

160160
SAVE ARTIFACT /result AS LOCAL result
@@ -163,7 +163,7 @@ test-python3.10-arrow10.x.x:
163163
ARG PYTHON_VERSION="3.10.2"
164164
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
165165
--build-arg ARROW_VERSION_RULE=">=10,<11" \
166-
--build-arg NUMPY_VERSION_RULE=">=1.21.2,<2" \
166+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
167167
+test/result /result
168168

169169
SAVE ARTIFACT /result AS LOCAL result
@@ -172,7 +172,7 @@ test-python3.10-arrow11.x.x:
172172
ARG PYTHON_VERSION="3.10.2"
173173
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
174174
--build-arg ARROW_VERSION_RULE=">=11,<12" \
175-
--build-arg NUMPY_VERSION_RULE=">=1.21.2,<2" \
175+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
176176
+test/result /result
177177

178178
SAVE ARTIFACT /result AS LOCAL result
@@ -181,7 +181,7 @@ test-python3.10-arrow12.x.x:
181181
ARG PYTHON_VERSION="3.10.2"
182182
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
183183
--build-arg ARROW_VERSION_RULE=">=12,<13" \
184-
--build-arg NUMPY_VERSION_RULE=">=1.21.2,<2" \
184+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
185185
+test/result /result
186186

187187
SAVE ARTIFACT /result AS LOCAL result
@@ -190,7 +190,7 @@ test-python3.10-arrow13.x.x:
190190
ARG PYTHON_VERSION="3.10.2"
191191
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
192192
--build-arg ARROW_VERSION_RULE=">=13,<14" \
193-
--build-arg NUMPY_VERSION_RULE=">=1.21.2,<2" \
193+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
194194
+test/result /result
195195

196196
SAVE ARTIFACT /result AS LOCAL result
@@ -199,7 +199,7 @@ test-python3.10-arrow14.x.x:
199199
ARG PYTHON_VERSION="3.10.2"
200200
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
201201
--build-arg ARROW_VERSION_RULE=">=14,<15" \
202-
--build-arg NUMPY_VERSION_RULE=">=1.21.2,<2" \
202+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
203203
+test/result /result
204204

205205
SAVE ARTIFACT /result AS LOCAL result
@@ -208,7 +208,7 @@ test-python3.10-arrow15.x.x:
208208
ARG PYTHON_VERSION="3.10.2"
209209
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
210210
--build-arg ARROW_VERSION_RULE=">=15,<16" \
211-
--build-arg NUMPY_VERSION_RULE=">=1.21.2,<2" \
211+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
212212
+test/result /result
213213

214214
SAVE ARTIFACT /result AS LOCAL result
@@ -217,7 +217,7 @@ test-python3.10-arrow16.x.x:
217217
ARG PYTHON_VERSION="3.10.2"
218218
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
219219
--build-arg ARROW_VERSION_RULE=">=16,<17" \
220-
--build-arg NUMPY_VERSION_RULE=">=1.21.2,<2" \
220+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
221221
+test/result /result
222222

223223
SAVE ARTIFACT /result AS LOCAL result
@@ -226,15 +226,15 @@ test-python3.10-arrow17.x.x:
226226
ARG PYTHON_VERSION="3.10.2"
227227
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
228228
--build-arg ARROW_VERSION_RULE=">=17,<18" \
229-
--build-arg NUMPY_VERSION_RULE=">=1.21.2,<2" \
229+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
230230
+test/result /result
231231

232232
SAVE ARTIFACT /result AS LOCAL result
233233

234234
test-python3.10-arrow-nightly:
235235
ARG PYTHON_VERSION="3.10.2"
236236
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
237-
--build-arg NUMPY_VERSION_RULE=">=1.21.4,<2" \
237+
--build-arg NUMPY_VERSION_RULE=">=1.21.4" \
238238
--build-arg CONDA_EXTRA="-c arrow-nightlies" \
239239
+test/result /result
240240

@@ -244,7 +244,7 @@ test-python3.11-arrow7.x.x:
244244
ARG PYTHON_VERSION="3.11.3"
245245
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
246246
--build-arg ARROW_VERSION_RULE=">=7,<8" \
247-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
247+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
248248
+test/result /result
249249

250250
SAVE ARTIFACT /result AS LOCAL result
@@ -253,7 +253,7 @@ test-python3.11-arrow8.x.x:
253253
ARG PYTHON_VERSION="3.11.3"
254254
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
255255
--build-arg ARROW_VERSION_RULE=">=8,<9" \
256-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
256+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
257257
+test/result /result
258258

259259
SAVE ARTIFACT /result AS LOCAL result
@@ -262,7 +262,7 @@ test-python3.11-arrow9.x.x:
262262
ARG PYTHON_VERSION="3.11.3"
263263
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
264264
--build-arg ARROW_VERSION_RULE=">=9,<10" \
265-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
265+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
266266
+test/result /result
267267

268268
SAVE ARTIFACT /result AS LOCAL result
@@ -271,7 +271,7 @@ test-python3.11-arrow10.x.x:
271271
ARG PYTHON_VERSION="3.11.3"
272272
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
273273
--build-arg ARROW_VERSION_RULE=">=10,<11" \
274-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
274+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
275275
+test/result /result
276276

277277
SAVE ARTIFACT /result AS LOCAL result
@@ -280,7 +280,7 @@ test-python3.11-arrow11.x.x:
280280
ARG PYTHON_VERSION="3.11.3"
281281
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
282282
--build-arg ARROW_VERSION_RULE=">=11,<12" \
283-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
283+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
284284
+test/result /result
285285

286286
SAVE ARTIFACT /result AS LOCAL result
@@ -289,7 +289,7 @@ test-python3.11-arrow12.x.x:
289289
ARG PYTHON_VERSION="3.11.3"
290290
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
291291
--build-arg ARROW_VERSION_RULE=">=12,<13" \
292-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
292+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
293293
+test/result /result
294294

295295
SAVE ARTIFACT /result AS LOCAL result
@@ -298,7 +298,7 @@ test-python3.11-arrow13.x.x:
298298
ARG PYTHON_VERSION="3.11.3"
299299
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
300300
--build-arg ARROW_VERSION_RULE=">=13,<14" \
301-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
301+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
302302
+test/result /result
303303

304304
SAVE ARTIFACT /result AS LOCAL result
@@ -307,7 +307,7 @@ test-python3.11-arrow14.x.x:
307307
ARG PYTHON_VERSION="3.11.3"
308308
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
309309
--build-arg ARROW_VERSION_RULE=">=14,<15" \
310-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
310+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
311311
+test/result /result
312312

313313
SAVE ARTIFACT /result AS LOCAL result
@@ -316,7 +316,7 @@ test-python3.11-arrow15.x.x:
316316
ARG PYTHON_VERSION="3.11.3"
317317
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
318318
--build-arg ARROW_VERSION_RULE=">=15,<16" \
319-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
319+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
320320
+test/result /result
321321

322322
SAVE ARTIFACT /result AS LOCAL result
@@ -325,7 +325,7 @@ test-python3.11-arrow16.x.x:
325325
ARG PYTHON_VERSION="3.11.3"
326326
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
327327
--build-arg ARROW_VERSION_RULE=">=16,<17" \
328-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
328+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
329329
+test/result /result
330330

331331
SAVE ARTIFACT /result AS LOCAL result
@@ -334,15 +334,15 @@ test-python3.11-arrow17.x.x:
334334
ARG PYTHON_VERSION="3.11.3"
335335
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
336336
--build-arg ARROW_VERSION_RULE=">=17,<18" \
337-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
337+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
338338
+test/result /result
339339

340340
SAVE ARTIFACT /result AS LOCAL result
341341

342342
test-python3.11-arrow-nightly:
343343
ARG PYTHON_VERSION="3.11.3"
344344
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
345-
--build-arg NUMPY_VERSION_RULE=">=1.23.3,<2" \
345+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
346346
--build-arg CONDA_EXTRA="-c arrow-nightlies" \
347347
+test/result /result
348348

‎cmake_scripts/Findnumpy.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@ find_path(
55
numpy/npy_common.h
66
HINTS
77
$ENV{VIRTUAL_ENV}/lib/*/site-packages/numpy/core/include
8+
$ENV{VIRTUAL_ENV}/lib/*/site-packages/numpy/_core/include
89
$ENV{CONDA_PREFIX}/lib/*/site-packages/numpy/core/include
10+
$ENV{CONDA_PREFIX}/lib/*/site-packages/numpy/_core/include
911
$ENV{CONDA_PREFIX}/Library/lib/*/site-packages/numpy/core/include
12+
$ENV{CONDA_PREFIX}/Library/lib/*/site-packages/numpy/_core/include
1013
ENV PYTHON_INCLUDE_DIR
1114
/usr/local/lib/python2.7/dist-packages/numpy/core/include
1215
$ENV{PYTHON}/lib/site-packages/numpy/core/include
1316
$ENV{CONDA_PREFIX}/lib/site-packages/numpy/core/include
17+
$ENV{CONDA_PREFIX}/lib/site-packages/numpy/_core/include
1418
DOC "Path to the numpy headers"
1519
)
1620

‎environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ dependencies:
1414
- pkg-config
1515
- ninja
1616
- pytest
17-
- numpy<2
17+
- numpy>=1.20
1818
- pybind11
1919
- simdutf

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ['setuptools', 'wheel', 'pyarrow>=7,<16', 'pybind11', 'oldest-supported-numpy']
2+
requires = ['setuptools', 'wheel', 'pyarrow>=7,<16', 'pybind11', 'numpy>=2']
33

44
[tool.black]
55
exclude = '''

‎setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ def get_extension_modules():
259259

260260
setup(
261261
name="turbodbc",
262-
version="4.13.0",
262+
version="4.14.0",
263263
description="turbodbc is a Python DB API 2.0 compatible ODBC driver",
264264
long_description=long_description,
265265
long_description_content_type="text/markdown",
@@ -271,10 +271,10 @@ def get_extension_modules():
271271
setup_requires=[
272272
"pybind11>=2.10.4",
273273
"pyarrow>=7,<18",
274-
"numpy>=1.20,<2",
274+
"numpy>=2",
275275
],
276276
install_requires=[],
277-
extras_require={"arrow": ["pyarrow>=7.0,<18"], "numpy": "numpy>=1.20.0,<2"},
277+
extras_require={"arrow": ["pyarrow>=7.0,<18"], "numpy": "numpy>=1.20.0"},
278278
python_requires=">=3.10",
279279
classifiers=[
280280
"Development Status :: 5 - Production/Stable",

0 commit comments

Comments
 (0)