diff --git a/README.md b/README.md index 202e8a7..e1b23db 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,15 @@ All Python dependencies are in the *environment.yml* file. The code is meant to ## Usage ### Usage withing the build process -To be added later. +The Gradle build will download Miniforge, create a local Python environment, and install the dependencies from the +environment.yml file. It will then run Pyinstaller on the Python sources to create an executable, zip it up, +and make it available to the rest of the Gradle ecosystem. To perform this action locally, run +`gradlew assemble`. The zip file will be located in the `build` directory. ### Post build implementation After making any desired changes to the code, a new executable must be compiled and placed in the WAT build. 1. To create a conda environment, in a command prompt type: `conda env create -f environment.yml` 2. Activate the environment by running the line: `conda activate plotting-env` -3. Create an executable by running the line: `pyinstaller -y WAT_Report_Generator.py` +3. Create an executable by running the line: `pyinstaller -y src/main/python/WAT_Report_Generator.py` 4. In the WAT build *HEC-WAT/AutomatedReport* directory, delete any old files. 5. From the *dist/WAT_Report_Generator* directory, copy the *_internal* directory and *WAT_Report_Generator.exe* file and paste them into the WAT build */HEC-WAT/AutomatedReport* directory. \ No newline at end of file diff --git a/build.gradle b/build.gradle index e6cfdb1..621194b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,71 @@ plugins { id "base" - id "maven-publish" + id "wtmp.deps-conventions" + id("com.pswidersk.python-plugin") version "3.1.10" + id "wtmp.versioning-conventions" + id "wtmp.publishing-conventions" } -task zipPython(type: Zip) { - onlyIf { project.hasProperty("publishUSBRPython") && publishUSBRPython } +import com.pswidersk.gradle.python.VenvTask; - from 'dist/WAT_Report_Generator' - include '**/**' +allprojects { + group = 'usbr.wat.plugins' + version = versionConventions.getConventionVersion() +} + +pythonPlugin { + pythonVersion = "3.11.0" + condaVersion = "25.3.1-0" + condaInstaller = "Miniforge3" + installDir = file(layout.buildDirectory.dir("python")) +} + +def pythonSourceSet = objects.sourceDirectorySet("pythonSource", "pythonSource") +pythonSourceSet.srcDir('src/main/python') + +tasks.register("installPackages", VenvTask) { + dependsOn("envSetup") + + inputs.file("environment.yml") + outputs.upToDateWhen { !tasks.named("envSetup").get().didWork } + + group = "build" + + venvExec = "conda" + def envFile = layout.projectDirectory.file("environment.yml").asFile.getAbsolutePath() + args = ["env", "update", "--name", pythonPlugin.pythonEnvName$python_gradle_plugin.get(), "--file", envFile] + + outputs.files([]) +} + +tasks.register("buildInstaller", VenvTask) { + dependsOn("installPackages") + + def pyinstallerDir = layout.buildDirectory.dir("pyinstaller") + doFirst { + pyinstallerDir.get().getAsFile().mkdirs() + } + + group = "build" + + outputs.upToDateWhen { !tasks.named("installPackages").get().didWork } + + inputs.files(pythonSourceSet.getSourceDirectories().files) + + venvExec = "pyinstaller" + args = ["-y", "${pythonSourceSet.sourceDirectories.asPath}/WAT_Report_Generator.py"] + workingDir = pyinstallerDir + + outputs.file(pyinstallerDir.get().dir("dist").dir("WAT_Report_Generator").file("WAT_Report_Generator.exe")) +} + +tasks.register("zipPython", Zip) { + dependsOn("buildInstaller") + + group = "build" + + from tasks.named("buildInstaller") + include '**/**.exe' archiveBaseName = 'usbr-actionpanel-python' includeEmptyDirs = false destinationDirectory = file("$projectDir/build") @@ -16,23 +74,18 @@ task zipPython(type: Zip) { fileCopyDetails.setRelativePath(fileCopyDetails.getRelativePath().prepend("HEC-WAT/AutomatedReport")) } } -if (project.hasProperty("publishUSBRPython") && publishUSBRPython) { - build.dependsOn(zipPython) - assemble.dependsOn(zipPython) - artifacts { - 'default' zipPython - archives zipPython - } +assemble.dependsOn(tasks.named("zipPython")) + +artifacts { + 'default' tasks.named("zipPython") } publishing { publications { - if (project.hasProperty("publishUSBRPython") && publishUSBRPython) { maven(MavenPublication) { artifactId = "usbr-actionpanel-python" - artifact source: zipPython, extension: 'zip' + artifact source: tasks.named("zipPython"), extension: 'zip' } } - } } \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 0000000..8bc2d48 --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,12 @@ +plugins { + id 'groovy-gradle-plugin' +} + +repositories { + gradlePluginPortal() +} + +dependencies { + implementation("com.palantir.git-version:com.palantir.git-version.gradle.plugin:4.2.0") + implementation("org.ajoberstar.grgit:org.ajoberstar.grgit.gradle.plugin:4.1.1") +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/wtmp.deps-conventions.gradle b/buildSrc/src/main/groovy/wtmp.deps-conventions.gradle new file mode 100644 index 0000000..2e5fbb7 --- /dev/null +++ b/buildSrc/src/main/groovy/wtmp.deps-conventions.gradle @@ -0,0 +1,11 @@ +plugins { + id 'project-report' +} + +repositories { + mavenCentral() +} + +tasks.register("generateDependenciesReport", DependencyReportTask) { depReport -> + depReport.setConfiguration("runtimeClasspath") +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/wtmp.publishing-conventions.gradle b/buildSrc/src/main/groovy/wtmp.publishing-conventions.gradle new file mode 100644 index 0000000..3513e59 --- /dev/null +++ b/buildSrc/src/main/groovy/wtmp.publishing-conventions.gradle @@ -0,0 +1,4 @@ +plugins { + id "maven-publish" +} + diff --git a/buildSrc/src/main/groovy/wtmp.versioning-conventions.gradle b/buildSrc/src/main/groovy/wtmp.versioning-conventions.gradle new file mode 100644 index 0000000..1c76f07 --- /dev/null +++ b/buildSrc/src/main/groovy/wtmp.versioning-conventions.gradle @@ -0,0 +1,62 @@ +plugins { + id "com.palantir.git-version" + id "org.ajoberstar.grgit" +} + +tasks.register("showGit") { + doFirst { + def gitInfo = versionDetails() + println( "Used: " + getVersion() ) // The select version (the project.version field) + println( "Tag: " + gitInfo.lastTag) // actual tag or commit hash(short) if no tag + println( "Hash: " + gitInfo.gitHash) // short commit hash + println( "Branch: " + gitInfo.branchName) // branch name (null if tag checkout) + println( "TagBuild:" + gitInfo.isCleanTag) // true if repoi is in dettached head mode(e.g. git checkout ) + } +} + +def versionLabel(gitInfo) { + def branch = gitInfo.branchName // all branches are snapshots, only tags get released + if (branch == null && !"$System.env.CI_COMMIT_BRANCH".isEmpty()) { + branch = "$System.env.CI_COMMIT_BRANCH" // Gitlab CI checks out a commit, not a branch. Grab the branch name from the env vars it sets + } + def tag = gitInfo.lastTag + // tag is returned as is. Branch may need cleanup + return (branch == null || branch == "null" || branch.isEmpty()) ? tag : branch.replace("/","-") + "-SNAPSHOT" +} + +/** + * When running on the Build System (eg TeamCity) will get BUILD_NUMBER + * Otherwise, gets the current commit (and status) + */ +String getBuildID() { + if(project.version.contains("-SNAPSHOT")) { + def buildNum = System.env.BUILD_NUMBER + if (!buildNum?.trim()) { + buildNum = "-${grgit.head().abbreviatedId}" + def clean = grgit.status().isClean() + if (!clean) { + buildNum += "+" + } + } else { + buildNum = "." + buildNum + } + return buildNum + } else { + // If dirty, return "+" + return grgit.status().isClean() ? "" : "+" + } +} + +String getShortVersionName() { + String shortVersion = project.version + if(shortVersion.contains("-SNAPSHOT")) { + shortVersion = shortVersion.substring(0, shortVersion.indexOf("-SNAPSHOT")) + } + return shortVersion +} + +String getConventionVersion() { + return versionLabel(versionDetails()) +} + +project.getExtensions().add("versionConventions", this) diff --git a/dwr-build-ext.gradle b/dwr-build-ext.gradle new file mode 100644 index 0000000..b0f2ae2 --- /dev/null +++ b/dwr-build-ext.gradle @@ -0,0 +1,5 @@ +includeBuild("$gradle.ext.externalLibDir") { + dependencySubstitution { + substitute(module("usbr.wat.plugins:usbr-actionpanel-python")).using(project(":")) + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f8e1ee3 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..23449a2 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..adff685 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..2a6b2a4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "usbr-actionpanel-python" \ No newline at end of file diff --git a/WAT_Constants.py b/src/main/python/WAT_Constants.py similarity index 100% rename from WAT_Constants.py rename to src/main/python/WAT_Constants.py diff --git a/WAT_DataOrganizer.py b/src/main/python/WAT_DataOrganizer.py similarity index 100% rename from WAT_DataOrganizer.py rename to src/main/python/WAT_DataOrganizer.py diff --git a/WAT_Defaults.py b/src/main/python/WAT_Defaults.py similarity index 100% rename from WAT_Defaults.py rename to src/main/python/WAT_Defaults.py diff --git a/WAT_Functions.py b/src/main/python/WAT_Functions.py similarity index 100% rename from WAT_Functions.py rename to src/main/python/WAT_Functions.py diff --git a/WAT_Gates.py b/src/main/python/WAT_Gates.py similarity index 100% rename from WAT_Gates.py rename to src/main/python/WAT_Gates.py diff --git a/WAT_Logger.py b/src/main/python/WAT_Logger.py similarity index 100% rename from WAT_Logger.py rename to src/main/python/WAT_Logger.py diff --git a/WAT_Plots.py b/src/main/python/WAT_Plots.py similarity index 100% rename from WAT_Plots.py rename to src/main/python/WAT_Plots.py diff --git a/WAT_Profiles.py b/src/main/python/WAT_Profiles.py similarity index 100% rename from WAT_Profiles.py rename to src/main/python/WAT_Profiles.py diff --git a/WAT_Reader.py b/src/main/python/WAT_Reader.py similarity index 100% rename from WAT_Reader.py rename to src/main/python/WAT_Reader.py diff --git a/WAT_Report_Generator.py b/src/main/python/WAT_Report_Generator.py similarity index 100% rename from WAT_Report_Generator.py rename to src/main/python/WAT_Report_Generator.py diff --git a/WAT_ResSim_Results.py b/src/main/python/WAT_ResSim_Results.py similarity index 100% rename from WAT_ResSim_Results.py rename to src/main/python/WAT_ResSim_Results.py diff --git a/WAT_Tables.py b/src/main/python/WAT_Tables.py similarity index 100% rename from WAT_Tables.py rename to src/main/python/WAT_Tables.py diff --git a/WAT_Time.py b/src/main/python/WAT_Time.py similarity index 100% rename from WAT_Time.py rename to src/main/python/WAT_Time.py diff --git a/WAT_W2_Results.py b/src/main/python/WAT_W2_Results.py similarity index 100% rename from WAT_W2_Results.py rename to src/main/python/WAT_W2_Results.py diff --git a/WAT_XML_Utils.py b/src/main/python/WAT_XML_Utils.py similarity index 100% rename from WAT_XML_Utils.py rename to src/main/python/WAT_XML_Utils.py