diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt new file mode 100644 index 0000000000..8c86e22681 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt @@ -0,0 +1,49 @@ +All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or +its licensors. + +For complete copyright and license terms please see the LICENSE at the root of this +distribution (the "License"). All use of this software is governed by the License, +or, if provided, by the license below or the license accompanying this file. Do not +remove or modify any license notices. This file is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + + +INTRODUCTION +------------ + +EditorPythonBindings is a Python project that contains a collection of editor testing tools +developed by the Lumberyard feature teams. The project contains tools for system level +editor tests. + + +REQUIREMENTS +------------ + + * Python 3.7.5 (64-bit) + +It is recommended that you completely remove any other versions of Python +installed on your system. + + +INSTALL +----------- +It is recommended to set up these these tools with Lumberyard's CMake build commands. +Assuming CMake is already setup on your operating system, below are some sample build commands: + cd /path/to/od3e/ + mkdir windows_vs2019 + cd windows_vs2019 + cmake .. -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLY_3RDPARTY_PATH="%3RDPARTYPATH%" -DLY_PROJECTS=AutomatedTesting +NOTE: +Using the above command also adds EditorPythonTestTools to the PYTHONPATH OS environment variable. +Additionally, some CTest scripts will add the Python interpreter path to the PYTHON OS environment variable. + +To manually install the project in development mode using your own installed Python interpreter: + cd /path/to/od3e/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools + /path/to/your/python -m pip install -e . + + +UNINSTALLATION +-------------- + +The preferred way to uninstall the project is: + /path/to/your/python -m pip uninstall editor_python_test_tools diff --git a/Tools/EditorPythonTestTools/__init__.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/__init__.py similarity index 100% rename from Tools/EditorPythonTestTools/__init__.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/__init__.py diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/PKG-INFO b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/PKG-INFO new file mode 100644 index 0000000000..4fb74423c2 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/PKG-INFO @@ -0,0 +1,110 @@ +Metadata-Version: 1.0 +Name: editor-python-test-tools +Version: 1.0.0 +Summary: Lumberyard editor Python bindings test tools +Home-page: UNKNOWN +Author: UNKNOWN +Author-email: UNKNOWN +License: UNKNOWN +Description: All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or + its licensors. + + For complete copyright and license terms please see the LICENSE at the root of this + distribution (the "License"). All use of this software is governed by the License, + or, if provided, by the license below or the license accompanying this file. Do not + remove or modify any license notices. This file is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + + + INTRODUCTION + ------------ + + EditorPythonBindings is a Python project that contains a collection of testing tools + developed by the Lumberyard Test Tech team. The project contains + the following tools: + + * Workspace Manager: + A library to manipulate Lumberyard installations + * Launchers: + A library to test the game in a variety of platforms + + + REQUIREMENTS + ------------ + + * Python 3.7.5 (64-bit) + + It is recommended that you completely remove any other versions of Python + installed on your system. + + + INSTALL + ----------- + It is recommended to set up these these tools with Lumberyard's CMake build commands. + Assuming CMake is already setup on your operating system, below are some sample build commands: + cd /path/to/od3e/ + mkdir windows_vs2019 + cd windows_vs2019 + cmake .. -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLY_3RDPARTY_PATH="%3RDPARTYPATH%" -DLY_PROJECTS=AutomatedTesting + NOTE: + Using the above command also adds LyTestTools to the PYTHONPATH OS environment variable. + Additionally, some CTest scripts will add the Python interpreter path to the PYTHON OS environment variable. + There is some LyTestTools functionality that will search for these, so feel free to populate them manually. + + To manually install the project in development mode using your own installed Python interpreter: + cd /path/to/lumberyard/dev/Tools/LyTestTools/ + /path/to/your/python -m pip install -e . + + For console/mobile testing, update the following .ini file in your root user directory: + i.e. C:/Users/myusername/ly_test_tools/devices.ini (a.k.a. %USERPROFILE%/ly_test_tools/devices.ini) + + You will need to add a section for the device, and a key holding the device identifier value (usually an IP or ID). + It should look similar to this for each device: + [android] + id = 988939353955305449 + + [gameconsole] + ip = 192.168.1.1 + + [gameconsole2] + ip = 192.168.1.2 + + + PACKAGE STRUCTURE + ----------------- + + The project is organized into packages. Each package corresponds to a tool: + + - LyTestTools.ly_test_tools._internal: contains logging setup, pytest fixture, and o3de workspace manager modules + - LyTestTools.ly_test_tools.builtin: builtin helpers and fixtures for quickly writing tests + - LyTestTools.ly_test_tools.console: modules used for consoles + - LyTestTools.ly_test_tools.environment: functions related to file/process management and cleanup + - LyTestTools.ly_test_tools.image: modules related to image capturing and processing + - LyTestTools.ly_test_tools.launchers: game launchers library + - LyTestTools.ly_test_tools.log: modules for interacting with generated or existing log files + - LyTestTools.ly_test_tools.o3de: modules used to interact with Open 3D Engine + - LyTestTools.ly_test_tools.mobile: modules used for android/ios + - LyTestTools.ly_test_tools.report: modules used for reporting + - LyTestTools.tests: LyTestTools integration, unit, and example usage tests + + + DIRECTORY STRUCTURE + ------------------- + + The directory structure corresponds to the package structure. For example, the + ly_test_tools.builtin package is located in the ly_test_tools/builtin/ directory. + + + ENTRY POINTS + ------------ + + Deploying the project in development mode installs only entry points for pytest fixtures. + + + UNINSTALLATION + -------------- + + The preferred way to uninstall the project is: + /path/to/your/python -m pip uninstall ly_test_tools + +Platform: UNKNOWN diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/SOURCES.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/SOURCES.txt new file mode 100644 index 0000000000..1143b74a7c --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/SOURCES.txt @@ -0,0 +1,7 @@ +README.txt +setup.py +editor_python_test_tools.egg-info/PKG-INFO +editor_python_test_tools.egg-info/SOURCES.txt +editor_python_test_tools.egg-info/dependency_links.txt +editor_python_test_tools.egg-info/requires.txt +editor_python_test_tools.egg-info/top_level.txt \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/dependency_links.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/dependency_links.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/requires.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/requires.txt new file mode 100644 index 0000000000..f11e5b3d82 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/requires.txt @@ -0,0 +1 @@ +ly_test_tools diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/top_level.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/top_level.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/top_level.txt @@ -0,0 +1 @@ + diff --git a/Tools/EditorPythonTestTools/editor_python_test_tools/__init__.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/__init__.py similarity index 100% rename from Tools/EditorPythonTestTools/editor_python_test_tools/__init__.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/__init__.py diff --git a/Tools/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py similarity index 100% rename from Tools/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py diff --git a/Tools/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py similarity index 100% rename from Tools/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py diff --git a/Tools/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py similarity index 100% rename from Tools/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py diff --git a/Tools/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py similarity index 100% rename from Tools/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py diff --git a/Tools/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py similarity index 100% rename from Tools/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py diff --git a/Tools/EditorPythonTestTools/editor_python_test_tools/pyside_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_utils.py similarity index 100% rename from Tools/EditorPythonTestTools/editor_python_test_tools/pyside_utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_utils.py diff --git a/Tools/EditorPythonTestTools/editor_python_test_tools/utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py similarity index 100% rename from Tools/EditorPythonTestTools/editor_python_test_tools/utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py diff --git a/Tools/EditorPythonTestTools/setup.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/setup.py similarity index 91% rename from Tools/EditorPythonTestTools/setup.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/setup.py index b11b5d32ad..f253ac98fb 100644 --- a/Tools/EditorPythonTestTools/setup.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/setup.py @@ -15,7 +15,7 @@ from setuptools import setup, find_packages from setuptools.command.develop import develop from setuptools.command.build_py import build_py -PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__)) +PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) PYTHON_64 = platform.architecture()[0] == '64bit' @@ -24,7 +24,7 @@ if __name__ == '__main__': if not PYTHON_64: raise RuntimeError("32-bit Python is not a supported platform.") - with open(os.path.join(PROJECT_ROOT, 'README.txt')) as f: + with open(os.path.join(PACKAGE_ROOT, 'README.txt')) as f: long_description = f.read() setup( diff --git a/Tools/EditorPythonTestTools/README.txt b/Tools/EditorPythonTestTools/README.txt deleted file mode 100644 index d32d3d21a3..0000000000 --- a/Tools/EditorPythonTestTools/README.txt +++ /dev/null @@ -1,100 +0,0 @@ -All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -its licensors. - -For complete copyright and license terms please see the LICENSE at the root of this -distribution (the "License"). All use of this software is governed by the License, -or, if provided, by the license below or the license accompanying this file. Do not -remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - - -INTRODUCTION ------------- - -EditorPythonBindings is a Python project that contains a collection of testing tools -developed by the Lumberyard Test Tech team. The project contains -the following tools: - - * Workspace Manager: - A library to manipulate Lumberyard installations - * Launchers: - A library to test the game in a variety of platforms - - -REQUIREMENTS ------------- - - * Python 3.7.5 (64-bit) - -It is recommended that you completely remove any other versions of Python -installed on your system. - - -INSTALL ------------ -It is recommended to set up these these tools with Lumberyard's CMake build commands. -Assuming CMake is already setup on your operating system, below are some sample build commands: - cd /path/to/od3e/ - mkdir windows_vs2019 - cd windows_vs2019 - cmake .. -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLY_3RDPARTY_PATH="%3RDPARTYPATH%" -DLY_PROJECTS=AutomatedTesting -NOTE: -Using the above command also adds LyTestTools to the PYTHONPATH OS environment variable. -Additionally, some CTest scripts will add the Python interpreter path to the PYTHON OS environment variable. -There is some LyTestTools functionality that will search for these, so feel free to populate them manually. - -To manually install the project in development mode using your own installed Python interpreter: - cd /path/to/lumberyard/dev/Tools/LyTestTools/ - /path/to/your/python -m pip install -e . - -For console/mobile testing, update the following .ini file in your root user directory: - i.e. C:/Users/myusername/ly_test_tools/devices.ini (a.k.a. %USERPROFILE%/ly_test_tools/devices.ini) - -You will need to add a section for the device, and a key holding the device identifier value (usually an IP or ID). -It should look similar to this for each device: - [android] - id = 988939353955305449 - - [gameconsole] - ip = 192.168.1.1 - - [gameconsole2] - ip = 192.168.1.2 - - -PACKAGE STRUCTURE ------------------ - -The project is organized into packages. Each package corresponds to a tool: - -- LyTestTools.ly_test_tools._internal: contains logging setup, pytest fixture, and o3de workspace manager modules -- LyTestTools.ly_test_tools.builtin: builtin helpers and fixtures for quickly writing tests -- LyTestTools.ly_test_tools.console: modules used for consoles -- LyTestTools.ly_test_tools.environment: functions related to file/process management and cleanup -- LyTestTools.ly_test_tools.image: modules related to image capturing and processing -- LyTestTools.ly_test_tools.launchers: game launchers library -- LyTestTools.ly_test_tools.log: modules for interacting with generated or existing log files -- LyTestTools.ly_test_tools.o3de: modules used to interact with Open 3D Engine -- LyTestTools.ly_test_tools.mobile: modules used for android/ios -- LyTestTools.ly_test_tools.report: modules used for reporting -- LyTestTools.tests: LyTestTools integration, unit, and example usage tests - - -DIRECTORY STRUCTURE -------------------- - -The directory structure corresponds to the package structure. For example, the -ly_test_tools.builtin package is located in the ly_test_tools/builtin/ directory. - - -ENTRY POINTS ------------- - -Deploying the project in development mode installs only entry points for pytest fixtures. - - -UNINSTALLATION --------------- - -The preferred way to uninstall the project is: - /path/to/your/python -m pip uninstall ly_test_tools diff --git a/cmake/LYPython.cmake b/cmake/LYPython.cmake index 1fb6ac3790..ff5132097c 100644 --- a/cmake/LYPython.cmake +++ b/cmake/LYPython.cmake @@ -268,7 +268,7 @@ if (NOT CMAKE_SCRIPT_MODE_FILE) ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/Tools/LyTestTools ly-test-tools) ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/Tools/RemoteConsole/ly_remote_console ly-remote-console) - ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/Tools/EditorPythonTestTools editor-python-test-tools) + ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools editor-python-test-tools) endif() endif()