fix dash vs underscore

Author: adamkorynta

regi-headless/build.gradle

@@ -76,7 +76,7 @@ tasks.register('bundlePython', Sync) {
 
     dependsOn jar
 
-    into layout.buildDirectory.dir("install/regi-python")
+    into layout.buildDirectory.dir("install/regi_python")
 
     inputs.dir("src/main/python")
     inputs.file(jar.archiveFile)
@@ -92,7 +92,7 @@ tasks.register('bundlePython', Sync) {
         exclude 'pyproject.toml'
     }
 
-    into('regi-python/lib') {
+    into('regi_python/lib') {
         from configurations.runtimeClasspath
         from jar.archiveFile
         exclude "**/*.nbm"
@@ -106,20 +106,20 @@ tasks.register('buildPythonWheel', VenvTask) {
     dependsOn bundlePython
     dependsOn installPythonBuildTools
 
-    workingDir = layout.buildDirectory.dir("install/regi-python").get().asFile
+    workingDir = layout.buildDirectory.dir("install/regi_python").get().asFile
     venvExec = "python"
     args = ["-m", "build", "--wheel"]
 
-    inputs.files(fileTree(layout.buildDirectory.dir("install/regi-python")) {
+    inputs.files(fileTree(layout.buildDirectory.dir("install/regi_python")) {
         exclude "dist/**"
         exclude "build/**"
         exclude "*.egg-info/**"
     })
     inputs.property("version", project.version.toString())
-    outputs.dir(layout.buildDirectory.dir("install/regi-python/dist"))
+    outputs.dir(layout.buildDirectory.dir("install/regi_python/dist"))
 
     doFirst {
-        delete layout.buildDirectory.dir("install/regi-python/dist")
+        delete layout.buildDirectory.dir("install/regi_python/dist")
     }
 
     doLast {
@@ -135,16 +135,16 @@ tasks.register('installPythonWheelForSmokeTest', VenvTask) {
 
     venvExec = 'pip'
 
-    inputs.files(fileTree(dir: "${buildDir}/install/regi-python/dist", include: '*.whl'))
+    inputs.files(fileTree(dir: "${buildDir}/install/regi_python/dist", include: '*.whl'))
     outputs.file(layout.buildDirectory.file("test-python-wheel/install.marker"))
 
     doFirst {
-        def wheelFile = fileTree(dir: "${buildDir}/install/regi-python/dist", include: '*.whl').singleFile
+        def wheelFile = fileTree(dir: "${buildDir}/install/regi_python/dist", include: '*.whl').singleFile
         args = ['install', '--force-reinstall', wheelFile.absolutePath]
     }
 
     doLast {
-        def wheelFile = fileTree(dir: "${buildDir}/install/regi-python/dist", include: '*.whl').singleFile
+        def wheelFile = fileTree(dir: "${buildDir}/install/regi_python/dist", include: '*.whl').singleFile
         def markerFile = layout.buildDirectory.file("test-python-wheel/install.marker").get().asFile
         markerFile.parentFile.mkdirs()
         markerFile.text = "${wheelFile.name}\n${wheelFile.length()} bytes\n"

regi-headless/src/main/python/pyproject.toml

@@ -5,13 +5,13 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "regi-python"
 version = "@VERSION@"
-description = "USACE Regi-Headless Python Bridge"
+description = "USACE REGI Python Bridge"
 dependencies = [
     "JPype1>=1.4.1",
 ]
 
 [tool.setuptools]
-packages = ["regi-python"]
+packages = ["regi_python"]
 
 [tool.setuptools.package-data]
-"regi-python" = ["lib/*.jar"]
+"regi_python" = ["lib/*.jar"]

regi-headless/src/main/python/regi_python/__init__.py

@@ -4,7 +4,7 @@
 __all__ = ["regi_session", "run_headless"]
 
 try:
-    __version__ = version("regi_python") # Use the 'name' from pyproject.toml
+    __version__ = version("regi_python")
 except PackageNotFoundError:
     # package is not installed
     __version__ = "unknown"

regi-headless/src/main/python/regi_python/regi_python.py

@@ -9,7 +9,7 @@
 import jpype.imports
 from contextlib import contextmanager
 from pathlib import Path
-from regi_python_logging import configure_logging
+from .regi_python_logging import configure_logging
 
 logger = configure_logging()