Skip to content

Commit

Permalink
Move run configuration templates out of conan-config into this repo.
Browse files Browse the repository at this point in the history
Add extra test run configuration.

CURA-8792
  • Loading branch information
Joeydelarago committed Aug 11, 2022
1 parent 7b6e562 commit a0f32c4
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 9 deletions.
25 changes: 25 additions & 0 deletions .run_templates/pycharm_cura_run.run.xml.jinja
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="{{ name }}" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
<module name="{{ module_name }}" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />{% for key, value in env_vars.items() %}
<env name="{{ key }}" value="{{ value }}" />{% endfor %}
</envs>
<option name="SDK_HOME" value="{{ sdk_path }}" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/{{ script_name }}" />
<option name="PARAMETERS" value="{{ parameters }}" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
</component>
25 changes: 25 additions & 0 deletions .run_templates/pycharm_cura_test.run.xml.jinja
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="{{ name }}" type="tests" factoryName="py.test" nameIsGenerated="true">
<module name="{{ module_name }}" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />{% for key, value in env_vars.items() %}
<env name="{{ key }}" value="{{ value }}" />{% endfor %}
</envs>
<option name="SDK_HOME" value="{{ sdk_path }}" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tests" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/{{ script_name }}" />
<option name="PARAMETERS" value="{{ parameters }}" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
</component>
23 changes: 14 additions & 9 deletions conanfile.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import os
import sys
from pathlib import Path

from io import StringIO

from platform import python_version

from jinja2 import Template

from conans import tools
Expand Down Expand Up @@ -58,16 +53,26 @@ class CuraConan(ConanFile):
}

# TODO: Add unit tests (but they need a different jinja template
_pycharm_targets = [{
_pycharm_targets = [
{
"name": "cura",
"module_name": "Cura",
"script_name": "cura_app.py",
}, {
"jinja_path": ".run_templates/pycharm_cura_run.run.xml.jinja"
},
{
"name": "cura_external_engine",
"module_name": "Cura",
"script_name": "cura_app.py",
"parameters": "--external-backend"
}
"parameters": "--external-backend",
"jinja_path": ".run_templates/pycharm_cura_run.run.xml.jinja"
},
{
"name": "cura_test",
"module_name": "Cura",
"script_name": "run_coverage.py",
"jinja_path": ".run_templates/pycharm_cura_test.run.xml.jinja"
},
]

# FIXME: These env vars should be defined in the runenv.
Expand Down

0 comments on commit a0f32c4

Please sign in to comment.