Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CADET-RDM
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IBG-1
ModSim
CADET
CADET-RDM
Commits
1291de1f
Commit
1291de1f
authored
1 year ago
by
Ronald Jäpel
Browse files
Options
Downloads
Patches
Plain Diff
Branch new branches off from master
and some refactoring
parent
b5d89fa9
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cadetrdm/initialize_repo.py
+3
-2
3 additions, 2 deletions
cadetrdm/initialize_repo.py
cadetrdm/utils.py
+82
-45
82 additions, 45 deletions
cadetrdm/utils.py
tests/test_git_adapter.py
+14
-5
14 additions, 5 deletions
tests/test_git_adapter.py
with
99 additions
and
52 deletions
cadetrdm/initialize_repo.py
+
3
−
2
View file @
1291de1f
...
@@ -138,7 +138,8 @@ def initialize_git_repo(path_to_repo: str, output_repo_name: (str | bool) = "out
...
@@ -138,7 +138,8 @@ def initialize_git_repo(path_to_repo: str, output_repo_name: (str | bool) = "out
# If output_repo_name is False we are in the output_repo and should finish by committing the changes
# If output_repo_name is False we are in the output_repo and should finish by committing the changes
repo
=
ResultsRepo
(
"
.
"
)
repo
=
ResultsRepo
(
"
.
"
)
repo
.
git
.
add
(
"
.
"
)
# ToDo: Why does this break tests if changed to repo.add and repo.commit??
repo
.
git
.
commit
(
"
-m
"
,
"
initial commit
"
)
repo
.
_git
.
add
(
"
.
"
)
repo
.
_git
.
commit
(
"
-m
"
,
"
initial commit
"
)
os
.
chdir
(
starting_directory
)
os
.
chdir
(
starting_directory
)
This diff is collapsed.
Click to expand it.
cadetrdm/utils.py
+
82
−
45
View file @
1291de1f
...
@@ -31,19 +31,19 @@ class BaseRepo:
...
@@ -31,19 +31,19 @@ class BaseRepo:
"""
"""
if
repository_path
is
None
or
repository_path
==
"
.
"
:
if
repository_path
is
None
or
repository_path
==
"
.
"
:
repository_path
=
os
.
getcwd
()
repository_path
=
os
.
getcwd
()
self
.
git_repo
=
git
.
Repo
(
repository_path
,
search_parent_directories
=
search_parent_directories
,
*
args
,
**
kwargs
)
self
.
_
git_repo
=
git
.
Repo
(
repository_path
,
search_parent_directories
=
search_parent_directories
,
*
args
,
**
kwargs
)
self
.
git
=
self
.
git_repo
.
git
self
.
_
git
=
self
.
_
git_repo
.
git
self
.
_most_recent_branch
=
self
.
active_branch
.
name
self
.
_most_recent_branch
=
self
.
active_branch
.
name
self
.
_earliest_commit
=
None
self
.
_earliest_commit
=
None
@property
@property
def
active_branch
(
self
):
def
active_branch
(
self
):
return
self
.
git_repo
.
active_branch
return
self
.
_
git_repo
.
active_branch
@property
@property
def
untracked_files
(
self
):
def
untracked_files
(
self
):
return
self
.
git_repo
.
untracked_files
return
self
.
_
git_repo
.
untracked_files
@property
@property
def
current_commit_hash
(
self
):
def
current_commit_hash
(
self
):
...
@@ -51,35 +51,52 @@ class BaseRepo:
...
@@ -51,35 +51,52 @@ class BaseRepo:
@property
@property
def
working_dir
(
self
):
def
working_dir
(
self
):
return
self
.
git_repo
.
working_dir
return
self
.
_
git_repo
.
working_dir
@property
@property
def
head
(
self
):
def
head
(
self
):
return
self
.
git_repo
.
head
return
self
.
_
git_repo
.
head
@property
@property
def
remotes
(
self
):
def
remotes
(
self
):
return
self
.
git_repo
.
remotes
return
self
.
_
git_repo
.
remotes
@property
@property
def
earliest_commit
(
self
):
def
earliest_commit
(
self
):
if
self
.
_earliest_commit
is
None
:
if
self
.
_earliest_commit
is
None
:
*
_
,
earliest_commit
=
self
.
git_repo
.
iter_commits
()
*
_
,
earliest_commit
=
self
.
_
git_repo
.
iter_commits
()
self
.
_earliest_commit
=
earliest_commit
self
.
_earliest_commit
=
earliest_commit
return
self
.
_earliest_commit
return
self
.
_earliest_commit
# ToDo: test if functools.wraps can keep docstrings
def
add
(
self
,
*
args
,
**
kwargs
):
self
.
_git
.
add
(
*
args
,
**
kwargs
)
def
add_remote
(
self
,
remote_url
,
remote_name
=
"
origin
"
):
def
add_remote
(
self
,
remote_url
,
remote_name
=
"
origin
"
):
self
.
git_repo
.
create_remote
(
remote_name
,
url
=
remote_url
)
"""
ToDO add documentation
:param remote_url:
:param remote_name:
:return:
"""
self
.
_git_repo
.
create_remote
(
remote_name
,
url
=
remote_url
)
def
push
(
self
,
remote
=
None
,
local_branch
=
None
,
remote_branch
=
None
):
def
push
(
self
,
remote
=
None
,
local_branch
=
None
,
remote_branch
=
None
):
"""
# ToDo extend documentation
:param remote:
:param local_branch:
:param remote_branch:
:return:
"""
if
local_branch
is
None
:
if
local_branch
is
None
:
local_branch
=
self
.
active_branch
local_branch
=
self
.
active_branch
if
remote_branch
is
None
:
if
remote_branch
is
None
:
remote_branch
=
local_branch
remote_branch
=
local_branch
if
remote
is
None
:
if
remote
is
None
:
remote
=
list
(
sorted
(
self
.
git_repo
.
remotes
.
keys
()))[
0
]
remote
=
list
(
sorted
(
self
.
_
git_repo
.
remotes
.
keys
()))[
0
]
remote_interface
=
self
.
git_repo
.
remotes
[
remote
]
remote_interface
=
self
.
_
git_repo
.
remotes
[
remote
]
remote_interface
.
push
(
refspec
=
f
'
{
local_branch
}
:
{
remote_branch
}
'
)
remote_interface
.
push
(
refspec
=
f
'
{
local_branch
}
:
{
remote_branch
}
'
)
def
delete_active_branch_if_branch_is_empty
(
self
):
def
delete_active_branch_if_branch_is_empty
(
self
):
...
@@ -89,8 +106,8 @@ class BaseRepo:
...
@@ -89,8 +106,8 @@ class BaseRepo:
"""
"""
previous_branch
=
self
.
active_branch
.
name
previous_branch
=
self
.
active_branch
.
name
if
str
(
self
.
head
.
commit
)
==
self
.
earliest_commit
:
if
str
(
self
.
head
.
commit
)
==
self
.
earliest_commit
:
self
.
git
.
checkout
(
"
master
"
)
self
.
_
git
.
checkout
(
"
master
"
)
self
.
git
.
branch
(
"
-d
"
,
previous_branch
)
self
.
_
git
.
branch
(
"
-d
"
,
previous_branch
)
def
add_all_files
(
self
,
automatically_add_new_files
=
True
):
def
add_all_files
(
self
,
automatically_add_new_files
=
True
):
"""
"""
...
@@ -106,7 +123,7 @@ class BaseRepo:
...
@@ -106,7 +123,7 @@ class BaseRepo:
if
automatically_add_new_files
:
if
automatically_add_new_files
:
for
f
in
self
.
untracked_files
:
for
f
in
self
.
untracked_files
:
self
.
git
.
add
(
f
)
self
.
_
git
.
add
(
f
)
else
:
else
:
proceed
=
input
(
proceed
=
input
(
f
'
Found untracked files. Adding the following untracked files to git:
\n
{
untracked_files
}
\n
'
f
'
Found untracked files. Adding the following untracked files to git:
\n
{
untracked_files
}
\n
'
...
@@ -114,13 +131,13 @@ class BaseRepo:
...
@@ -114,13 +131,13 @@ class BaseRepo:
)
)
if
proceed
.
lower
()
==
"
y
"
or
proceed
==
""
:
if
proceed
.
lower
()
==
"
y
"
or
proceed
==
""
:
for
f
in
self
.
untracked_files
:
for
f
in
self
.
untracked_files
:
self
.
git
.
add
(
f
)
self
.
_
git
.
add
(
f
)
else
:
else
:
raise
KeyboardInterrupt
raise
KeyboardInterrupt
changed_files
=
self
.
changed_files
changed_files
=
self
.
changed_files
for
f
in
changed_files
:
for
f
in
changed_files
:
self
.
git
.
add
(
f
)
self
.
_
git
.
add
(
f
)
return
self
.
untracked_files
+
changed_files
return
self
.
untracked_files
+
changed_files
def
reset_hard_to_head
(
self
):
def
reset_hard_to_head
(
self
):
...
@@ -131,13 +148,13 @@ class BaseRepo:
...
@@ -131,13 +148,13 @@ class BaseRepo:
if
not
(
proceed
.
lower
()
==
"
y
"
or
proceed
==
""
):
if
not
(
proceed
.
lower
()
==
"
y
"
or
proceed
==
""
):
raise
KeyboardInterrupt
raise
KeyboardInterrupt
# reset all tracked files to previous commit, -q silences output
# reset all tracked files to previous commit, -q silences output
self
.
git
.
reset
(
"
-q
"
,
"
--hard
"
,
"
HEAD
"
)
self
.
_
git
.
reset
(
"
-q
"
,
"
--hard
"
,
"
HEAD
"
)
# remove all untracked files and directories, -q silences output
# remove all untracked files and directories, -q silences output
self
.
git
.
clean
(
"
-q
"
,
"
-f
"
,
"
-d
"
)
self
.
_
git
.
clean
(
"
-q
"
,
"
-f
"
,
"
-d
"
)
@property
@property
def
changed_files
(
self
):
def
changed_files
(
self
):
changed_files
=
self
.
git
.
diff
(
None
,
name_only
=
True
).
split
(
'
\n
'
)
changed_files
=
self
.
_
git
.
diff
(
None
,
name_only
=
True
).
split
(
'
\n
'
)
if
""
in
changed_files
:
if
""
in
changed_files
:
changed_files
.
remove
(
""
)
changed_files
.
remove
(
""
)
return
changed_files
return
changed_files
...
@@ -180,37 +197,37 @@ class BaseRepo:
...
@@ -180,37 +197,37 @@ class BaseRepo:
self
.
update_package_list
()
self
.
update_package_list
()
if
add_all
:
if
add_all
:
self
.
add_all_files
()
self
.
add_all_files
()
commit_return
=
self
.
git
.
commit
(
"
-m
"
,
message
)
commit_return
=
self
.
_
git
.
commit
(
"
-m
"
,
message
)
print
(
"
\n
"
+
commit_return
+
"
\n
"
)
print
(
"
\n
"
+
commit_return
+
"
\n
"
)
def
git_ammend
(
self
,
):
def
git_ammend
(
self
,
):
"""
"""
Call git commit with options --amend --no-edit
Call git commit with options --amend --no-edit
"""
"""
self
.
git
.
commit
(
"
--amend
"
,
"
--no-edit
"
)
self
.
_
git
.
commit
(
"
--amend
"
,
"
--no-edit
"
)
@property
@property
def
status
(
self
):
def
status
(
self
):
return
self
.
git
.
status
()
return
self
.
_
git
.
status
()
@property
@property
def
log
(
self
):
def
log
(
self
):
return
self
.
git
.
log
()
return
self
.
_
git
.
log
()
def
log_oneline
(
self
):
def
log_oneline
(
self
):
return
self
.
git
.
log
(
"
--oneline
"
)
return
self
.
_
git
.
log
(
"
--oneline
"
)
def
print_status
(
self
):
def
print_status
(
self
):
"""
"""
prints git status
prints git status
"""
"""
print
(
self
.
git
.
status
())
print
(
self
.
_
git
.
status
())
def
print_log
(
self
):
def
print_log
(
self
):
"""
"""
Prints the git log
Prints the git log
"""
"""
print
(
self
.
git
.
log
())
print
(
self
.
_
git
.
log
())
def
stash_all_changes
(
self
):
def
stash_all_changes
(
self
):
"""
"""
...
@@ -219,22 +236,21 @@ class BaseRepo:
...
@@ -219,22 +236,21 @@ class BaseRepo:
"""
"""
if
not
self
.
exist_unstaged_changes
:
if
not
self
.
exist_unstaged_changes
:
raise
RuntimeError
(
"
No changes in repo to stash.
"
)
raise
RuntimeError
(
"
No changes in repo to stash.
"
)
self
.
git
.
add
(
"
.
"
)
self
.
_
git
.
add
(
"
.
"
)
self
.
git
.
stash
()
self
.
_
git
.
stash
()
def
prepare_new_branch
(
self
,
branch_name
):
def
prepare_new_branch
(
self
,
branch_name
):
"""
"""
Prepares a new branch to recieve data. This includes:
Prepares a new branch to recieve data. This includes:
- creating the new branch,
- checking out the master branch,
- checking the new branch out, and
- creating a new branch from there
- resetting the HEAD of the branch to the initialization commit on the master branch.
This thereby produces a clear, empty directory for data, while still maintaining
This thereby produces a clear, empty directory for data, while still maintaining
.gitignore and .gitatributes
.gitignore and .gitatributes
:param branch_name:
:param branch_name:
Name of the new branch.
Name of the new branch.
"""
"""
self
.
git
.
checkout
(
'
-b
'
,
branch_name
)
# equivalent to $ git checkout -b %branch_name
self
.
_
git
.
checkout
(
"
master
"
)
self
.
git
.
reset
(
'
--hard
'
,
self
.
earliest_commit
)
# equivalent to $ git reset --hard %commit_hash
self
.
_
git
.
checkout
(
'
-b
'
,
branch_name
)
# equivalent to $ git checkout -b %branch_name
def
apply_stashed_changes
(
self
):
def
apply_stashed_changes
(
self
):
"""
"""
...
@@ -243,7 +259,7 @@ class BaseRepo:
...
@@ -243,7 +259,7 @@ class BaseRepo:
All other errors are raised.
All other errors are raised.
"""
"""
try
:
try
:
self
.
git
.
stash
(
'
pop
'
)
# equivalent to $ git stash pop
self
.
_
git
.
stash
(
'
pop
'
)
# equivalent to $ git stash pop
except
git
.
exc
.
GitCommandError
as
e
:
except
git
.
exc
.
GitCommandError
as
e
:
# Will raise error because the stash cannot be applied without conflicts. This is expected
# Will raise error because the stash cannot be applied without conflicts. This is expected
if
'
CONFLICT (modify/delete)
'
in
e
.
stdout
:
if
'
CONFLICT (modify/delete)
'
in
e
.
stdout
:
...
@@ -291,6 +307,7 @@ class ProjectRepo(BaseRepo):
...
@@ -291,6 +307,7 @@ class ProjectRepo(BaseRepo):
self
.
_output_repo
=
ResultsRepo
(
os
.
path
.
join
(
self
.
working_dir
,
self
.
_output_folder
))
self
.
_output_repo
=
ResultsRepo
(
os
.
path
.
join
(
self
.
working_dir
,
self
.
_output_folder
))
self
.
_on_context_enter_commit_hash
=
None
self
.
_on_context_enter_commit_hash
=
None
self
.
_is_in_context_manager
=
False
@property
@property
def
output_repo
(
self
):
def
output_repo
(
self
):
...
@@ -313,13 +330,13 @@ class ProjectRepo(BaseRepo):
...
@@ -313,13 +330,13 @@ class ProjectRepo(BaseRepo):
Checkout the master branch, which contains all the log files.
Checkout the master branch, which contains all the log files.
"""
"""
self
.
_most_recent_branch
=
self
.
_output_repo
.
active_branch
.
name
self
.
_most_recent_branch
=
self
.
_output_repo
.
active_branch
.
name
self
.
_output_repo
.
git
.
checkout
(
"
master
"
)
self
.
_output_repo
.
_
git
.
checkout
(
"
master
"
)
def
reload_recent_results
(
self
):
def
reload_recent_results
(
self
):
"""
"""
Checkout the most recent previous branch.
Checkout the most recent previous branch.
"""
"""
self
.
_output_repo
.
git
.
checkout
(
self
.
_most_recent_branch
)
self
.
_output_repo
.
_
git
.
checkout
(
self
.
_most_recent_branch
)
def
update_output_master_logs
(
self
):
def
update_output_master_logs
(
self
):
"""
"""
...
@@ -331,7 +348,7 @@ class ProjectRepo(BaseRepo):
...
@@ -331,7 +348,7 @@ class ProjectRepo(BaseRepo):
output_repo_hash
=
str
(
self
.
_output_repo
.
head
.
commit
)
output_repo_hash
=
str
(
self
.
_output_repo
.
head
.
commit
)
self
.
_output_repo
.
git
.
checkout
(
"
master
"
)
self
.
_output_repo
.
_
git
.
checkout
(
"
master
"
)
json_filepath
=
os
.
path
.
join
(
self
.
working_dir
,
self
.
_output_folder
,
f
"
{
output_branch_name
}
.json
"
)
json_filepath
=
os
.
path
.
join
(
self
.
working_dir
,
self
.
_output_folder
,
f
"
{
output_branch_name
}
.json
"
)
# note: if filename of "log.csv" is changed,
# note: if filename of "log.csv" is changed,
...
@@ -363,13 +380,30 @@ class ProjectRepo(BaseRepo):
...
@@ -363,13 +380,30 @@ class ProjectRepo(BaseRepo):
with
open
(
csv_filepath
,
"
a
"
)
as
f
:
with
open
(
csv_filepath
,
"
a
"
)
as
f
:
f
.
write
(
csv_data
+
"
\n
"
)
f
.
write
(
csv_data
+
"
\n
"
)
self
.
_output_repo
.
git
.
add
(
"
.
"
)
self
.
_output_repo
.
_
git
.
add
(
"
.
"
)
self
.
_output_repo
.
git
.
commit
(
"
-m
"
,
output_branch_name
)
self
.
_output_repo
.
_
git
.
commit
(
"
-m
"
,
output_branch_name
)
self
.
_output_repo
.
git
.
checkout
(
output_branch_name
)
self
.
_output_repo
.
_
git
.
checkout
(
output_branch_name
)
self
.
_most_recent_branch
=
output_branch_name
self
.
_most_recent_branch
=
output_branch_name
def
cache_previous_results
(
self
,
branch_name
,
file_path
):
def
load_external_data
(
self
,
url
,
name
=
None
,
path
=
None
,
branch
=
None
,
commit
=
None
):
"""
name: str,
path: PathLike,
url: Union[str, None] = None,
branch: Union[str, None] = None,
"""
if
path
is
None
:
repo_name
=
url
.
split
(
"
/
"
)[
-
1
]
path
=
os
.
path
.
join
(
"
external_repos
"
,
repo_name
)
if
name
is
None
:
name
=
url
.
split
(
"
/
"
)[
-
1
]
self
.
_git_repo
.
create_submodule
(
name
=
name
,
url
=
url
,
branch
=
branch
,
path
=
path
)
if
commit
is
not
None
:
submodule
=
BaseRepo
(
path
)
submodule
.
_git
.
checkout
(
commit
)
def
load_previous_results
(
self
,
branch_name
,
file_path
):
"""
"""
Load previously generated results to iterate upon.
Load previously generated results to iterate upon.
:param branch_name:
:param branch_name:
...
@@ -386,7 +420,7 @@ class ProjectRepo(BaseRepo):
...
@@ -386,7 +420,7 @@ class ProjectRepo(BaseRepo):
has_stashed_changes
=
False
has_stashed_changes
=
False
previous_branch
=
self
.
output_repo
.
active_branch
.
name
previous_branch
=
self
.
output_repo
.
active_branch
.
name
self
.
output_repo
.
git
.
checkout
(
branch_name
)
self
.
output_repo
.
_
git
.
checkout
(
branch_name
)
source_filepath
=
os
.
path
.
join
(
self
.
output_repo
.
working_dir
,
file_path
)
source_filepath
=
os
.
path
.
join
(
self
.
output_repo
.
working_dir
,
file_path
)
...
@@ -398,7 +432,7 @@ class ProjectRepo(BaseRepo):
...
@@ -398,7 +432,7 @@ class ProjectRepo(BaseRepo):
shutil
.
copyfile
(
source_filepath
,
target_filepath
)
shutil
.
copyfile
(
source_filepath
,
target_filepath
)
self
.
output_repo
.
git
.
checkout
(
previous_branch
)
self
.
output_repo
.
_
git
.
checkout
(
previous_branch
)
if
has_stashed_changes
:
if
has_stashed_changes
:
self
.
output_repo
.
apply_stashed_changes
()
self
.
output_repo
.
apply_stashed_changes
()
...
@@ -446,6 +480,7 @@ class ProjectRepo(BaseRepo):
...
@@ -446,6 +480,7 @@ class ProjectRepo(BaseRepo):
"""
"""
self
.
test_for_uncommitted_changes
()
self
.
test_for_uncommitted_changes
()
self
.
_on_context_enter_commit_hash
=
self
.
current_commit_hash
self
.
_on_context_enter_commit_hash
=
self
.
current_commit_hash
self
.
_is_in_context_manager
=
True
output_repo
=
self
.
output_repo
output_repo
=
self
.
output_repo
if
output_repo
.
exist_unstaged_changes
:
if
output_repo
.
exist_unstaged_changes
:
...
@@ -472,13 +507,15 @@ class ProjectRepo(BaseRepo):
...
@@ -472,13 +507,15 @@ class ProjectRepo(BaseRepo):
raise
RuntimeError
(
"
Code has changed since starting the context. Don
'
t do that.
"
)
raise
RuntimeError
(
"
Code has changed since starting the context. Don
'
t do that.
"
)
print
(
"
Completed computations, commiting results
"
)
print
(
"
Completed computations, commiting results
"
)
self
.
output_repo
.
git
.
add
(
"
.
"
)
self
.
output_repo
.
_
git
.
add
(
"
.
"
)
commit_return
=
self
.
output_repo
.
git
.
commit
(
"
-m
"
,
message
)
commit_return
=
self
.
output_repo
.
_
git
.
commit
(
"
-m
"
,
message
)
print
(
"
\n
"
+
commit_return
+
"
\n
"
)
print
(
"
\n
"
+
commit_return
+
"
\n
"
)
self
.
update_output_master_logs
()
self
.
update_output_master_logs
()
self
.
remove_cached_files
()
self
.
remove_cached_files
()
self
.
_is_in_context_manager
=
False
self
.
_on_context_enter_commit_hash
=
None
@contextlib.contextmanager
@contextlib.contextmanager
def
track_results
(
self
,
results_commit_message
:
str
,
debug
=
False
):
def
track_results
(
self
,
results_commit_message
:
str
,
debug
=
False
):
...
...
This diff is collapsed.
Click to expand it.
tests/test_git_adapter.py
+
14
−
5
View file @
1291de1f
...
@@ -47,7 +47,7 @@ def modify_code(path_to_repo):
...
@@ -47,7 +47,7 @@ def modify_code(path_to_repo):
def
count_commit_number
(
repo
):
def
count_commit_number
(
repo
):
commit_log
=
repo
.
git
.
log
(
"
--oneline
"
).
split
(
"
\n
"
)
commit_log
=
repo
.
_
git
.
log
(
"
--oneline
"
).
split
(
"
\n
"
)
current_commit_number
=
len
(
commit_log
)
current_commit_number
=
len
(
commit_log
)
return
current_commit_number
return
current_commit_number
...
@@ -86,6 +86,12 @@ def try_commit_code(path_to_repo):
...
@@ -86,6 +86,12 @@ def try_commit_code(path_to_repo):
assert
current_commit_number
+
1
==
updated_commit_number
assert
current_commit_number
+
1
==
updated_commit_number
def
try_add_submodule
(
path_to_repo
):
repo
=
ProjectRepo
(
path_to_repo
)
repo
.
load_external_data
(
"
https://jugit.fz-juelich.de/IBG-1/ModSim/cadet/git_lfs_data_1
"
)
# ToDo: current WIP
def
try_commit_code_without_code_changes
(
path_to_repo
):
def
try_commit_code_without_code_changes
(
path_to_repo
):
repo
=
ProjectRepo
(
path_to_repo
)
repo
=
ProjectRepo
(
path_to_repo
)
current_commit_number
=
count_commit_number
(
repo
)
current_commit_number
=
count_commit_number
(
repo
)
...
@@ -116,8 +122,8 @@ def try_commit_results_with_uncommitted_code_changes(path_to_repo):
...
@@ -116,8 +122,8 @@ def try_commit_results_with_uncommitted_code_changes(path_to_repo):
def
try_load_previous_result
(
path_to_repo
,
branch_name
):
def
try_load_previous_result
(
path_to_repo
,
branch_name
):
repo
=
ProjectRepo
(
path_to_repo
)
repo
=
ProjectRepo
(
path_to_repo
)
with
repo
.
track_results
(
results_commit_message
=
"
Load array and extend
"
):
with
repo
.
track_results
(
results_commit_message
=
"
Load array and extend
"
):
cached_array_path
=
repo
.
cache
_previous_results
(
branch_name
=
branch_name
,
cached_array_path
=
repo
.
load
_previous_results
(
branch_name
=
branch_name
,
file_path
=
"
result.csv
"
)
file_path
=
"
result.csv
"
)
previous_array
=
np
.
loadtxt
(
cached_array_path
,
delimiter
=
"
,
"
)
previous_array
=
np
.
loadtxt
(
cached_array_path
,
delimiter
=
"
,
"
)
extended_array
=
np
.
concatenate
([
previous_array
,
previous_array
])
extended_array
=
np
.
concatenate
([
previous_array
,
previous_array
])
extended_array_file_path
=
os
.
path
.
join
(
path_to_repo
,
repo
.
_output_folder
,
"
extended_result.csv
"
)
extended_array_file_path
=
os
.
path
.
join
(
path_to_repo
,
repo
.
_output_folder
,
"
extended_result.csv
"
)
...
@@ -131,16 +137,19 @@ def try_load_previous_result(path_to_repo, branch_name):
...
@@ -131,16 +137,19 @@ def try_load_previous_result(path_to_repo, branch_name):
def
try_add_remote
(
path_to_repo
):
def
try_add_remote
(
path_to_repo
):
repo
=
ProjectRepo
(
path_to_repo
)
repo
=
ProjectRepo
(
path_to_repo
)
repo
.
add_remote
(
"
git@jugit.fz-juelich.de:IBG-1/ModSim/cadet/CADET-RDM.git
"
)
repo
.
add_remote
(
"
git@jugit.fz-juelich.de:IBG-1/ModSim/cadet/CADET-RDM.git
"
)
assert
"
origin
"
in
repo
.
git_repo
.
remotes
assert
"
origin
"
in
repo
.
_
git_repo
.
remotes
def
test_cadet_rdm
(
path_to_repo
):
def
test_cadet_rdm
(
path_to_repo
):
# because these depend on one-another and there is no native support afaik for sequential tests
# because these depend on one-another and there is no native support afaik for sequential tests
# these tests are called sequentially here as try_ functions.
# these tests are called sequentially here as try_ functions.
try_initialize_git_repo
(
path_to_repo
)
try_initialize_git_repo
(
path_to_repo
)
try_add_remote
(
path_to_repo
)
try_add_remote
(
path_to_repo
)
# try_add_submodule(path_to_repo)
try_commit_code
(
path_to_repo
)
try_commit_code
(
path_to_repo
)
try_commit_code_without_code_changes
(
path_to_repo
)
try_commit_code_without_code_changes
(
path_to_repo
)
results_branch_name
=
try_commit_results_data
(
path_to_repo
)
try_commit_results_with_uncommitted_code_changes
(
path_to_repo
)
try_commit_results_with_uncommitted_code_changes
(
path_to_repo
)
results_branch_name
=
try_commit_results_data
(
path_to_repo
)
try_load_previous_result
(
path_to_repo
,
results_branch_name
)
try_load_previous_result
(
path_to_repo
,
results_branch_name
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment