diff --git a/UPGRADING.rst b/UPGRADING.rst index 7bb33f39d..ad687981e 100644 --- a/UPGRADING.rst +++ b/UPGRADING.rst @@ -347,7 +347,7 @@ List of changes since the *CONFIG_VERSION* numbering was introduced: # directory in which necessary files will be stored. #FILETRACKER_CACHE_ROOT = '__DIR__/cache' - # When using a remote storage it's recommended to enable a cache cleaner deamon + # When using a remote storage it's recommended to enable a cache cleaner daemon # which will periodically scan cache directory and remove files what aren't # used. For a detailed description of each option, please read a cache cleaner # configuration section in the sioworkersd documentation. @@ -439,7 +439,7 @@ List of changes since the *CONFIG_VERSION* numbering was introduced: -# Filetracker server settings. -# - -# Determines which filetracker database use, availible options are: + -# Determines which filetracker database use, available options are: -# - 'oioioi.filetracker.client.media_root_factory' (the default) -# Stores files on local filesystem under MEDIA_ROOT, optionally -# exposing them with a filetracker server (see section below). @@ -588,7 +588,7 @@ List of changes since the *CONFIG_VERSION* numbering was introduced: # 'oioioi.usergroups', -#. * Introduced `DEFAULT_COMPILERS` to settings, which should be set for every language supoorted:: +#. * Introduced `DEFAULT_COMPILERS` to settings, which should be set for every language supported:: --- a/oioioi/default_settings.py +++ b/oioioi/default_settings.py @@ -896,7 +896,7 @@ List of changes since the *CONFIG_VERSION* numbering was introduced: +# The server to be run. Options are: +# 'django' - django's http server +# 'uwsgi' - uwsgi daemon - +# 'uwsgi-http' - uwsgi deamon with built-in http server + +# 'uwsgi-http' - uwsgi daemon with built-in http server +# None - nothing will be run +SERVER = 'django' diff --git a/extra/sample-configs/runnable-test-settings.py b/extra/sample-configs/runnable-test-settings.py index 42d00dd72..b85791899 100644 --- a/extra/sample-configs/runnable-test-settings.py +++ b/extra/sample-configs/runnable-test-settings.py @@ -37,7 +37,7 @@ # # -# To workarund a bug, where sioworkers is not passed +# To workaround a bug, where sioworkers is not passed # FILETRACKER_CACHE_ROOT, use this to start the website: # # FILETRACKER_URL=/tmp/oioioi-filetracker-cache ./manage.py runserver diff --git a/oioioi/base/templates/registration/delete_account_done.html b/oioioi/base/templates/registration/delete_account_done.html index d29355c14..0c126a8bb 100644 --- a/oioioi/base/templates/registration/delete_account_done.html +++ b/oioioi/base/templates/registration/delete_account_done.html @@ -1,11 +1,11 @@ {% extends "simple-centered.html" %} {% load i18n %} -{% block title %}{% trans "Account succesfully deleted" %}{% endblock %} +{% block title %}{% trans "Account successfully deleted" %}{% endblock %} {% block content %}
-

{% trans "Account succesfully deleted" %}

-

{% trans "Your account has been succesfully deleted" %}

+

{% trans "Account successfully deleted" %}

+

{% trans "Your account has been successfully deleted" %}

