chore: clean up testing scripts to provide the package name

Author: dschwartz-ftadvisory

python-test/cdm-tests/run_cdm_tests.sh

@@ -65,7 +65,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 CDM_WHEEL_DIR="$MY_PATH/../../target/python-cdm"
-CDM_WHEEL_COUNT=$(find "$CDM_WHEEL_DIR" -name "python_cdm-*-py3-none-any.whl" 2>/dev/null | wc -l)
+CDM_WHEEL_COUNT=$(find "$CDM_WHEEL_DIR" -name "*-py3-none-any.whl" 2>/dev/null | wc -l)
 
 if [[ $CDM_WHEEL_COUNT -eq 0 && $UPDATE_CDM -eq 0 && $REBUILD_CDM -eq 0 ]]; then
     echo "CDM Python wheel not found in $CDM_WHEEL_DIR. Triggering build (fetch + build)..."
@@ -85,12 +85,11 @@ echo "***** setting up common environment"
 source $MY_PATH/setup_cdm_test_env.sh || error
 
 
-# run tests
-
-# Validating test execution
+# run tests — venv is active at this point; use bare 'python' so the venv's
+# interpreter is used, not the system python path cached in $PYEXE
 echo "***** run tests"
-$PYEXE -m pip install pytest
-$PYEXE -m pytest -p no:cacheprovider $MY_PATH
+python -m pip install pytest
+python -m pytest -p no:cacheprovider $MY_PATH
 TEST_EXIT_CODE=$?
 rm -rf .pytest
 

python-test/cdm-tests/setup/build_cdm.sh

@@ -82,46 +82,24 @@ fi
 ensure_jar_exists "$PROJECT_ROOT_PATH" "$JAR_PATH"
 
 echo "***** build CDM"
-java -cp "$JAR_PATH" com.regnosys.rosetta.generator.python.PythonCodeGeneratorCLI -s $CDM_SOURCE_PATH -t $PYTHON_TARGET_PATH -n $CDM_PROJECT_NAME -v $CDM_VERSION -x $CDM_PREFIX|| error "Failed to generate CDM Python code"
-# java -cp "$JAR_PATH" com.regnosys.rosetta.generator.python.PythonCodeGeneratorCLI -s $CDM_SOURCE_PATH -t $PYTHON_TARGET_PATH || error "Failed to generate CDM Python code"
+java -cp "$JAR_PATH" com.regnosys.rosetta.generator.python.PythonCodeGeneratorCLI -s $CDM_SOURCE_PATH -t $PYTHON_TARGET_PATH -p $CDM_PROJECT_NAME -v $CDM_VERSION -x $CDM_PREFIX || error "Failed to generate CDM Python code"
 JAVA_EXIT_CODE=$?
 if [[ $JAVA_EXIT_CODE -eq 1 ]]; then
     echo "Java program returned exit code 1. Stopping script."
     exit 1
 fi
 
-echo "***** setting up common environment"
-source $PYTHON_SETUP_PATH/setup_python_env.sh
-
-echo "***** activating virtual environment"
-VENV_NAME=".pyenv"
-if [ -z "${WINDIR}" ]; then PY_SCRIPTS='bin'; else PY_SCRIPTS='Scripts'; fi
-source "$PROJECT_ROOT_PATH/$VENV_NAME/${PY_SCRIPTS}/activate" || error
-
-echo "***** removing prior instance of cdm"
-python -m pip uninstall -y python-cdm 2>/dev/null
-
 echo "***** build CDM Python package"
 cd $PYTHON_TARGET_PATH
-rm -f *-*.*.*-py3-none-any.whl
-python -m pip wheel --no-deps --only-binary :all: . || error
+rm -f *-py3-none-any.whl
+$PYEXE -m pip wheel --no-deps --only-binary :all: . || error
 
-echo "***** install CDM Python package"
-CDM_WHL=$(ls *-*.*.*-py3-none-any.whl 2>/dev/null | head -1)
+CDM_WHL=$(ls *-py3-none-any.whl 2>/dev/null | head -1)
 if [ -z "$CDM_WHL" ]; then
-    echo "ERROR: cdm wheel was not produced. Stopping."
+    echo "ERROR: CDM wheel was not produced. Stopping."
     error
 fi
-python -m pip install --no-deps "$CDM_WHL" --force-reinstall || error
-
-echo "***** cleanup"
-
-deactivate
-if [[ "${REUSE_ENV}" != "1" && "${REUSE_ENV}" != "true" ]]; then
-    source $PYTHON_SETUP_PATH/cleanup_python_env.sh
-else
-    echo "Skipping cleanup (REUSE_ENV set)"
-fi
+echo "***** CDM wheel produced: $CDM_WHL"
 
 echo ""
 echo ""

