From 2ce53dadd267dc8f68b2cc7d3113b2607119282e Mon Sep 17 00:00:00 2001 From: Derek Bankieris <derek.r.bankieris@nasa.gov> Date: Mon, 5 Mar 2018 15:17:22 -0600 Subject: [PATCH] Move pymods into share/trick Fixes #574 --- {pymods => share/trick/pymods}/trick/__init__.py | 0 {pymods => share/trick/pymods}/trick/tests/__init__.py | 0 .../trick/pymods}/trick/tests/test_variable_server.py | 0 {pymods => share/trick/pymods}/trick/variable_server.py | 0 trick_source/sim_services/InputProcessor/IPPython.cpp | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename {pymods => share/trick/pymods}/trick/__init__.py (100%) rename {pymods => share/trick/pymods}/trick/tests/__init__.py (100%) rename {pymods => share/trick/pymods}/trick/tests/test_variable_server.py (100%) rename {pymods => share/trick/pymods}/trick/variable_server.py (100%) diff --git a/pymods/trick/__init__.py b/share/trick/pymods/trick/__init__.py similarity index 100% rename from pymods/trick/__init__.py rename to share/trick/pymods/trick/__init__.py diff --git a/pymods/trick/tests/__init__.py b/share/trick/pymods/trick/tests/__init__.py similarity index 100% rename from pymods/trick/tests/__init__.py rename to share/trick/pymods/trick/tests/__init__.py diff --git a/pymods/trick/tests/test_variable_server.py b/share/trick/pymods/trick/tests/test_variable_server.py similarity index 100% rename from pymods/trick/tests/test_variable_server.py rename to share/trick/pymods/trick/tests/test_variable_server.py diff --git a/pymods/trick/variable_server.py b/share/trick/pymods/trick/variable_server.py similarity index 100% rename from pymods/trick/variable_server.py rename to share/trick/pymods/trick/variable_server.py diff --git a/trick_source/sim_services/InputProcessor/IPPython.cpp b/trick_source/sim_services/InputProcessor/IPPython.cpp index 5217afe6..96c3c9df 100644 --- a/trick_source/sim_services/InputProcessor/IPPython.cpp +++ b/trick_source/sim_services/InputProcessor/IPPython.cpp @@ -110,7 +110,7 @@ int Trick::IPPython::init() { "import struct\n" "import binascii\n" "sys.path.append(os.getcwd())\n" - "sys.path.append(os.path.join(os.environ['TRICK_HOME'], 'pymods'))\n" + "sys.path.append(os.path.join(os.environ['TRICK_HOME'], 'share/trick/pymods'))\n" "sys.path += map(str.strip, os.environ['TRICK_PYTHON_PATH'].split(':'))\n" "import trick\n" "sys.path.append(os.getcwd() + \"/Modified_data\")\n"