Skip to content

Commit 43537b1

Browse files
committed
GR-44488: ginstall - add cppy as dependency to kiwisolver
- update to a later version of setuptools_scm (fixes 0.0.0 source package versions)
1 parent 449180c commit 43537b1

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

graalpython/lib-graalpython/modules/ginstall.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,14 @@ def threadpoolctl(**kwargs):
220220
def joblib(**kwargs):
221221
install_with_pip("joblib==1.1.0", **kwargs)
222222

223+
@pip_package()
224+
def cppy(**kwargs):
225+
setuptools_scm(**kwargs)
226+
install_from_pypi("cppy==1.2.1", **kwargs)
227+
223228
@pip_package()
224229
def kiwisolver(**kwargs):
230+
cppy(**kwargs)
225231
install_with_pip("kiwisolver==1.4.4", **kwargs)
226232

227233
@pip_package()
@@ -330,7 +336,7 @@ def hypothesis(**kwargs):
330336
@pip_package()
331337
def setuptools_scm(**kwargs):
332338
setuptools(**kwargs)
333-
install_from_pypi("setuptools_scm==1.15.0", **kwargs)
339+
install_with_pip("setuptools_scm==7.1.0", **kwargs)
334340

335341
@pip_package()
336342
def numpy(**kwargs):
@@ -510,10 +516,6 @@ def cycler(**kwargs):
510516
six(**kwargs)
511517
install_from_pypi("cycler==0.11.0", **kwargs)
512518

513-
@pip_package()
514-
def cppy(**kwargs):
515-
install_from_pypi("cppy==1.1.0", **kwargs)
516-
517519
@pip_package()
518520
def tox(**kwargs):
519521
install_from_pypi("tox==3.24.5", **kwargs)

graalpython/lib-graalpython/patches/cppy/sdist/cppy-1.2.1.patch

Whitespace-only changes.

0 commit comments

Comments
 (0)