Skip to content
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.

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

Bugfix: Prevent Error 500 and Update README.md mentioning new dependencies and pitfalls after merge of "feature boxplot-taskstatistic" #352

Open
wants to merge 146 commits into
base: master
Choose a base branch
from

Conversation

ifrh
Copy link
Contributor

@ifrh ifrh commented Aug 19, 2022

@ratefuchs : Most of changes in 25 files are orthography fixes. But there are some functional fixes to.

  1. Insert information about new dependencies introduced by merging "feature boxplot-taskstatistic" ( Feature boxplot taskstatistic #345 ) .
  2. Update README.md to give more information about installation steps : Fixes Configuration of deployment installation #250 .
  3. Fix some orthography errors in multiple files.
  4. To let GitHub-Actions successfully test Praktomat-Code , I merged into hbrs_public changes from
  1. Repair some how broken commit-history depending on former hbrs_changes and newer hbrs_public branch, but no current file change has its reason in this point.

[ Edit : 6.9.2022:
6. Additional commit a bugfix to prevent an Error 500 while running TaskAdmin.run_all_uploadtime_checkers_on_all, see ifrh@af7cff1 ]

Robert Hartmann (H-BRS,FB02) added 30 commits January 28, 2016 17:33
Signed-off-by: Robert Hartmann (H-BRS,FB02) <[email protected]>
Conflicts:
	setup.py
	src/checker/checker/__init__.py

choose 'HBRS_2013w/master'

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
…HBRS_Merge_Local

Conflicts:
	src/checker/checker/DiffChecker.py
	src/checker/checker/__init__.py
	src/settings_local.py

using versions from 'HBRS_2013w/HBRS_2013w_production' with small modifications

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
…Local

Conflicts:
	src/accounts/views.py
	src/checker/checker/AutoAttestChecker.py
	src/checker/checker/DiffChecker.py
	src/settings_local.py

using 'HBRS_2014s/HBRS_2014s' with small modifications

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
…Local

Conflicts:
	src/accounts/views.py
	src/checker/checker/AutoAttestChecker.py
	src/checker/checker/DiffChecker.py
	src/settings_local.py

using 'HBRS_2014w/HBRS_2014w' with small modifications

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
…to HBRS_Merge_Local

Conflicts:
	src/accounts/views.py
	src/checker/checker/AutoAttestChecker.py
	src/checker/checker/DiffChecker.py
	src/checker/scripts/javac
	src/settings_local.py

using 'HBRS_2014_15_test/HBRS_2014_15_test' with small modifications

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
…Local

Conflicts:
	src/accounts/views.py
	src/checker/checker/AutoAttestChecker.py
	src/checker/checker/DiffChecker.py
	src/checker/scripts/javac
	src/settings_local.py

using 'HBRS_2015s/HBRS_2015s' with small modifications

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
…S_Merge_Local

Conflicts:
	src/accounts/views.py
	src/checker/checker/AutoAttestChecker.py
	src/checker/checker/DiffChecker.py
	src/checker/scripts/java.policy
	src/checker/scripts/junit.policy
	src/settings_local.py

using 'HBRS_2015w-bcs/HBRS_2015w-bcs' with small modifications ...

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
…o HBRS_Merge_Local

Conflicts:
	src/accounts/views.py
	src/checker/checker/AutoAttestChecker.py
	src/checker/checker/DiffChecker.py
	src/checker/scripts/junit.policy
	src/settings_local.py

using 'HBRS_2015w-bcs-practice' with small modifications
…S_Merge_Local

Conflicts:
	src/accounts/views.py
	src/checker/checker/AutoAttestChecker.py
	src/checker/checker/DiffChecker.py
	src/checker/scripts/junit.policy
	src/settings_local.py

using 'HBRS_2015w-bis/HBRS_2015w-bis' with small modifications

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
Conflicts:
	.gitmodules

changes url for ace-submodule from  git: via http: to https: to become http_proxy compatible ...
…Local

Conflicts:
	.gitmodules
	src/accounts/admin.py
	src/accounts/urls.py
	src/accounts/views.py
	src/checker/checker/DiffChecker.py
	src/checker/checker/JUnitChecker.py
	src/checker/checker/__init__.py
	src/checker/compiler/JavaBuilder.py
	src/checker/compiler/__init__.py
	src/checker/models.py
	src/checker/scripts/java.policy
	src/checker/scripts/javac
	src/settings.py
	src/settings_local.py
	src/tasks/views.py
	src/templates/500.html
	src/templates/base.html
	src/templates/registration/login.html
	src/templates/tasks/task_list.html
# FIXME - see KITPraktomat Bugreport nr 221
# KITPraktomatTeam#221

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
…and insert newer DJANGO-Migration files"

Thanks to Stephan :-)

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
…/settings/local.py, src/settings/test.py

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
If new SolutionNumber has more position than the old SolutionNumber
the filename in Sandbox got damaged: i.e:
SolutionArchive/[...]/Solution_9993/AlgoSchlange.java
SolutionSandbox/[...]/Solution_10039/lgoSchlange.java

