ソースを参照

Shorten the longest path (#1783)

* shorten the longest path by reducing the sdm folder name and the __root_folder name

* shorten the longest path by reducing the sdm folder name and the __root_folder name
Jean-Robin 8 ヶ月 前
コミット
6ebfbb58ac
40 ファイル変更6 行追加6 行削除
  1. 1 1
      taipy/templates/README.md
  2. 1 1
      taipy/templates/default/cookiecutter.json
  3. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/.gitignore
  4. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/algorithms/__init__.py
  5. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/algorithms/algorithms.py
  6. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/configuration/__init__.py
  7. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/configuration/config.py
  8. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/pages/__init__.py
  9. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/pages/page_example/page_example.md
  10. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/pages/page_example/page_example.py
  11. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/pages/root.md
  12. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/pages/root.py
  13. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/requirements.txt
  14. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/sections/import.txt
  15. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/sections/main.txt
  16. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/sections/page_content.txt
  17. 0 0
      taipy/templates/default/{{cookiecutter.__root_folder}}/{{cookiecutter.__main_file}}.py
  18. 1 1
      taipy/templates/sdm/cookiecutter.json
  19. 0 0
      taipy/templates/sdm/hooks/post_gen_project.py
  20. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/.gitignore
  21. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/.taipyignore
  22. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/algos/__init__.py
  23. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/algos/algos.py
  24. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/config/__init__.py
  25. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/config/config.py
  26. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/config/config.toml
  27. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/config/config_with_toml.py
  28. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/__init__.py
  29. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/job_page/__init__.py
  30. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/job_page/job_page.md
  31. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/job_page/job_page.py
  32. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/root.md
  33. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/root.py
  34. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/scenario_page/__init__.py
  35. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/scenario_page/data_node_management.py
  36. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/scenario_page/scenario_page.md
  37. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/scenario_page/scenario_page.py
  38. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/requirements.txt
  39. 0 0
      taipy/templates/sdm/{{cookiecutter.__root_folder}}/{{cookiecutter.__main_file}}.py
  40. 3 3
      tests/templates/test_scenario_mgt_template.py

+ 1 - 1
taipy/templates/README.md

@@ -58,7 +58,7 @@ Want to be part of the *Taipy* community? Check out our
 - `taipy/`:
   - `templates/`: Contains templates, each in a dedicated sub-folder with the following structure:
     - `<template-name>/`: Internal package for Taipy data backup mechanism.
-      - `{{cookiecutter.__root_folder_name}}/`: The root folder of the application created using this template.
+      - `{{cookiecutter.__root_folder}}/`: The root folder of the application created using this template.
       - `hooks/`: Contains hooks to be executed before and after the application is created.
       - `cookiecutter.json`: The configuration file for the template.
     - `LICENSE`: The Apache 2.0 License.

+ 1 - 1
taipy/templates/default/cookiecutter.json

@@ -7,7 +7,7 @@
     "Does the application use Rest API?": "No",
     "Do you want to initialize a new Git repository?": "No",
 
-    "__root_folder_name": "{{ cookiecutter['Application root folder name'] | replace(' ','-') }}",
+    "__root_folder": "{{ cookiecutter['Application root folder name'] | replace(' ','-') }}",
     "__main_file": "{{ cookiecutter['Application main Python file'][:-3] if cookiecutter['Application main Python file'].endswith('.py') else cookiecutter['Application main Python file'] }}",
     "__application_title": "{{ cookiecutter['Application title'] }}",
     "__pages": "{{ cookiecutter['Page names in multi-page application?'] }}",

+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/.gitignore → taipy/templates/default/{{cookiecutter.__root_folder}}/.gitignore


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/algorithms/__init__.py → taipy/templates/default/{{cookiecutter.__root_folder}}/algorithms/__init__.py


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/algorithms/algorithms.py → taipy/templates/default/{{cookiecutter.__root_folder}}/algorithms/algorithms.py


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/configuration/__init__.py → taipy/templates/default/{{cookiecutter.__root_folder}}/configuration/__init__.py


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/configuration/config.py → taipy/templates/default/{{cookiecutter.__root_folder}}/configuration/config.py


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/pages/__init__.py → taipy/templates/default/{{cookiecutter.__root_folder}}/pages/__init__.py


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/pages/page_example/page_example.md → taipy/templates/default/{{cookiecutter.__root_folder}}/pages/page_example/page_example.md


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/pages/page_example/page_example.py → taipy/templates/default/{{cookiecutter.__root_folder}}/pages/page_example/page_example.py


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/pages/root.md → taipy/templates/default/{{cookiecutter.__root_folder}}/pages/root.md


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/pages/root.py → taipy/templates/default/{{cookiecutter.__root_folder}}/pages/root.py


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/requirements.txt → taipy/templates/default/{{cookiecutter.__root_folder}}/requirements.txt


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/sections/import.txt → taipy/templates/default/{{cookiecutter.__root_folder}}/sections/import.txt


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/sections/main.txt → taipy/templates/default/{{cookiecutter.__root_folder}}/sections/main.txt


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/sections/page_content.txt → taipy/templates/default/{{cookiecutter.__root_folder}}/sections/page_content.txt


+ 0 - 0
taipy/templates/default/{{cookiecutter.__root_folder_name}}/{{cookiecutter.__main_file}}.py → taipy/templates/default/{{cookiecutter.__root_folder}}/{{cookiecutter.__main_file}}.py


+ 1 - 1
taipy/templates/scenario-management/cookiecutter.json → taipy/templates/sdm/cookiecutter.json

@@ -5,7 +5,7 @@
     "Does the application use TOML Config?": "No",
     "Do you want to initialize a new Git repository?": "No",
 
-    "__root_folder_name": "{{ cookiecutter['Application root folder name'] | replace(' ','-') }}",
+    "__root_folder": "{{ cookiecutter['Application root folder name'] | replace(' ','-') }}",
     "__main_file": "{{ cookiecutter['Application main Python file'][:-3] if cookiecutter['Application main Python file'].endswith('.py') else cookiecutter['Application main Python file'] }}",
     "__application_title": "{{ cookiecutter['Application title'] }}",
     "__use_toml_config": "{{ cookiecutter['Does the application use TOML Config?'] }}",

+ 0 - 0
taipy/templates/scenario-management/hooks/post_gen_project.py → taipy/templates/sdm/hooks/post_gen_project.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/.gitignore → taipy/templates/sdm/{{cookiecutter.__root_folder}}/.gitignore


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/.taipyignore → taipy/templates/sdm/{{cookiecutter.__root_folder}}/.taipyignore


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/algos/__init__.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/algos/__init__.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/algos/algos.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/algos/algos.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/config/__init__.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/config/__init__.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/config/config.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/config/config.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/config/config.toml → taipy/templates/sdm/{{cookiecutter.__root_folder}}/config/config.toml


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/config/config_with_toml.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/config/config_with_toml.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/pages/__init__.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/__init__.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/pages/job_page/__init__.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/job_page/__init__.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/pages/job_page/job_page.md → taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/job_page/job_page.md


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/pages/job_page/job_page.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/job_page/job_page.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/pages/root.md → taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/root.md


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/pages/root.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/root.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/pages/scenario_page/__init__.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/scenario_page/__init__.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/pages/scenario_page/data_node_management.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/scenario_page/data_node_management.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/pages/scenario_page/scenario_page.md → taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/scenario_page/scenario_page.md


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/pages/scenario_page/scenario_page.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/pages/scenario_page/scenario_page.py


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/requirements.txt → taipy/templates/sdm/{{cookiecutter.__root_folder}}/requirements.txt


+ 0 - 0
taipy/templates/scenario-management/{{cookiecutter.__root_folder_name}}/{{cookiecutter.__main_file}}.py → taipy/templates/sdm/{{cookiecutter.__root_folder}}/{{cookiecutter.__main_file}}.py


+ 3 - 3
tests/templates/test_scenario_mgt_template.py

@@ -18,7 +18,7 @@ from .utils import _run_template
 
 def test_scenario_management_with_toml_config(tmpdir):
     cookiecutter(
-        template="taipy/templates/scenario-management",
+        template="taipy/templates/sdm",
         output_dir=tmpdir,
         no_input=True,
         extra_context={
@@ -50,7 +50,7 @@ def test_scenario_management_with_toml_config(tmpdir):
 
 def test_scenario_management_without_toml_config(tmpdir):
     cookiecutter(
-        template="taipy/templates/scenario-management",
+        template="taipy/templates/sdm",
         output_dir=tmpdir,
         no_input=True,
         extra_context={
@@ -81,7 +81,7 @@ def test_scenario_management_without_toml_config(tmpdir):
 
 def test_with_git(tmpdir):
     cookiecutter(
-        template="taipy/templates/scenario-management",
+        template="taipy/templates/sdm",
         output_dir=str(tmpdir),
         no_input=True,
         extra_context={