trenne das Laden der .env pip libraries von dem Setzen der Umgebung. setenv.bat enthält jetzt bei Bedarf den python Interpreter auf dem Share

bin/dxfs2lib.bat

@@ -7,4 +7,4 @@ REM Beispielaufruf mit Parametern:
 REM --in: Ordner mit .dxf-Dateien (optional. Standard: work/converted_dxfs)
 REM --name: Name der zu erzeugenden Bibliothek
 
-python %PROJECT_LIB%\dxf2lib.py %*
+"%VIRTUAL_ENV%\Scripts\python.exe" %PROJECT_LIB%\dxf2lib.py %*

bin/manage_interpreter.bat

@@ -1,30 +1,33 @@
 @echo off
 CALL setenv.bat
-IF DEFINED NETWORK_INTERPRETER_PATH (
-    goto %~1_network
 
+IF /I "%1"=="activate" GOTO activate
+IF /I "%1"=="deactivate" GOTO deactivate
+GOTO :eof
+
+
+:activate
+REM Interpreter wählen
+IF DEFINED NETWORK_PYTHON (
+    SET PYTHON_EXE=%NETWORK_PYTHON%\python.exe
 ) ELSE (
-    goto %~1_local
+    SET PYTHON_EXE=python
 )
 
-:activate_interpreter_local
+REM venv sicherstellen
-IF NOT EXIST %PROJECT%\.venv CALL %PROJECT_BIN%\install_py.bat
+IF NOT EXIST "%PROJECT%\.venv" (
-CALL %PROJECT%\.venv\Scripts\activate.bat
+    "%PYTHON_EXE%" -m venv "%PROJECT%\.venv"
-goto :eof
+)
 
-:deactivate_interpreter_local
+REM venv aktivieren
-deactivate
+CALL "%PROJECT%\.venv\Scripts\activate.bat"
-goto :eof
 
-:activate_interpreter_network
+REM Interpreter festnageln
-SET OLD_PATH=%PATH%
+SET VIRTUAL_ENV_PYTHON=%PYTHON_EXE%
-SET PATH=%NETWORK_INTERPRETER_PATH%;%PATH%
+GOTO :eof
-CALL %PROJECT%\.venv\Scripts\activate.bat
-goto :eof
 
-:deactivate_interpreter_network
+
-SET PATH=%OLD_PATH%
+:deactivate
-SET OLD_PATH=
+CALL "%PROJECT%\.venv\Scripts\deactivate.bat"
-SET NETWORK_INTERPRETER_PATH=
+SET VIRTUAL_ENV_PYTHON=
-CALL %PROJECT%\.venv\Scripts\deactivate.bat
+GOTO :eofecho off
-goto :eof

bin/plant2dxf.bat

@@ -1,4 +1,6 @@
 @echo off
 CALL manage_interpreter.bat activate_interpreter
-python %PROJECT_LIB%\plant2dxf.py %*
+cd /d %PROJECT%
+"%VIRTUAL_ENV%\Scripts\python.exe" -m lib.plant2dxf %*
 CALL manage_interpreter.bat deactivate_interpreter
+exit /b %ERRORLEVEL%

bin/run_unittests.bat

@@ -12,8 +12,8 @@ if %ERRORLEVEL% NEQ 0 (
     pause
     exit /B 1
 )
-
+echo python -m unittest discover -t %PROJECT_LIB% -s %PROJECT_LIB%\Elemente -p "*_tests.py" -v
-python -m unittest discover -t %PROJECT_LIB% -s lib\Elemente -p "*_tests.py" -v
+"%VIRTUAL_ENV%\Scripts\python.exe" -m unittest discover -t %PROJECT_LIB% -s %PROJECT_LIB%\Elemente -p "*_tests.py" -v
 if %ERRORLEVEL% NEQ 0 (
     echo.
     echo Tests failed!

bin/setenv.bat

@@ -19,6 +19,7 @@ if not exist %PROJECT%\log mkdir %PROJECT%\log
 if not exist %PROJECT%\testdata mkdir %PROJECT%\testdata
 
 set PATH=%PROJECT_BIN%;%PATH%
+REM set NETWORK_PYTHON=TO_BE_SET
 
 
 popd