Solved by using regular-expression in path-method in solution/models.py

Signed-off-by: Robert Hartmann (FB02, H-BRS) <[email protected]>
Robert Hartmann (FB02, H-BRS) and others added 13 commits February 26, 2021 20:40
…public'

merge of old "hbrs_change" into new "hbrs_public" is possible because of revert like commit de5ab7f : there is no file change set.

See merge request rhartm2m/praktomat_hbrs!27
…c (15.8.2022)

Conflicts:
	README.md
	requirements.txt
	src/accounts/ldap_auth.py
	src/checker/checker/CUnitChecker_v2.py
	src/checker/checker/__init__.py
	src/checker/compiler/Builder.py
	src/checker/compiler/CLinker.py
	src/checker/migrations/0013_javachecker.py
	src/settings/defaults.py
	src/solutions/views.py
	src/tasks/admin.py
	src/utilities/safeexec.py
…nesbraun/fix-trainer-upload-permission' and 'hannesbraun/update-gh-actions' into hbrs_public
…ture boxplot-taskstatistic.

fix some orthography mistakes
adding missed migration files
…d by merging "feature boxplot-taskstatistic" ( KITPraktomatTeam#345 )  .

Update README.md to give more information about installation steps : Fixes KITPraktomatTeam#250 .

Include change sets from KITPraktomatTeam#351 , KITPraktomatTeam#349 , KITPraktomatTeam#348
... forgotten to correct path-information in section where "populating the database" is described via running "manage-local.py" .
Copy link
Contributor

@hannesbraun hannesbraun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed some left over comments and typos. Nothing big though. Otherwise, this looks good :)

Copy link
Contributor

@hannesbraun hannesbraun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great :)

Btw, sorry for the occasional nitpicking

ifrh added 3 commits September 1, 2022 22:55
befor match.group('tba') could asked, match has not to be None.
caling method run_all_uploadtime_checkers_on_all when there is only one solution generates an Error 500.
@ifrh ifrh changed the title Update README.md mentioning new dependencies and pitfalls after merge of "feature boxplot-taskstatistic" Bugfix: Prevent Error 500 and Update README.md mentioning new dependencies and pitfalls after merge of "feature boxplot-taskstatistic" Sep 6, 2022
a third party C extension module for Python has been used which will not run correctly within any additional sub interpreters created by Python. So here we change configuration to force our WSGI application to run within the first interpreter. The consequence is: Any WSGI applications in the global application group will always be executed within the context of the first interpreter created by Python when it is initialised, of the process handling the request. See ISSUE KITPraktomatTeam#353
@ifrh
Copy link
Contributor Author

ifrh commented Sep 8, 2022

@ratefuchs : This pull-request contains additionaly commit ifrh@67453af
With that commit the apache macro Praktomat/documentation/apache_praktomat_wsgi.conf did not produce
Fatal Python error : _PyInterpreterState_DeleteExceptMain: not main interpreter
while running pool.map(check_it, solutions, 1) in check_muliple from checker.basemodels , mentioned in ISSUE #353

__
Edit: 15.09.2022 : correct path information in this message.

@ifrh ifrh requested a review from hannesbraun September 8, 2022 23:27
@ifrh
Copy link
Contributor Author

ifrh commented Sep 12, 2022

This fixes issue #353

Copy link
Contributor

@physikerwelt physikerwelt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At a first glance it looks good. However, this is a massive pull requests. I can't formally review it. Maybe it would make sense to have one PR for typos and one for each feature?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Configuration of deployment installation
3 participants