From a0f32c403d8b41302316f5939de07fd5dfa6e88d Mon Sep 17 00:00:00 2001 From: joeydelarago Date: Thu, 11 Aug 2022 16:44:07 +0200 Subject: Move run configuration templates out of conan-config into this repo. Add extra test run configuration. CURA-8792 --- .run_templates/pycharm_cura_run.run.xml.jinja | 25 +++++++++++++++++++++++++ .run_templates/pycharm_cura_test.run.xml.jinja | 25 +++++++++++++++++++++++++ conanfile.py | 23 ++++++++++++++--------- 3 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 .run_templates/pycharm_cura_run.run.xml.jinja create mode 100644 .run_templates/pycharm_cura_test.run.xml.jinja diff --git a/.run_templates/pycharm_cura_run.run.xml.jinja b/.run_templates/pycharm_cura_run.run.xml.jinja new file mode 100644 index 0000000000..3c04c5eaef --- /dev/null +++ b/.run_templates/pycharm_cura_run.run.xml.jinja @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/.run_templates/pycharm_cura_test.run.xml.jinja b/.run_templates/pycharm_cura_test.run.xml.jinja new file mode 100644 index 0000000000..4f685b6d8c --- /dev/null +++ b/.run_templates/pycharm_cura_test.run.xml.jinja @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/conanfile.py b/conanfile.py index c59a22eef2..867e19abcd 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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 @@ -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. -- cgit v1.2.3