{% endblock %} diff --git a/oioioi/base/utils/pdf.py b/oioioi/base/utils/pdf.py index 62cd69504..d9f539f6f 100644 --- a/oioioi/base/utils/pdf.py +++ b/oioioi/base/utils/pdf.py @@ -41,7 +41,7 @@ def generate_pdf(tex_code, filename, extra_args=None, num_passes=3): def extract_text_from_pdf(pdf_file): - # pdf_file must be a a file-like object + # pdf_file must be a file-like object # returns a list of strings, each string containing text from one page # the char_margin is needed because pdfminer.six has a problem diff --git a/oioioi/contests/middleware.py b/oioioi/contests/middleware.py index 99ec9fcc9..eab2d8bce 100644 --- a/oioioi/contests/middleware.py +++ b/oioioi/contests/middleware.py @@ -59,7 +59,7 @@ class CurrentContestMiddleware: Then, if there is no contest ID in a request's URL, but the URL also comes with a contest-specific version and a contest exists, a redirection is performed to one of the existing contests. Which one - it is is determined by the following algorithm: + it is determined by the following algorithm: #. If last contest is saved in session, this value is used. #. If the session value is not available or invalid, diff --git a/oioioi/default_settings.py b/oioioi/default_settings.py index 3cb2be490..5a9173f6c 100755 --- a/oioioi/default_settings.py +++ b/oioioi/default_settings.py @@ -39,7 +39,7 @@ # The server to be run. Options are: # 'django' - django's http server # 'uwsgi' - uwsgi daemon -# 'uwsgi-http' - uwsgi deamon with built-in http server +# 'uwsgi-http' - uwsgi daemon with built-in http server # 'none' - nothing will be ran SERVER = os.getenv('OIOIOI_SERVER_MODE', 'none') @@ -368,7 +368,7 @@ # this also defines the filetracker server oioioi should connect to. FILETRACKER_URL = os.getenv('FILETRACKER_URL', 'http://127.0.0.1:9999') -# When using a remote storage it's recommended to enable a cache cleaner deamon +# When using a remote storage it's recommended to enable a cache cleaner daemon # which will periodically scan cache directory and remove files what aren't # used. For a detailed description of each option, please read a cache cleaner # configuration section in the sioworkersd documentation. Please note that diff --git a/oioioi/deployment/settings.py.template b/oioioi/deployment/settings.py.template index 83e04118a..d53d0322a 100755 --- a/oioioi/deployment/settings.py.template +++ b/oioioi/deployment/settings.py.template @@ -38,7 +38,7 @@ ALLOWED_HOSTS = ['oioioi', '127.0.0.1', 'localhost', 'web'] # The server to be run. Options are: # 'django' - django's http server # 'uwsgi' - uwsgi daemon -# 'uwsgi-http' - uwsgi deamon with built-in http server +# 'uwsgi-http' - uwsgi daemon with built-in http server # 'none' - nothing will be ran # SERVER = 'none' @@ -257,7 +257,7 @@ AUTHENTICATION_BACKENDS += ( # in which the necessary files will be stored. FILETRACKER_CACHE_ROOT = '__DIR__/cache' -# When using a remote storage it's recommended to enable a cache cleaner deamon +# When using a remote storage it's recommended to enable a cache cleaner daemon # which will periodically scan cache directory and remove files what aren't # used. For a detailed description of each option, please read a cache cleaner # configuration section in the sioworkersd documentation. Please note that diff --git a/oioioi/evalmgr/tasks.py b/oioioi/evalmgr/tasks.py index a43c7b28c..289aea750 100644 --- a/oioioi/evalmgr/tasks.py +++ b/oioioi/evalmgr/tasks.py @@ -222,13 +222,13 @@ def _run_error_handlers(env, exc_info): # pylint: disable=broad-except except Exception: logger.error( - "Exception occured in job's error handlers:\n%s", + "Exception occurred in job's error handlers:\n%s", pprint.pformat(env, indent=4), exc_info=True, ) if not env.get("ignore_errors"): logger.error( - "Exception occured in job:\n%s", + "Exception occurred in job:\n%s", pprint.pformat(env, indent=4), exc_info=exc_info, ) diff --git a/oioioi/maintenancemode/middleware.py b/oioioi/maintenancemode/middleware.py index 683945ec9..1493da7ed 100644 --- a/oioioi/maintenancemode/middleware.py +++ b/oioioi/maintenancemode/middleware.py @@ -28,7 +28,7 @@ def _process_request(self, request): return None # If admin logged in as another user, the information who - # the real user is is stored in real_user + # the real user is stored in real_user if hasattr(request, "real_user"): if request.real_user.is_superuser: return None diff --git a/oioioi/notifications/static/common/notifications.js b/oioioi/notifications/static/common/notifications.js index c482e2e49..ba9b5a6f4 100644 --- a/oioioi/notifications/static/common/notifications.js +++ b/oioioi/notifications/static/common/notifications.js @@ -162,7 +162,7 @@ NotificationsClient.prototype.renderMessages = function () { this.dropdownLoading = false; this.HEADER_REFRESH_SPINNER.removeClass("spinner"); this.setErrorState(); - let text = gettext("A network error occured. Recent submissions list could not be loaded"); + let text = gettext("A network error occurred. Recent submissions list could not be loaded"); this.TABLE_NOTIFICATIONS.html( $("").addClass("dropdown-item-text").text(text) ); diff --git a/oioioi/problems/controllers.py b/oioioi/problems/controllers.py index 8a6b6bc95..d71a55529 100644 --- a/oioioi/problems/controllers.py +++ b/oioioi/problems/controllers.py @@ -114,7 +114,7 @@ def fill_evaluation_environ(self, environ, submission, **kwargs): """Fills a minimal environment with evaluation receipt and other values required by the evaluation machinery. - Passed ``environ`` should already contain entries for the actiual + Passed ``environ`` should already contain entries for the actual data to be judged (for example the source file to evaluate). Details on which keys need to be present should be specified by diff --git a/oioioi/problems/management/commands/create_mock_competition.py b/oioioi/problems/management/commands/create_mock_competition.py index 416110484..18c0fa000 100644 --- a/oioioi/problems/management/commands/create_mock_competition.py +++ b/oioioi/problems/management/commands/create_mock_competition.py @@ -323,7 +323,7 @@ ] -# Helper command, which finds the the smallest natural number n, such that +# Helper command, which finds the smallest natural number n, such that # no object from the model model_class has a field equal to [base_value]n. # This function is to be used for finding anyname that isn't # used in the database yet. diff --git a/oioioi/programs/views.py b/oioioi/programs/views.py index 568e03a94..5c3bc1c85 100644 --- a/oioioi/programs/views.py +++ b/oioioi/programs/views.py @@ -312,7 +312,7 @@ def _testreports_to_generate_outs(request, testreports): continue else: download_control.status = "?" - # invisible to the the user when first generated by the admin + # invisible to the user when first generated by the admin download_control.visible_for_user = not is_contest_basicadmin(request) download_control.save() diff --git a/oioioi/sinolpack/package.py b/oioioi/sinolpack/package.py index a3dc6609a..fb1cf89e1 100644 --- a/oioioi/sinolpack/package.py +++ b/oioioi/sinolpack/package.py @@ -932,7 +932,7 @@ def _get_memory_limit(self, created, name, group): @_describe_processing_error def _get_time_limit(self, created, name, group): - """If we find the time limit specified anywhere in in the ``config.yml`` + """If we find the time limit specified anywhere in the ``config.yml`` then we overwrite potential manual changes. The time limit is more important the more specific it is. diff --git a/oioioi/szkopul/settings.py b/oioioi/szkopul/settings.py index e51943f65..3404ebfa1 100644 --- a/oioioi/szkopul/settings.py +++ b/oioioi/szkopul/settings.py @@ -150,7 +150,7 @@ # directory in which necessary files will be stored. FILETRACKER_CACHE_ROOT = '/sio2/deployment/cache' -# When using a remote storage it's recommended to enable a cache cleaner deamon +# When using a remote storage it's recommended to enable a cache cleaner daemon # which will periodically scan cache directory and remove files what aren't # used. For a detailed description of each option, please read a cache cleaner # configuration section in the sioworkersd documentation. diff --git a/rst/source/sections/evaluation.rst b/rst/source/sections/evaluation.rst index bc75c3ae4..2e2bfb866 100644 --- a/rst/source/sections/evaluation.rst +++ b/rst/source/sections/evaluation.rst @@ -46,7 +46,7 @@ the evaluation process: An evaluation manager built on top of the celery_ system. It takes a task from `tasks queue` and processes it in loop as long as possible (until the - end of a recipe, or a job transfer). Tasks perfomed by evalmgr aren't cpu + end of a recipe, or a job transfer). Tasks performed by evalmgr aren't cpu consuming or blocking (such things are performed from `sioworkersd`), so `evalmgr` can be a single process on the same machine as `oioioi`. Instead it performs management steps like: @@ -63,7 +63,7 @@ the evaluation process: `Evalmgr` provides a web interface for tracking (and managing) current jobs, available at ``admin/evalmgr/queuedjob/``. Possible states are `Queued` (for - jobs waiting in `tasks queue`), `In progress` (for jobs currenlty processed + jobs waiting in `tasks queue`), `In progress` (for jobs currently processed by `evalmgr`), `Cancelled` (for jobs that have been canceled, but haven't been removed from system yet) and `Waiting` (for jobs sent from `evalmgr` to an external evaluation system like `sioworkersd`). There is a limited @@ -259,7 +259,7 @@ Simple environment generated when submission is being judged:: # Job identifier in celery system 'job_id': 'urn:uuid:2e9dd7f1-d58f-49bc-a2e3-a56dbab8047d', - # Name of web instance that created this enviroment + # Name of web instance that created this environment 'oioioi_instance': 'OIOIOI', # Basic informations about the submission itself @@ -317,7 +317,7 @@ Simple environment generated when submission is being judged:: {'suspend_init_tests': True}), # Steps 5-7, actual compilation ('compile' handler sends - # enviroment to sioworkersd) and checking its results + # environment to sioworkersd) and checking its results ('compile', 'oioioi.programs.handlers.compile'), ('compile_end', @@ -403,7 +403,7 @@ Simple environment generated when submission is being judged:: 'oioioi.evalmgr.handlers.dump_env', {'message': 'Finished evaluation'})], - # This handlers are run, when an error occures during evaluation, + # This handlers are run, when an error occurs during evaluation, # due to a bug in oioioi code. 'error_handlers': [ ('remove_queuedjob_on_error', @@ -459,32 +459,32 @@ For `sioworkersd` transfer function is defined as Way of a typical submission ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Scheme that a typical submission follows (components responsible for enviroment +Scheme that a typical submission follows (components responsible for environment during each step are written in **bold**) is: 1. **oioioi**, `filetracker` - A user submits a solution, a new evaluation enviroment is created. + A user submits a solution, a new evaluation environment is created. 2. `oioioi`, **tasks queue** - Fresh `enviroment` gets to the `tasks queue`, where it waits for being + Fresh `environment` gets to the `tasks queue`, where it waits for being processed. 3. `tasks queue`, **evalmgr** - `Evalmgr` takes `enviroment` from the `tasks queue` and processes handlers + `Evalmgr` takes `environment` from the `tasks queue` and processes handlers from its `recipe` in a loop. It prepares the submission for compilation. 4. `evalmgr`, **sioworkersd** - `Evalmgr` transfers `enviroment` to `sioworkersd`. + `Evalmgr` transfers `environment` to `sioworkersd`. 5. **sioworkersd**, `workers`, `filetracker` - `Sioworkersd` creates a compilation task from the `enviroment` and runs + `Sioworkersd` creates a compilation task from the `environment` and runs it on some free `worker`. The resulting binary is inserted into - `filetracker` database and `enviroment` is updated with compilation results. + `filetracker` database and `environment` is updated with compilation results. 6. `sioworkersd`, `receive_from_workers`, **tasks queue** @@ -501,7 +501,7 @@ during each step are written in **bold**) is: 8. **evalmgr** - `Evalmgr` continues processing `enviroment`, now preparing it for running + `Evalmgr` continues processing `environment`, now preparing it for running the initial tests. 9. `evalmgr`, **sioworkersd** @@ -526,9 +526,9 @@ during each step are written in **bold**) is: 13. `tasks queue`, **evalmgr** - `Evalmgr` takes `enviroment` from the `tasks queue` again. It saves + `Evalmgr` takes `environment` from the `tasks queue` again. It saves initial tests results in the database and optionally emits a notification - to the user. Then it prepares the `enviroment` for running final tests. + to the user. Then it prepares the `environment` for running final tests. 14-17. `evalmgr`, **sioworkersd**, `receive_from_workers`, **tasks queue** @@ -537,6 +537,6 @@ during each step are written in **bold**) is: 18. `tasks queue`, **evalmgr** - `Evalmgr` takes `enviroment` from the `tasks queue` once again. Results + `Evalmgr` takes `environment` from the `tasks queue` once again. Results from final tests are saved into the database and optionally a notification - is emitted. The submission has been succesfully judged. + is emitted. The submission has been successfully judged. diff --git a/rst/source/sections/filestorage.rst b/rst/source/sections/filestorage.rst index bcc16ed80..e0d3d1c5e 100644 --- a/rst/source/sections/filestorage.rst +++ b/rst/source/sections/filestorage.rst @@ -14,7 +14,7 @@ Filetracker in Django .. _Django files docs: https://docs.djangoproject.com/en/dev/topics/files/ Most of the `Django files docs`_ still apply. The only difference is that we -use our custom model field and storage manager, as specified in ``settngs.py``:: +use our custom model field and storage manager, as specified in ``settings.py``:: DEFAULT_FILE_STORAGE = 'oioioi.filetracker.storage.FiletrackerStorage' @@ -37,7 +37,7 @@ it like this:: def make_test_filename(instance, filename): # instance will be an instance of Test # filename will be the name of the file uploaded by the user - # or passed programatically to instance.input_file.save() + # or passed programmatically to instance.input_file.save() return 'problems/%d/%s' % (instance.problem.id, get_valid_filename(os.path.basename(filename)))