standardized classpath to com.databricks.labs; docker and testing config updated.

Author: mjohns-databricks

pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.dblabs</groupId>
+    <groupId>com.databricks.labs</groupId>
     <artifactId>geobrix</artifactId>
     <version>0.1.0</version>
 
@@ -312,6 +312,15 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <!-- local testing `mvn test -PskipScoverage -DskipTests=false -Dsuite=...` -->
+            <id>skipScoverage</id>
+            <properties>
+                <scala.version>2.13.12</scala.version>
+                <scala.compat.version>2.13</scala.compat.version>
+                <spark.version>4.0.0</spark.version>
+            </properties>
+        </profile>
     </profiles>
     <distributionManagement>
         <repository>

python/vectorx/test/test_legacy_registration.py

@@ -7,7 +7,7 @@
 
 HERE = Path(__file__).resolve()
 LIBDIR = (HERE.parents[2] / "lib").resolve()   # simpler, robust
-candidates = sorted(LIBDIR.glob("spatial-*-jar-with-dependencies.jar"))
+candidates = sorted(LIBDIR.glob("geobrix-*-jar-with-dependencies.jar"))
 JAR = candidates[-1].resolve()
 JAR_URI = JAR.as_uri()
 

scripts/docker/Dockerfile

@@ -100,11 +100,12 @@ RUN cd src/gdal-${GDAL_VERSION} \
     && ldconfig
 
 
-# Copy binaries to the location expected to be by Mosaic
+# Copy binaries to the location expected to be by the project
 RUN ln -s $ROOTDIR/lib/libgdal.so /usr/lib/libgdal.so
 RUN ln -s $ROOTDIR/lib/libgdal.so.30 /usr/lib/libgdal.so.30
 RUN ln -s $ROOTDIR/lib/libgdal.so.30.0.3 /usr/lib/libgdal.so.30.0.3
-RUN mkdir -p /usr/lib/jni && ln -s $ROOTDIR/lib/libgdalalljni.so /usr/lib/jni/libgdalalljni.so.30
+RUN ln -s $ROOTDIR/lib/jni/libgdalalljni.so /usr/lib/libgdalalljni.so
+RUN mkdir -p /usr/lib/jni && ln -s $ROOTDIR/lib/jni/libgdalalljni.so /usr/lib/jni/libgdalalljni.so.30
 RUN mkdir -p /usr/lib/ogdi && ln -s $ROOTDIR/lib/libgdal.so /usr/lib/ogdi/libgdal.so
 
 # Add Maven
@@ -114,13 +115,13 @@ ARG BASE_URL=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
 ARG SHA=bcfe4fe305c962ace56ac7b5fc7a08b87d5abd8b7e89027ab251069faebee516b0ded8961445d6d91ec1985dfe30f8153268843c89aa392733d1a3ec956c9978
 
 RUN mkdir -p $ROOTDIR/share/maven $ROOTDIR/share/maven/ref \
-  && echo "Downlaoding maven" \
+  && echo "Downloading maven" \
   && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
   \
   && echo "Checking download hash" \
   && echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - \
   \
-  && echo "Unziping maven" \
+  && echo "Unzipping maven" \
   && tar -xzf /tmp/apache-maven.tar.gz -C $ROOTDIR/share/maven --strip-components=1 \
   \
   && echo "Cleaning and setting links" \
@@ -136,6 +137,7 @@ RUN pip3 install --upgrade pip --ignore-installed --break-system-packages
 RUN pip3 install build wheel keplergl ipython pyspark==$SPARK_VERSION --break-system-packages
 RUN pip3 install black build isort py4j requests --break-system-packages
 RUN pip3 install gdal==$GDAL_VERSION --break-system-packages
+RUN pip3 install pytest --break-system-packages
 
 # Clean up
 RUN apt-get purge -y --auto-remove $buildDeps \

scripts/docker/build

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --platform linux/amd64 -t "geobrix-dev:ubuntu24-gdal311-spark" .

scripts/docker/build.sh

