Skip to content

Commit 2f296f4

Browse files
committed
install site-packages through mx
1 parent 74ee6bf commit 2f296f4

File tree

4 files changed

+35
-7
lines changed

4 files changed

+35
-7
lines changed

graalpython/lib-python/3/site-packages/README.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

graalpython/lib-python/3/site.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,9 @@ def getsitepackages(prefixes=None):
304304
seen.add(prefix)
305305

306306
if os.sep == '/':
307-
sitepackages.append(os.path.join(prefix, "lib",
308-
"python%d.%d" % sys.version_info[:2],
307+
# TRUFFLE: our path for system site-packages is slightly different
308+
sitepackages.append(os.path.join(prefix, "lib-python",
309+
"%d" % sys.version_info[0],
309310
"site-packages"))
310311
else:
311312
sitepackages.append(prefix)
@@ -528,9 +529,8 @@ def main():
528529
if ENABLE_USER_SITE is None:
529530
ENABLE_USER_SITE = check_enableusersite()
530531

531-
# TRUFFLE TODO requires _sysconfigdata__* modules
532-
#known_paths = addusersitepackages(known_paths)
533-
#known_paths = addsitepackages(known_paths)
532+
known_paths = addusersitepackages(known_paths)
533+
known_paths = addsitepackages(known_paths)
534534
setquit()
535535
setcopyright()
536536
sethelper()

graalpython/site-packages/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
.PHONY: clean install
2+
3+
SHELL = /bin/bash
4+
SITE_PATH = ../lib-python/3/site-packages
5+
SETUPTOOLS_VERSION = 40.4.3
6+
7+
default: install
8+
9+
install: ${SITE_PATH} ${SITE_PATH}/setuptools.pth
10+
11+
${SITE_PATH}:
12+
mkdir -p ${SITE_PATH}
13+
14+
${SITE_PATH}/setuptools.pth:
15+
PYTHONPATH=${SITE_PATH} python3 -m easy_install --always-copy --exclude-scripts --always-unzip --install-dir ${SITE_PATH} setuptools==${SETUPTOOLS_VERSION}
16+
find ${SITE_PATH} -name "*.pyc" -exec rm "{}" ";"
17+
rm -rf ${SITE_PATH}/__pycache__
18+
19+
clean:
20+
rm -rf ${SITE_PATH}

mx.graalpython/suite.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,16 @@
226226
],
227227
"license": ["PSF-License"],
228228
},
229+
230+
"site-packages": {
231+
"subDir": "graalpython",
232+
"native": True,
233+
"vpath": False,
234+
"results": ["graalpython/lib-python/3/site-packages"],
235+
"output": ".",
236+
"license": ["MIT"],
237+
"defaultBuild" : False,
238+
},
229239
},
230240

231241
"licenses": {

0 commit comments

Comments
 (0)