Skip to content

Ticket 7914 update script #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open

Ticket 7914 update script #241

wants to merge 37 commits into from

Conversation

FreddieAkeroyd
Copy link
Member

No description provided.

Daniel Maclaren and others added 30 commits February 16, 2024 16:23
@esmith1729
First draft of update_scripts.py
2e8fe94 
Co-authored-by: esmith1729 <esmith1729@users.noreply.github.com>
@esmith1729
rework to the script
280ed72 
Co-authored-by: esmith1729 <esmith1729@users.noreply.github.com>
@FreddieAkeroyd
Change update script to create branch if doesn't exist, fetch and mer…
c7c30f9 
…ge master, and then push to origin
@FreddieAkeroyd
Merging
0592705
@FreddieAkeroyd
Merge if name == main call
929b22a
@FreddieAkeroyd
fix path in pythonwrap
069be72
@FreddieAkeroyd
Change push to set upstream origin
694b790
@FreddieAkeroyd
Add Jenkinsfile, bat file, and change user prompt behaviour to defaul…
209e8a5 
…t to y for Jenkins pipline to run
@FreddieAkeroyd
Change path to call_update_scripts.bat
f09efdd
@FreddieAkeroyd
Change path to pythonwrap.bat for Jenkins pipeline
71bad20
@FreddieAkeroyd
Change path to update_scripts.py for Jenkins pipeline
4f0d6e7
@FreddieAkeroyd
Change path to root for Jenkins pipeline
c5812e9
@esmith1729
change merge master to merge origin/master
bdfff5f
@FreddieAkeroyd
Add /d after cd, change update_scripts.bat structure
d2eb0fa
@FreddieAkeroyd
revert update_scripts.bat to previous version
ebf96d1
@esmith1729
delete unnecessary file
d2d3023
@esmith1729
Merge branch 'ticket_7914_update_script' of https://github.com/ISISCo…
a1af076 
…mputingGroup/ibex_utils into ticket_7914_update_script
@esmith1729 @danielmaclaren
Created general method for automatic merge in git_tasks.py; implement…
2299de4 
…ed into update_scripts.py

Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
Add try/except clause to body of update_scripts.py
11c5696 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
Add shell=True
ddb20b0 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
Add empty args to GitTasks
09a9288 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
Add @task decorator to automatic merge function, in order to give it …
0248bf4 
…access to BaseTasks' prompt function

Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
Fixed typo of "confirm_steps"
0f11479 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
Changed "confirm_step" to "confirm_steps" in task.py
13db87a 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
Changed confirm_steps back to confirm_step. Added self.prompt to GitT…
1a92c92 
…asks instance in update_scripts.py

Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
Added git.Repo instance to git_tasks.py
b088a85 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
removed {} from Scripts base dir call
ae045ad 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
Removed comments, update manual prompt message of automatic_merge method
252d972 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
Remove extra ), put %COMPUTERNAME% into fstring
69fc533 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren
Add print statement to test COMPUTERNAME
f9b848d 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
esmith1729 and others added 6 commits March 1, 2024 14:28
@esmith1729 @danielmaclaren
Created global for COMPUTERNAME from BaseTasks' get_machine_name() me…
a8345b0 
…thod

Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@esmith1729 @danielmaclaren @zsoltkebel
Put manual prompt into right spot
e9af826 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
Co-authored-by:  zsoltkebel <zsoltkebel@users.noreply.github.com>
@esmith1729 @danielmaclaren @zsoltkebel
Made task prompt message more clear
df7cbf6 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
Co-authored-by: zsoltkebel <zsoltkebel@users.noreply.github.com>
@esmith1729 @danielmaclaren
Added cd /d and git checkout call in git_tasks steps of automatic merge
e9ab25a 
Co-authored-by: dtmaclaren <danielmaclaren@users.noreply.github.com>
@FreddieAkeroyd
Merge remote-tracking branch 'origin/master' into ticket_7914_update_…
bba76d9 
…script
@FreddieAkeroyd
ruff
a1c8871
github-advanced-security[bot]
github-advanced-security bot found potential problems May 20, 2025
View reviewed changes
installation_and_upgrade/ibex_install_utils/tasks/git_tasks.py
Comment on lines +118 to +121
f"""
Attempt an automatic merge of one branch
{branch_to_merge_from} to another, {branch_to_merge_to} in {dir}
"""

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.

Copilot Autofix

AI 17 days ago

To fix the issue, the multi-line f-string should be converted into a proper docstring for the automatic_merge_of_git_remote method. This involves moving the string to immediately follow the def line of the method. Since the string is intended to describe the method's purpose and parameters, it should be formatted as a standard docstring (triple-quoted string) without the f prefix, as no variable interpolation is required.

Suggested changeset 1
installation_and_upgrade/ibex_install_utils/tasks/git_tasks.py

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/installation_and_upgrade/ibex_install_utils/tasks/git_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/git_tasks.py
--- a/installation_and_upgrade/ibex_install_utils/tasks/git_tasks.py
+++ b/installation_and_upgrade/ibex_install_utils/tasks/git_tasks.py
@@ -117,5 +117,9 @@
     ) -> None:
-        f"""
-        Attempt an automatic merge of one branch
-           {branch_to_merge_from} to another, {branch_to_merge_to} in {dir}
+        """
+        Attempt an automatic merge of one branch to another in a specified directory.
+        
+        Args:
+            branch_to_merge_from (str): The name of the branch to merge from.
+            branch_to_merge_to (str): The name of the branch to merge to.
+            dir (str): The directory where the git repository is located.
         """
EOF
@@ -117,5 +117,9 @@
) -> None:
f"""
Attempt an automatic merge of one branch
{branch_to_merge_from} to another, {branch_to_merge_to} in {dir}
"""
Attempt an automatic merge of one branch to another in a specified directory.

Args:
branch_to_merge_from (str): The name of the branch to merge from.
branch_to_merge_to (str): The name of the branch to merge to.
dir (str): The directory where the git repository is located.
"""
Copilot is powered by AI and may make mistakes. Always verify output.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FreddieAkeroyd @esmith1729