Skip to content

Commit 82ef956

Browse files
steve-ssteve-s
committed
[GR-66930] Remove projects moved to github.com/oracle/graalpy-extensions.
PullRequest: graalpython/3880
2 parents 54601c8 + 2744587 commit 82ef956

File tree

91 files changed

+310
-15455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+310
-15455
lines changed

‎ci.jsonnet

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -196,46 +196,6 @@
196196
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
197197
"windows:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
198198
}),
199-
"python-unittest-gradle-plugin": gpgate + platform_spec(no_jobs) + platform_spec({
200-
"linux:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
201-
"linux:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
202-
"darwin:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
203-
"darwin:amd64:jdk-latest" : daily + t("02:00:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
204-
"windows:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE) + batches(2),
205-
"linux:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
206-
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
207-
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
208-
"windows:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
209-
}),
210-
"python-unittest-gradle-plugin-long-run": gpgate + platform_spec(no_jobs) + platform_spec({
211-
"linux:amd64:jdk-latest" : post_merge + t("02:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
212-
"linux:aarch64:jdk-latest" : post_merge + t("02:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
213-
"darwin:aarch64:jdk-latest" : post_merge + t("02:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
214-
"windows:amd64:jdk-latest" : post_merge + t("03:59:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
215-
}),
216-
"python-unittest-maven-plugin": gpgate_maven + platform_spec(no_jobs) + platform_spec({
217-
"linux:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
218-
"linux:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
219-
"darwin:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
220-
"darwin:amd64:jdk-latest" : daily + t("02:00:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
221-
"windows:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE) + batches(2),
222-
"linux:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
223-
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
224-
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
225-
"windows:amd64:jdk-latest" : post_merge + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
226-
}),
227-
"python-junit-vfsutils": gpgate + platform_spec(no_jobs) + platform_spec({
228-
"linux:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
229-
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
230-
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
231-
"windows:amd64:jdk-latest" : post_merge + t("03:59:00") + require(GPY_JVM_STANDALONE),
232-
}),
233-
"python-unittest-maven-plugin-long-run": gpgate_maven + platform_spec(no_jobs) + platform_spec({
234-
"linux:amd64:jdk-latest" : post_merge + t("02:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
235-
"linux:aarch64:jdk-latest" : post_merge + t("02:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
236-
"darwin:aarch64:jdk-latest" : post_merge + t("02:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
237-
"windows:amd64:jdk-latest" : post_merge + t("02:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
238-
}),
239199
"python-junit": gpgate + platform_spec(no_jobs) + platform_spec({
240200
"linux:amd64:jdk21" : daily + t("01:00:00"),
241201
"linux:aarch64:jdk21" : daily + t("01:30:00"),

‎graalpython/com.oracle.graal.python.test.integration/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,6 @@ Additionally, one can change the polyglot artifacts version with
177177
<scope>runtime</scope>
178178
<type>pom</type>
179179
</dependency>
180-
<dependency>
181-
<groupId>org.graalvm.python</groupId>
182-
<artifactId>python-embedding</artifactId>
183-
<version>${com.oracle.graal.python.test.polyglot.version}</version>
184-
</dependency>
185180
<dependency>
186181
<groupId>junit</groupId>
187182
<artifactId>junit</artifactId>

‎graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/KeywordArgumentsMock.java

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.graal.python.test.integration;
42+
43+
import java.util.Iterator;
44+
import java.util.Map;
45+
import java.util.Map.Entry;
46+
import java.util.NoSuchElementException;
47+
48+
import org.graalvm.polyglot.Value;
49+
import org.graalvm.polyglot.proxy.ProxyArray;
50+
import org.graalvm.polyglot.proxy.ProxyHashMap;
51+
import org.graalvm.polyglot.proxy.ProxyIterator;
52+
import org.graalvm.polyglot.proxy.ProxyObject;
53+
54+
// This is just a mock for tests, the real API is exposed in the org.graalvm.python.embedding library
55+
public final class KeywordArgumentsMock implements ProxyHashMap, ProxyObject {
56+
57+
public static final String MEMBER_KEY = "org.graalvm.python.embedding.KeywordArguments.is_keyword_arguments";
58+
private final Map<String, Object> kwArgs;
59+
60+
public KeywordArgumentsMock(Map<String, Object> kwArgs) {
61+
this.kwArgs = kwArgs;
62+
}
63+
64+
public static KeywordArgumentsMock from(Map<String, Object> kwArgs) {
65+
return new KeywordArgumentsMock(kwArgs);
66+
}
67+
68+
@Override
69+
public Object getMember(String key) throws UnsupportedOperationException {
70+
if (MEMBER_KEY.equals(key)) {
71+
return true;
72+
}
73+
throw new UnsupportedOperationException();
74+
}
75+
76+
@Override
77+
public Object getMemberKeys() {
78+
throw new UnsupportedOperationException();
79+
}
80+
81+
@Override
82+
public boolean hasMember(String key) {
83+
return MEMBER_KEY.equals(key);
84+
}
85+
86+
@Override
87+
public void putMember(String key, Value value) {
88+
throw new UnsupportedOperationException();
89+
}
90+
91+
@Override
92+
public long getHashSize() {
93+
return kwArgs.size();
94+
}
95+
96+
@Override
97+
public boolean hasHashEntry(Value key) {
98+
String unboxedKey = unboxKey(key);
99+
return kwArgs.containsKey(unboxedKey);
100+
}
101+
102+
private static String unboxKey(Value key) {
103+
return key.asString();
104+
}
105+
106+
@Override
107+
public Object getHashValue(Value key) {
108+
Object unboxedKey = unboxKey(key);
109+
return kwArgs.get(unboxedKey);
110+
}
111+
112+
@Override
113+
public void putHashEntry(Value key, Value value) {
114+
String unboxedKey = unboxKey(key);
115+
kwArgs.put(unboxedKey, value.isHostObject() ? value.asHostObject() : value);
116+
}
117+
118+
@Override
119+
public Object getHashEntriesIterator() {
120+
Iterator<Entry<String, Object>> entryIterator = kwArgs.entrySet().iterator();
121+
return new ProxyIterator() {
122+
@Override
123+
public boolean hasNext() {
124+
return entryIterator.hasNext();
125+
}
126+
127+
@Override
128+
public Object getNext() throws NoSuchElementException, UnsupportedOperationException {
129+
return new ProxyEntryImpl(entryIterator.next());
130+
}
131+
};
132+
}
133+
134+
private class ProxyEntryImpl implements ProxyArray {
135+
136+
private Entry<String, Object> mapEntry;
137+
138+
ProxyEntryImpl(Entry<String, Object> mapEntry) {
139+
this.mapEntry = mapEntry;
140+
}
141+
142+
@Override
143+
public Object get(long index) {
144+
if (index == 0L) {
145+
return mapEntry.getKey();
146+
} else if (index == 1L) {
147+
return mapEntry.getValue();
148+
} else {
149+
throw new ArrayIndexOutOfBoundsException();
150+
}
151+
}
152+
153+
@Override
154+
public void set(long index, Value value) {
155+
if (index == 0L) {
156+
throw new UnsupportedOperationException();
157+
} else if (index == 1L) {
158+
kwArgs.put(mapEntry.getKey(), value.isHostObject() ? value.asHostObject() : value);
159+
} else {
160+
throw new ArrayIndexOutOfBoundsException();
161+
}
162+
}
163+
164+
@Override
165+
public long getSize() {
166+
return 2;
167+
}
168+
}
169+
}

‎graalpython/graalpy-maven-plugin/src/main/java/org/graalvm/python/maven/plugin/MavenDelegateLog.java renamed to ‎graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/PositionalArgumentsMock.java

Lines changed: 30 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -38,76 +38,61 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package org.graalvm.python.maven.plugin;
41+
package com.oracle.graal.python.test.integration;
4242

43-
import org.apache.maven.plugin.logging.Log;
44-
import org.graalvm.python.embedding.tools.exec.BuildToolLog;
43+
import org.graalvm.polyglot.Value;
44+
import org.graalvm.polyglot.proxy.ProxyArray;
45+
import org.graalvm.polyglot.proxy.ProxyObject;
4546

46-
final class MavenDelegateLog implements BuildToolLog {
47-
private final Log delegate;
47+
// This is just a mock for tests, the real API is exposed in the org.graalvm.python.embedding library
48+
public final class PositionalArgumentsMock implements ProxyArray, ProxyObject {
4849

49-
MavenDelegateLog(Log delegate) {
50-
this.delegate = delegate;
51-
}
52-
53-
@Override
54-
public void info(String txt) {
55-
delegate.info(txt);
56-
}
57-
58-
@Override
59-
public void warning(String txt) {
60-
delegate.warn(txt);
61-
}
62-
63-
@Override
64-
public void warning(String txt, Throwable t) {
65-
delegate.warn(txt, t);
66-
}
50+
public static final String MEMBER_KEY = "org.graalvm.python.embedding.PositionalArguments.is_positional_arguments";
51+
private final Object[] values;
6752

68-
@Override
69-
public void error(String txt) {
70-
delegate.error(txt);
53+
private PositionalArgumentsMock(Object[] values) {
54+
this.values = values;
7155
}
7256

7357
@Override
74-
public void debug(String txt) {
75-
delegate.debug(txt);
58+
public Object get(long index) {
59+
return this.values[(int) index];
7660
}
7761

7862
@Override
79-
public void subProcessOut(String out) {
80-
// don't annotate output with [INFO]
81-
System.out.println(out);
63+
public void set(long index, Value value) {
64+
throw new UnsupportedOperationException();
8265
}
8366

8467
@Override
85-
public void subProcessErr(String err) {
86-
delegate.error(err);
68+
public long getSize() {
69+
return values.length;
8770
}
8871

8972
@Override
90-
public boolean isDebugEnabled() {
91-
return delegate.isDebugEnabled();
73+
public Object getMember(String key) {
74+
if (MEMBER_KEY.equals(key)) {
75+
return true;
76+
}
77+
throw new UnsupportedOperationException();
9278
}
9379

9480
@Override
95-
public boolean isWarningEnabled() {
96-
return delegate.isWarnEnabled();
81+
public Object getMemberKeys() {
82+
throw new UnsupportedOperationException();
9783
}
9884

9985
@Override
100-
public boolean isErrorEnabled() {
101-
return delegate.isErrorEnabled();
86+
public boolean hasMember(String key) {
87+
return MEMBER_KEY.equals(key);
10288
}
10389

10490
@Override
105-
public boolean isSubprocessOutEnabled() {
106-
return delegate.isInfoEnabled();
91+
public void putMember(String key, Value value) {
92+
throw new UnsupportedOperationException();
10793
}
10894

109-
@Override
110-
public boolean isInfoEnabled() {
111-
return delegate.isInfoEnabled();
95+
public static PositionalArgumentsMock of(Object... values) {
96+
return new PositionalArgumentsMock(values);
11297
}
11398
}

0 commit comments

Comments
 (0)