@@ -1 +1,2 @@
-docker exec -it mosaic-dev bash
+#!/bin/bash
+docker exec -it geobrix-dev /bin/bash -c "unset JAVA_TOOL_OPTIONS && cd /root/geobrix && /bin/bash"

scripts/docker/connect_to_docker.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --platform linux/amd64 --no-cache -t "geobrix-dev:ubuntu24-gdal311-spark" ../Dockerfile

scripts/docker/extras/build_fresh.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# run from inside docker
+# [1] unset variable for this script
+echo "\n::: [1] ... unsetting JAVA_TOOL_OPTIONS (probably need to do in container as well) :::"
+unset JAVA_TOOL_OPTIONS
+
+# [2] copy custom settings.xml
+# - defaults to new skipScoverage profile
+# - compliments the pom config (profile sCoverage also added there)
+# - sets .m2 folder to be in project
+echo "\n::: [2] ... setting up new .m2 (in project) + new skipScoverage profile (as default) :::"
+mv /usr/local/share/maven/conf/settings.xml /usr/local/share/maven/conf/settings.xml.BAK
+cp /root/geobrix/scripts/docker/m2/settings.xml /usr/local/share/maven/conf
+echo "        ... mvn active profile(s)\n"
+cd /root/geobrix && mvn help:active-profiles
+
+# [3] build JVM code
+# this is building for container JDK
+# see settings.xml for overrides
+echo "\n::: [3] ... maven package - JVM code version? :::\n"
+echo "        $(javac -version)"
+cd /root/geobrix && mvn package -DskipTests
+
+# [4] build python (as needed)
+# - refer to dockerfile for what is already built
+echo "\n::: [4] ... build python :::\n"
+echo 'export JUPYTER_PLATFORM_DIRS=1' >> ~/.bashrc
+cp "$(find /root/geobrix/python/lib -name "geobrix-*-jar-with-dependencies.jar")" /usr/local/lib/python3.12/dist-packages/pyspark/jars
+cd /root/geobrix/python/gridx && pip install . --break-system-packages
+cd /root/geobrix/python/rasterx && pip install . --break-system-packages
+cd /root/geobrix/python/vectorx && pip install . --break-system-packages

scripts/docker/extras/docker_init.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# [1] Build the image with 'build_mac.sh':
+# [2] Assumes you are executing this from project root, e.g. 'sh scripts/docker/mac/geobrix_docker_mac.sh'
+# [3] if you want to run tests within the container shell
+# - [a] `unset JAVA_TOOL_OPTIONS` is needed to execute JVM tests
+# - [b] then can test e.g. `mvn -X test -DskipTests=false -Dsuites=com.databricks.labs.gbx.ds.WhitelistDSTest`
+#       and `python3 -m unittest gridx/test/test_bng_registration.py` from ./python dir
+# - [c] you may need to run `mvn clean` occasionally
+# ... don't need to specify -PskipCoverage (see settings.xml)
+# [4] `docker stop geobrix-dev` whenever done to terminate the container
+# NOTES:
+#  * Ignore 'ERRO[0000] error waiting for container: context canceled'
+#  * Removed --privileged
+docker run -q --platform linux/amd64 --name geobrix-dev -p 5005:5005 -p 8888:8888 -p 4040:4040 \
+-v $PWD:/root/geobrix -e JAVA_TOOL_OPTIONS="-agentlib:jdwp=transport=dt_socket,address=5005,server=y,suspend=n" \
+-itd --rm geobrix-dev:ubuntu24-gdal311-spark /bin/bash
+
+docker exec -it geobrix-dev /bin/bash -c "sh /root/geobrix/scripts/docker/extras/docker_init.sh"
+docker exec -it geobrix-dev /bin/bash -c "unset JAVA_TOOL_OPTIONS && cd /root/geobrix && /bin/bash"

scripts/docker/extras/geobrix_docker.sh

@@ -5,7 +5,7 @@
     |
     | Default: ${user.home}/.m2/repository
     -->
-    <localRepository>/root/mosaic/scripts/docker/m2</localRepository>
+    <localRepository>/root/geobrix/scripts/docker/m2</localRepository>
     <activeProfiles>
         <activeProfile>skipScoverage</activeProfile>
     </activeProfiles>