Skip to content

Commit dfe6086

Browse files
committed
[GR-12785] add mx metadata for maven artifact deployment
PullRequest: graalpython/303
2 parents 8e1a81f + 3f288ce commit dfe6086

File tree

3 files changed

+54
-45
lines changed

3 files changed

+54
-45
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
overlay: "ffde557d62fff381069838b745c31b79c90e6e2a",
2+
overlay: "9a364f9b9ae34629919679b5edefb803ad27fbb7",
33

44
// ======================================================================================================
55
//

mx.graalpython/mx_graalpython.py

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ def _extract_graalpython_internal_options(args):
7979
def check_vm(vm_warning=True, must_be_jvmci=False):
8080
if not SUITE_COMPILER:
8181
if must_be_jvmci:
82-
print '** Error ** : graal compiler was not found!'
82+
print('** Error ** : graal compiler was not found!')
8383
sys.exit(1)
8484

8585
if vm_warning:
86-
print '** warning ** : graal compiler was not found!! Executing using standard VM..'
86+
print('** warning ** : graal compiler was not found!! Executing using standard VM..')
8787

8888

8989
def get_jdk():
@@ -191,7 +191,6 @@ class GraalPythonTags(object):
191191
svmunit = 'python-svm-unittest'
192192
downstream = 'python-downstream'
193193
graalvm = 'python-graalvm'
194-
apptests = 'python-apptests'
195194
license = 'python-license'
196195

197196

@@ -338,17 +337,6 @@ def graalpython_gate_runner(args, tasks):
338337
llvm_home]
339338
run_python_unittests(svm_image_name, args)
340339

341-
with Task('GraalPython apptests', tasks, tags=[GraalPythonTags.apptests]) as task:
342-
if task:
343-
apprepo = os.environ["GRAALPYTHON_APPTESTS_REPO_URL"]
344-
_apptest_suite = SUITE.import_suite(
345-
"graalpython-apptests",
346-
version="1fc0e86a54cbe090d36f262c062d8f4eee8f2e6d",
347-
urlinfos=[mx.SuiteImportURLInfo(mx_urlrewrites.rewriteurl(apprepo), "git", mx.vc_system("git"))]
348-
)
349-
mx.log(" ".join(["Running", "mx"] + ["-p", _apptest_suite.dir, "graalpython-apptests"]))
350-
mx.run_mx(["-p", _apptest_suite.dir, "graalpython-apptests"])
351-
352340
with Task('GraalPython license header update', tasks, tags=[GraalPythonTags.license]) as task:
353341
if task:
354342
python_checkcopyrights([])

mx.graalpython/suite.py

Lines changed: 51 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@
88
"name": "graalpython",
99
"versionConflictResolution": "latest",
1010

11+
"version": "1.0.0-rc11",
12+
"release": False,
13+
"groupId": "org.graalvm.graalpython",
14+
"url": "http://www.graalvm.org/",
15+
16+
"developer": {
17+
"name": "Truffle and Graal developers",
18+
"email": "[email protected]",
19+
"organization": "Graal",
20+
"organizationUrl": "http://www.graalvm.org/",
21+
},
22+
23+
"scm": {
24+
"url": "https://github.com/graalvm/graalpython",
25+
"read": "https://github.com/graalvm/graalpython.git",
26+
"write": "[email protected]:graalvm/graalpython.git",
27+
},
28+
1129
# --------------------------------------------------------------------------------------------------------------
1230
#
1331
# DEPENDENCIES
@@ -173,6 +191,7 @@
173191
"javaCompliance": "1.8",
174192
"annotationProcessors": ["truffle:TRUFFLE_DSL_PROCESSOR"],
175193
"workingSets": "Truffle,Python",
194+
"testProject": True,
176195
},
177196

178197
"com.oracle.graal.python.tck": {
@@ -185,15 +204,16 @@
185204
"checkstyle": "com.oracle.graal.python",
186205
"javaCompliance": "1.8",
187206
"workingSets": "Truffle,Python",
207+
"testProject": True,
188208
},
189209

190210

191211
"com.oracle.graal.python.cext": {
192212
"subDir": "graalpython",
193213
"native": True,
194214
"vpath": True,
195-
"results" : ["graalpython/lib-graalpython"],
196-
"output" : ".",
215+
"results": ["graalpython/lib-graalpython"],
216+
"output": ".",
197217
"buildDependencies": [
198218
"sulong:SULONG_LIBS",
199219
],
@@ -221,7 +241,7 @@
221241
"results": ["graalpython/lib-python/3/site-packages"],
222242
"output": ".",
223243
"license": ["MIT"],
224-
"defaultBuild" : False,
244+
"defaultBuild": False,
225245
},
226246
},
227247

@@ -230,9 +250,9 @@
230250
"name": "Python Software Foundation License",
231251
"url": "https://docs.python.org/3/license.html",
232252
},
233-
"UPL" : {
234-
"name" : "Universal Permissive License, Version 1.0",
235-
"url" : "http://opensource.org/licenses/UPL",
253+
"UPL": {
254+
"name": "Universal Permissive License, Version 1.0",
255+
"url": "http://opensource.org/licenses/UPL",
236256
},
237257
},
238258

@@ -250,12 +270,7 @@
250270
"sdk:GRAAL_SDK",
251271
"sdk:LAUNCHER_COMMON",
252272
],
253-
},
254-
255-
"GRAALPYTHON-ENV": {
256-
},
257-
258-
"GRAALPYTHON-ZIP": {
273+
"description": "GraalPython launcher",
259274
},
260275

261276
"GRAALPYTHON": {
@@ -270,11 +285,13 @@
270285
"truffle:ANTLR4",
271286
],
272287
"sourcesPath": "graalpython.src.zip",
288+
"description": "GraalPython engine",
273289
},
274290

275-
"GRAALPYTHON_PYTHON_LIB" : {
276-
"dependencies" : ["python-lib"],
277-
"description" : "Python 3 lib files",
291+
"GRAALPYTHON_PYTHON_LIB": {
292+
"dependencies": ["python-lib"],
293+
"description": "Python 3 lib files",
294+
"maven": False,
278295
},
279296

280297
"GRAALPYTHON_UNIT_TESTS": {
@@ -289,6 +306,7 @@
289306
"truffle:TRUFFLE_TCK",
290307
],
291308
"sourcesPath": "graalpython.tests.src.zip",
309+
"testDistribution": True,
292310
},
293311

294312
"GRAALPYTHON_TCK": {
@@ -301,31 +319,34 @@
301319
"sdk:POLYGLOT_TCK",
302320
],
303321
"sourcesPath": "graalpython.tests.src.zip",
322+
"testDistribution": True,
304323
},
305324

306-
"GRAALPYTHON_GRAALVM_SUPPORT" : {
307-
"native" : True,
308-
"platformDependent" : True,
309-
"description" : "Graal.Python support distribution for the GraalVM",
310-
"layout" : {
311-
"./" : [
325+
"GRAALPYTHON_GRAALVM_SUPPORT": {
326+
"native": True,
327+
"platformDependent": True,
328+
"description": "Graal.Python support distribution for the GraalVM",
329+
"layout": {
330+
"./": [
312331
"dependency:com.oracle.graal.python.cext/graalpython/lib-graalpython",
313332
"file:graalpython/com.oracle.graal.python.cext/include",
314333
"extracted-dependency:graalpython:GRAALPYTHON_PYTHON_LIB",
315334
"file:mx.graalpython/native-image.properties",
316335
],
317-
"LICENSE_GRAALPYTHON" : "file:LICENSE",
318-
"3rd_party_licenses_graalpython.txt" : "file:3rd_party_licenses.txt",
319-
}
336+
"LICENSE_GRAALPYTHON": "file:LICENSE",
337+
"3rd_party_licenses_graalpython.txt": "file:3rd_party_licenses.txt",
338+
},
339+
"maven": False,
320340
},
321341

322-
"GRAALPYTHON_GRAALVM_DOCS" : {
323-
"native" : True,
324-
"description" : "Graal.Python documentation files for the GraalVM",
325-
"layout" : {
326-
"README_GRAALPYTHON.md" : "file:README.md",
327-
"./" : "file:doc",
342+
"GRAALPYTHON_GRAALVM_DOCS": {
343+
"native": True,
344+
"description": "Graal.Python documentation files for the GraalVM",
345+
"layout": {
346+
"README_GRAALPYTHON.md": "file:README.md",
347+
"./": "file:doc",
328348
},
349+
"maven": False,
329350
},
330351
},
331352
}

0 commit comments

Comments
 (0)