Skip to content

Commit

Permalink
Merge pull request #190 from MoSHad91/review_mo
Browse files Browse the repository at this point in the history
Initial pull request focused on integrating pre-commit and addressing several minor issues.
  • Loading branch information
mo-dkrz authored May 13, 2024
2 parents caaa43a + 21c91d2 commit a76fbb5
Show file tree
Hide file tree
Showing 84 changed files with 963 additions and 430 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# .coveragerc to control coverage.py
[run]
branch = True
omit = .converage*
omit = .coverage*
[report]
# Regexes for lines to exclude from consideration
exclude_lines =
Expand Down
6 changes: 3 additions & 3 deletions .docker/evaluation_system.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# This file contains the necessary configuration information
# which is needed to run freva
#
# Username(s) - comma separated - of the admins of the proejct
# Username(s) - comma separated - of the admins of the project
admins=
#
# An Infromative project name
# An Informative project name
project_name=freva
# The url the freva web ui can be accessed with
project_website=
Expand All @@ -15,7 +15,7 @@ project_website=
# of the python environment
root_dir=
#
# The location of the work direcotry for is user specific data
# The location of the work directory for is user specific data
base_dir_location=/usr/freva_output
#

Expand Down
4 changes: 1 addition & 3 deletions .docker/freva
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ else
solr_pid=$(cat ${solr_pid})
fi
if ! ps -p $mysql_pid > /dev/null;then
mysqld_safe &> /dev/null &
mysqld_safe &> /dev/null &
fi

if ! ps -p $solr_pid > /dev/null;then
Expand All @@ -27,5 +27,3 @@ fi
/usr/bin/git config --global user.name "Freva" &> /dev/null
export PATH=/opt/evaluation_system/bin:$PATH
exec /opt/evaluation_system/bin/freva "$@"


Loading

0 comments on commit a76fbb5

Please sign in to comment.