python-test/cdm-tests/setup_cdm_test_env.sh

@@ -37,7 +37,7 @@ cd ${MY_PATH} || error
 
 echo "***** setting up common environment"
 PYTHONSETUPPATH="../env-setup"
-source $MY_PATH/$PYTHONSETUPPATH/setup_python_env.sh
+source $MY_PATH/$PYTHONSETUPPATH/setup_python_env.sh -r
 
 echo "***** activating virtual environment"
 VENV_NAME=".pyenv"
@@ -50,11 +50,20 @@ source "$MY_PATH/$PYTHONSETUPPATH/$VENV_PATH/${PY_SCRIPTS}/activate" || error
 PYTHONCDMDIR="../../target/python-cdm"
 
 # Construct pip install command
-PIP_ARGS=( "$MY_PATH/$PYTHONCDMDIR"/python_cdm-*-py3-none-any.whl "--force-reinstall" "--pre" )
+PIP_ARGS=( "$MY_PATH/$PYTHONCDMDIR"/*-*-py3-none-any.whl "--force-reinstall" "--pre" )
 
 if [[ -n "$RUNE_RUNTIME_DIR" && -d "$RUNE_RUNTIME_DIR" ]]; then
     PIP_ARGS+=( "--find-links" "$RUNE_RUNTIME_DIR" )
 fi
 
 echo "**** Install CDM package ****"
-python -m pip install "${PIP_ARGS[@]}"
+python -m pip install "${PIP_ARGS[@]}"
+
+# The CDM wheel install (--force-reinstall) may have replaced the local editable
+# runtime with a PyPI release. Re-source setup_python_env.sh with REUSE_ENV=1 so
+# it reinstalls the runtime without recreating the venv, then re-activate.
+_reuse_env_saved="${REUSE_ENV:-}"
+export REUSE_ENV=1
+source "$MY_PATH/$PYTHONSETUPPATH/setup_python_env.sh"
+export REUSE_ENV="$_reuse_env_saved"
+source "$MY_PATH/$PYTHONSETUPPATH/$VENV_PATH/${PY_SCRIPTS}/activate" || error

python-test/cdm-tests/test_import_trade_state.py

@@ -5,6 +5,6 @@
 def test_import_tradestate():
     '''confirm that tradestate can be imported'''
     try:
-        from cdm.event.common.TradeState import TradeState
+        from finos.cdm.event.common.TradeState import TradeState
     except ImportError:
         pytest.fail("Importing cdm.event.common.TradeState failed")

python-test/unit-tests/run_python_unit_tests.sh

@@ -116,6 +116,7 @@ JAR_PATH="$PROJECT_ROOT_PATH/target/python-0.0.0.main-SNAPSHOT.jar"
 
 # Always generate from the root of the test suite to ensure the "overall model" is complete
 INPUT_ROSETTA_PATH="$MY_PATH"
+PTYHON_PROJECT_NAME="python-test"
 
 if [[ $RUN_ALL -eq 1 ]]; then
   TEST_TARGET="$MY_PATH"
@@ -143,7 +144,8 @@ echo "***** generating Python for unit tests"
 mkdir -p "$PYTHON_TESTS_TARGET_PATH"
 java -cp "$JAR_PATH" com.regnosys.rosetta.generator.python.PythonCodeGeneratorCLI \
   -s "$INPUT_ROSETTA_PATH" \
-  -t "$PYTHON_TESTS_TARGET_PATH"
+  -t "$PYTHON_TESTS_TARGET_PATH" \
+  -p "$PTYHON_PROJECT_NAME"
 JAVA_EXIT_CODE=$?
 if [[ $JAVA_EXIT_CODE -ne 0 ]]; then
   echo "Java program returned exit code $JAVA_EXIT_CODE. Stopping script."
@@ -173,7 +175,7 @@ fi
 # package and install generated Python
 cd "$PYTHON_TESTS_TARGET_PATH" || error
 python -m pip wheel --no-deps --only-binary :all: . || error
-python -m pip install python_rosetta_dsl-0.0.0-py3-none-any.whl
+python -m pip install *-0.0.0-py3-none-any.whl
 
 # Find and run all build_and_install.sh scripts to ensure the environment matches the "overall model"
 echo "***** installing all native implementations"