Merge commit '5294bde31ef4656077254f0ffd342991c6f7e615' into debug-services

Author: Ware, Joseph (DLSLtd,RAL,LSCI)

README.md

@@ -34,13 +34,6 @@ It integrates the following tools:
 
 You can see the template in action in the [example project](https://github.com/DiamondLightSource/python-copier-template-example). This is an up to date expansion of the template to illustrate how it looks with all the options enabled.
 
-## Create a new project via Developer Portal
-
-> [!NOTE]
-> Template creation from the developer portal is currently under construction, so these instructions do not work yet
-
-Visit <https://dev-portal.diamond.ac.uk/create> and you will see a list of templates that you can create. Pick the one marked `Python Template` and fill in the details of the project.
-
 ## Create a new project from the commandline
 
 You will need to `pip install copier` inside an activated `venv` from python3.11 or later, then you can create a new module via:

docs/tutorials/adopt-existing.md

@@ -22,7 +22,7 @@ copier copy https://github.com/DiamondLightSource/python-copier-template.git --t
 git diff
 # Examine the changes, put back anything you want to keep
 git commit -m "Adopt python-copier-template 1.0.0"
-copier update /path/to/existing-project
+copier update /path/to/existing-project --trust
 git diff
 # Examine the changes, resolve any merge conflicts
 git commit -m "Update to python-copier-template x.x.x"

docs/tutorials/create-new.md

@@ -25,7 +25,9 @@ $ git commit -m "Expand from python-copier-template x.x.x"
 
 ## Uploading to GitHub
 
-You can now [create a new blank project on GitHub](https://github.com/new). Choose the same GitHub owner and repo name that you answered in the questions earlier. GitHub will now give you the commands needed to upload your repo from GitHub
+If the project is to be under the DiamondLightSource organisation, request a new repository in the [#github-requests Slack channel](https://diamondlightsource.slack.com/archives/C06A18ZPP44) with the given repo name, description and who to add as an owner in addition to yourself. This will be replaced by [a template in the developer-portal in future.](https://github.com/DiamondLightSource/python-copier-template/issues/274)
+
+Else, you can now [create a new blank project on GitHub](https://github.com/new). Choose the same GitHub owner and repo name that you answered in the questions earlier. GitHub will now give you the commands needed to upload your repo from GitHub.
 
 ## Settings
 

tests/test_example.py

@@ -10,7 +10,7 @@
 TOP = Path(__file__).absolute().parent.parent
 
 
-def copy_project(project_path: Path, trust: bool = False, **kwargs):
+def copy_project(project_path: Path, **kwargs):
     with open(TOP / "example-answers.yml") as f:
         answers = yaml.safe_load(f)
     answers.update(kwargs)
@@ -20,7 +20,6 @@ def copy_project(project_path: Path, trust: bool = False, **kwargs):
         dst_path=project_path,
         data=answers,
         vcs_ref="HEAD",
-        unsafe=trust,
     )
     run_pipe("git add .", cwd=str(project_path))
 
@@ -160,7 +159,7 @@ def test_example_repo_updates(tmp_path: Path):
         "https://github.com/DiamondLightSource/python-copier-template-example.git"
     )
     example_path = tmp_path / "example"
-    copy_project(generated_path, trust=True)
+    copy_project(generated_path)
     run_pipe(f"git clone {example_url} {example_path}")
     with open(example_path / ".copier-answers.yml") as f:
         d = yaml.safe_load(f)
@@ -171,7 +170,7 @@ def test_example_repo_updates(tmp_path: Path):
     run("git config user.email '[email protected]'")
     run("git config user.name 'Your Name'")
     run("git commit -am 'Update src'")
-    run(f"copier update --trust --vcs-ref=HEAD --data-file {TOP}/example-answers.yml")
+    run(f"copier update --vcs-ref=HEAD --data-file {TOP}/example-answers.yml")
     output = run(
         # Git directory expected to be different
         "diff -ur --exclude=.git "