Merge branch 'main' into document-jupyterviz-userinput

Resolve merge conflict with recent jupyterviz refactor
projectmesa · Sep 1, 2023 · 1bd1f73 · 1bd1f73
2 parents 016a079 + fb81c1a
commit 1bd1f73
Show file tree

Hide file tree

Showing 7 changed files with 180 additions and 186 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -24,4 +24,3 @@ python:
       path: .
       extra_requirements:
         - docs
-  system_packages: true
diff --git a/mesa/cookiecutter-mesa/hooks/post_gen_project.py b/mesa/cookiecutter-mesa/hooks/post_gen_project.py
@@ -0,0 +1,11 @@
+import glob
+import os
+
+file_list = glob.glob('**/*.pytemplate', recursive=True)
+
+for file_path in file_list:
+    # Check if the file is a regular file
+    if not os.path.isfile(file_path):
+        continue
+    # Rename the file
+    os.rename(file_path, file_path.replace(".pytemplate", ".py"))
diff --git a/...cutter-mesa/{{cookiecutter.snake}}/run.py → ...esa/{{cookiecutter.snake}}/run.pytemplate b/...cutter-mesa/{{cookiecutter.snake}}/run.py → ...esa/{{cookiecutter.snake}}/run.pytemplate
diff --git a/...tter-mesa/{{cookiecutter.snake}}/setup.py → ...a/{{cookiecutter.snake}}/setup.pytemplate b/...tter-mesa/{{cookiecutter.snake}}/setup.py → ...a/{{cookiecutter.snake}}/setup.pytemplate
diff --git a/...r.snake}}/{{cookiecutter.snake}}/model.py → ...}/{{cookiecutter.snake}}/model.pytemplate b/...r.snake}}/{{cookiecutter.snake}}/model.py → ...}/{{cookiecutter.snake}}/model.pytemplate
diff --git a/....snake}}/{{cookiecutter.snake}}/server.py → .../{{cookiecutter.snake}}/server.pytemplate b/....snake}}/{{cookiecutter.snake}}/server.py → .../{{cookiecutter.snake}}/server.pytemplate
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,3 @@ python: @@
           path: .
           extra_requirements:
             - docs
-      system_packages: true