chore: Use Timefold and rename packages

Author: Christopher-Chianelli

.github/workflows/publish-docs-to-pages.yml

@@ -73,7 +73,7 @@ jobs:
           pip install tox pytest
 
       - name: Build with Maven to install parent poms for python build
-        run: mvn -B --fail-at-end clean install -Dasciidoctor.skip -Dassembly.skipAssembly
+        run: mvn -B --fail-at-end clean install
 
       - name: Run tox on optapy test suite
         run: python -m tox

.github/workflows/pull_request.yml

@@ -72,7 +72,7 @@ jobs:
           pip install tox coverage pytest pytest-cov
 
       - name: Build with Maven to measure code coverage
-        run: mvn -B --fail-at-end clean install -Prun-code-coverage -Dasciidoctor.skip -Dassembly.skipAssembly
+        run: mvn -B --fail-at-end clean install -Prun-code-coverage
 
       - name: Get JaCoCo Agent
         run: mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -Dartifact=org.jacoco:org.jacoco.agent:0.8.8:jar:runtime -Ddest=target/jacocoagent.jar

.github/workflows/sonarcloud.yml

@@ -2,7 +2,7 @@ __pycache__
 /target
 /build
 /local
-venv
+/venv*
 graalvenv
 /dist
 /*.egg-info

.gitignore

@@ -1,15 +1,12 @@
 graft .mvn
 include mvnw mvnw.cmd pom.xml create-stubs.py
 
-include optapy-core/pom.xml
-graft optapy-core/src/main/java
-graft optapy-core/src/main/resources
-graft optapy-core/src/test/java
+include timefold-solver-python-core/pom.xml
+graft timefold-solver-python-core/src/main/java
+graft timefold-solver-python-core/src/main/resources
+graft timefold-solver-python-core/src/test/java
 
 include jpyinterpreter/pom.xml
 graft jpyinterpreter/src/main/java
 graft jpyinterpreter/src/main/resources
 graft jpyinterpreter/src/test/java
-
-include optapy-docs/pom.xml
-graft optapy-docs/src

MANIFEST.in

@@ -7,12 +7,12 @@
 jpype.startJVM(classpath=jars, convertStrings=True)
 
 import jpype.imports  # noqa
-import org.optaplanner.core.api  # noqa
-import org.optaplanner.core.config  # noqa
+import ai.timefold.solver.core.api  # noqa
+import ai.timefold.solver.core.config  # noqa
 import java.lang # noqa
 import java.time # noqa
 import java.util # noqa
 
-stubgenj.generateJavaStubs([java.lang, java.time, java.util, org.optaplanner.core.api, org.optaplanner.core.config],
+stubgenj.generateJavaStubs([java.lang, java.time, java.util, ai.timefold.solver.core.api, ai.timefold.solver.core.config],
                            useStubsSuffix=True)
 

create-stubs.py

@@ -35,10 +35,10 @@ def fix_package_name(name: str) -> str:
 
 
 def fix_file_name(file_name: str) -> str:
-    if 'optapy' in file_name:
-        optapy_index = file_name.index('optapy')
-        offset = optapy_index + len('optapy')
-        return str(pathlib.Path('optapy-core', 'src', 'main', 'python')) + file_name[offset:]
+    if 'timefold' in file_name:
+        timefold_index = file_name.index('timefold')
+        offset = timefold_index + len('timefold')
+        return str(pathlib.Path('timefold-solver-python-core', 'src', 'main', 'python')) + file_name[offset:]
     elif 'jpyinterpreter' in file_name:
         jpyinterpreter_index = file_name.index('jpyinterpreter')
         offset = jpyinterpreter_index + len('jpyinterpreter')
@@ -119,9 +119,9 @@ def is_test_package(package_name: str) -> bool:
 
 
 def is_ignored(package_name: str, ignore_jpyinterpreter: bool = False):
-    # optapy packages start with 'optapy.' (or just plain 'optapy'), not 'optapy-core'
+    # timefold packages start with 'timefold.solver.' (or just plain 'timefold.solver'), not 'timefold-solver-python-core'
     return is_test_package(package_name) or (ignore_jpyinterpreter and package_name.startswith('jpyinterpreter')) or \
-           package_name.startswith('optapy-core') or package_name.endswith('.jars')
+           package_name.startswith('timefold-solver-python-core') or package_name.endswith('.jars')
 
 
 def update_coverage_xml(coverage_xml: ET.ElementTree, *, ignore_jpyinterpreter: bool = False):
@@ -211,10 +211,10 @@ def merge_coverage_xml(*coverage_xmls: ET.ElementTree):
     return ET.ElementTree(root_element)
 
 if __name__ == '__main__':
-    optapy_coverage_xml = ET.parse('target/coverage.xml')
+    timefold_coverage_xml = ET.parse('target/coverage.xml')
     jpyinterpreter_coverage_xml = ET.parse('jpyinterpreter/target/coverage.xml')
 
-    update_coverage_xml(optapy_coverage_xml, ignore_jpyinterpreter=True)
+    update_coverage_xml(timefold_coverage_xml, ignore_jpyinterpreter=True)
     update_coverage_xml(jpyinterpreter_coverage_xml)
 
-    merge_coverage_xml(optapy_coverage_xml, jpyinterpreter_coverage_xml).write('target/coverage.xml')
+    merge_coverage_xml(timefold_coverage_xml, jpyinterpreter_coverage_xml).write('target/coverage.xml')

fix-coverage-paths.py

@@ -2,30 +2,29 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <groupId>org.optaplanner</groupId>
-    <artifactId>optapy-parent</artifactId>
-    <version>9.37.0.Final</version>
-    <relativePath>../pom.xml</relativePath>
+    <groupId>ai.timefold.solver</groupId>
+    <artifactId>timefold-solver-python-parent</artifactId>
+    <version>1.7.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jpyinterpreter</artifactId>
 
   <properties>
-    <java.module.name>jpyinterpreter</java.module.name>
-    <version.org.ow2.asm>9.5</version.org.ow2.asm>
+    <java.module.name>ai.timefold.jpyinterpreter</java.module.name>
+    <version.ow2.asm>9.6</version.ow2.asm>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm-util</artifactId>
-        <version>${version.org.ow2.asm}</version>
+        <version>${version.ow2.asm}</version>
       </dependency>
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm-tree</artifactId>
-        <version>${version.org.ow2.asm}</version>
+        <version>${version.ow2.asm}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -119,18 +118,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <repositories>
-    <repository>
-      <id>jboss-public-repository-group</id>
-      <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-      <releases>
-        <!-- Get releases only from Maven Central which is faster. -->
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
 </project>

jpyinterpreter/pom.xml

@@ -1,8 +1,6 @@
 [build-system]
 requires = [
-    # Pin setuptools to 58.4.0 since 58.5.{0,1} accidentally introduced breaking changes that break custom build classes
-    # https://github.com/pypa/setuptools/issues/2849
-    "setuptools==58.4.0",
+    "setuptools>=69.1.1",
     "stubgenj>=0.2.5",
     "JPype1>=1.4.1",
     "wheel"

jpyinterpreter/pyproject.toml

@@ -38,56 +38,27 @@ def run(self):
             classpath_jars.extend(glob.glob(os.path.join(project_root, 'target', '*.jar')))
             # Add the main artifact's dependencies
             classpath_jars.extend(glob.glob(os.path.join(project_root, 'target', 'dependency', '*.jar')))
-            # Get the basename of each file (to be stored in classpath.txt, which is used
-            # when setting the classpath)
-            filenames = list(map(os.path.basename, classpath_jars))
-            classpath_list_text = "\n".join(filenames)
-
             self.mkpath(os.path.join(self.build_lib, 'jpyinterpreter', 'jars'))
 
-            # Copy classpath jars to optapy.jars
+            # Copy classpath jars to jpyinterpreter.jars
             for file in classpath_jars:
                 copyfile(file, os.path.join(self.build_lib, 'jpyinterpreter', 'jars', os.path.basename(file)))
 
-            # Add classpath.txt to optapy
-            fp = open(os.path.join(self.build_lib, 'jpyinterpreter', 'classpath.txt'), 'w')
-            fp.write(classpath_list_text)
-            fp.close()
-
-            # Make optapy.jars a Python module
+            # Make jpyinterpreter.jars a Python module
             fp = open(os.path.join(self.build_lib, 'jpyinterpreter', 'jars', '__init__.py'), 'w')
             fp.close()
         build_py.run(self)
 
-
-def find_stub_files(stub_root: str):
-    """
-    This function is taken from the awesome sqlalchey-stubs:
-    https://github.com/dropbox/sqlalchemy-stubs/blob/master/setup.py#L32
-    It's licensed under Apache 2.0:
-    https://github.com/dropbox/sqlalchemy-stubs/blob/master/LICENSE
-    """
-    result = []
-    for root, dirs, files in os.walk(stub_root):
-        for file in files:
-            if file.endswith(".pyi"):
-                if os.path.sep in root:
-                    sub_root = root.split(os.path.sep, 1)[-1]
-                    file = os.path.join(sub_root, file)
-                result.append(file)
-    return result
-
-
 this_directory = Path(__file__).parent
 
 setup(
     name='jpyinterpreter',
-    version='9.37.0b0',
+    version='0.0.0a0',
     license='Apache License Version 2.0',
     license_file='LICENSE',
     description='A Python bytecode to Java bytecode translator',
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 1 - Planning',
         'Programming Language :: Python :: 3',
         'Topic :: Software Development :: Libraries :: Java Libraries',
         'License :: OSI Approved :: Apache Software License',
@@ -112,7 +83,6 @@ def find_stub_files(stub_root: str):
     ],
     cmdclass={'build_py': FetchDependencies},
     package_data={
-        'optapy': ['classpath.txt'],
-        'optapy.jars': ['*.jar'],
+        'jpyinterpreter.jars': ['*.jar'],
     },
 )

jpyinterpreter/setup.py

@@ -1,4 +1,4 @@
-package org.optaplanner.jpyinterpreter;
+package ai.timefold.jpyinterpreter;
 
 import java.util.ArrayList;
 import java.util.Collection;

jpyinterpreter/src/main/java/org/optaplanner/jpyinterpreter/BytecodeSwitchImplementor.java renamed to jpyinterpreter/src/main/java/ai/timefold/jpyinterpreter/BytecodeSwitchImplementor.java

@@ -1,4 +1,4 @@
-package org.optaplanner.jpyinterpreter;
+package ai.timefold.jpyinterpreter;
 
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -11,19 +11,19 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import org.optaplanner.jpyinterpreter.builtins.GlobalBuiltins;
-import org.optaplanner.jpyinterpreter.types.CPythonBackedPythonLikeObject;
-import org.optaplanner.jpyinterpreter.types.PythonModule;
-import org.optaplanner.jpyinterpreter.types.PythonString;
-import org.optaplanner.jpyinterpreter.types.collections.PythonLikeTuple;
-import org.optaplanner.jpyinterpreter.types.errors.PythonTraceback;
-import org.optaplanner.jpyinterpreter.types.numeric.PythonInteger;
-import org.optaplanner.jpyinterpreter.types.wrappers.OpaquePythonReference;
-import org.optaplanner.jpyinterpreter.types.wrappers.PythonObjectWrapper;
-import org.optaplanner.jpyinterpreter.util.function.PentaFunction;
-import org.optaplanner.jpyinterpreter.util.function.QuadFunction;
-import org.optaplanner.jpyinterpreter.util.function.TriConsumer;
-import org.optaplanner.jpyinterpreter.util.function.TriFunction;
+import ai.timefold.jpyinterpreter.builtins.GlobalBuiltins;
+import ai.timefold.jpyinterpreter.types.CPythonBackedPythonLikeObject;
+import ai.timefold.jpyinterpreter.types.PythonModule;
+import ai.timefold.jpyinterpreter.types.PythonString;
+import ai.timefold.jpyinterpreter.types.collections.PythonLikeTuple;
+import ai.timefold.jpyinterpreter.types.errors.PythonTraceback;
+import ai.timefold.jpyinterpreter.types.numeric.PythonInteger;
+import ai.timefold.jpyinterpreter.types.wrappers.OpaquePythonReference;
+import ai.timefold.jpyinterpreter.types.wrappers.PythonObjectWrapper;
+import ai.timefold.jpyinterpreter.util.function.PentaFunction;
+import ai.timefold.jpyinterpreter.util.function.QuadFunction;
+import ai.timefold.jpyinterpreter.util.function.TriConsumer;
+import ai.timefold.jpyinterpreter.util.function.TriFunction;
 
 public class CPythonBackedPythonInterpreter implements PythonInterpreter {
     InputStream standardInput;

jpyinterpreter/src/main/java/org/optaplanner/jpyinterpreter/CPythonBackedPythonInterpreter.java renamed to jpyinterpreter/src/main/java/ai/timefold/jpyinterpreter/CPythonBackedPythonInterpreter.java

@@ -1,4 +1,4 @@
-package org.optaplanner.jpyinterpreter;
+package ai.timefold.jpyinterpreter;
 
 public enum CompareOp {
     LESS_THAN(0, "__lt__"),

jpyinterpreter/src/main/java/org/optaplanner/jpyinterpreter/CompareOp.java renamed to jpyinterpreter/src/main/java/ai/timefold/jpyinterpreter/CompareOp.java

@@ -1,4 +1,4 @@
-package org.optaplanner.jpyinterpreter;
+package ai.timefold.jpyinterpreter;
 
 import java.util.Objects;
 import java.util.Set;

jpyinterpreter/src/main/java/org/optaplanner/jpyinterpreter/ExceptionBlock.java renamed to jpyinterpreter/src/main/java/ai/timefold/jpyinterpreter/ExceptionBlock.java

@@ -1,8 +1,8 @@
-package org.optaplanner.jpyinterpreter;
+package ai.timefold.jpyinterpreter;
 
 import java.util.Objects;
 
-import org.optaplanner.jpyinterpreter.types.PythonLikeType;
+import ai.timefold.jpyinterpreter.types.PythonLikeType;
 
 public class FieldDescriptor {
 

jpyinterpreter/src/main/java/org/optaplanner/jpyinterpreter/FieldDescriptor.java renamed to jpyinterpreter/src/main/java/ai/timefold/jpyinterpreter/FieldDescriptor.java

@@ -1,4 +1,4 @@
-package org.optaplanner.jpyinterpreter;
+package ai.timefold.jpyinterpreter;
 
 import java.util.List;
 import java.util.Map;

jpyinterpreter/src/main/java/org/optaplanner/jpyinterpreter/FunctionMetadata.java renamed to jpyinterpreter/src/main/java/ai/timefold/jpyinterpreter/FunctionMetadata.java

@@ -1,14 +1,15 @@
-package org.optaplanner.jpyinterpreter;
+package ai.timefold.jpyinterpreter;
 
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
 
+import ai.timefold.jpyinterpreter.types.PythonCell;
+
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
-import org.optaplanner.jpyinterpreter.types.PythonCell;
 
 public class GeneratorLocalVariableHelper extends LocalVariableHelper {
 

jpyinterpreter/src/main/java/org/optaplanner/jpyinterpreter/GeneratorLocalVariableHelper.java renamed to jpyinterpreter/src/main/java/ai/timefold/jpyinterpreter/GeneratorLocalVariableHelper.java

@@ -1,4 +1,4 @@
-package org.optaplanner.jpyinterpreter;
+package ai.timefold.jpyinterpreter;
 
 import java.nio.file.Path;