fix: Bump old deps, fix tests (#361)

* fix: Bump old deps, fix tests
* fix: Update Flake8 autochecker
* fix: pytest's spaces format
* ci: Update cr-checks.yml
* chore: Pin deps
* chore: Bump some more versions in CI/CD
* fix: flake8 errors (until we merge this huge diff)
* fix: Hopefully we're done (temp. disable git)

Co-authored-by: Gal Singer <gal432@gmail.com>

Author: yammesicka

.github/workflows/cr-checks.yml

@@ -9,14 +9,14 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.8
+    - name: Set up Python 3.12
       uses: actions/setup-python@v1
       with:
-        python-version: 3.8
+        python-version: 3.12
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -27,7 +27,7 @@ jobs:
         chmod +x /opt/vnu/vnu-runtime-image/bin/vnu
     - name: Lint
       run: |
-        flake8 lms --count --show-source --statistics
+        flake8 lms --ignore Q000,I202,W503,S101,I100,I101,E800 --import-order-style=google --count --show-source --statistics
     - name: Test
       run: |
         export PYTHONPATH=`pwd`

.gitignore

@@ -136,3 +136,4 @@ lms/lmsweb/config.py
 db.sqlite
 vim.session
 devops/rabbitmq.cookie
+our.db

README.md

@@ -9,20 +9,26 @@
 
 👋 Welcome to Python course learning management system. 🐍
 
-The system objectives - 
+The system objectives -
+
 1. Allow teachers and mentors to input exercises list and provide feedback/comments to students exercises solutions.
 2. Allow students to load their exercises solutions and get feedback to their work.
 
 ## Creating development environment
+
 ### Prerequisites
+
 1. Linux based system - either [WSL on windows](https://docs.microsoft.com/en-us/windows/wsl/install-win10) or full blown linux.
-2. [Python](https://www.python.org/downloads/release/python-385/) 
+2. [Python](https://www.python.org/downloads/release/python-385/)
 3. [Docker](https://docs.docker.com/docker-for-windows/install/) and docker-compose.
 
+
 ### Minimal setup
-This setup is for debug purposes and will use sqlite database and frontend only.
+
+This setup is for debug purposes and will use SQLite database and frontend only.
 
 Steps to do:
+
 1. Clone this repository.
 2. Set environment variables.
 3. Run the application.
@@ -48,7 +54,9 @@ After logging in, use [localhost admin](https://127.0.0.1:5000/admin) to modify
 
 
 ### Full setup
+
 This setup will create the following items:
+
 * Application - LMS code.
 * Middleware (messaging queue) - RabbitMQ.
 * Persistence database - PostgreSQL.
@@ -70,7 +78,8 @@ cd devops
 ```
 
 In case you want to add the stub data to PostgreSQL DB, run:
-```
+
+```bash
 docker exec -it lms_http_1 bash
 python lmsdb/bootstrap.py
 ```
@@ -86,17 +95,23 @@ In case you want to enable the mail system:
 
 
 ## Code modification check list
-### Run flake8 
-```
+
+## Run flake8
+
+```bash
 # on lms root directory
 flake8 lms
 ```
+
 ### Run tests
-```
+
+```bash
 export PYTHONPATH=`pwd`
 pip install -r requirements.txt
 pip install -r dev_requirements.txt
 py.test -vvv
 ```
+
 ### Contributing
+
 View [contributing guidelines](https://github.com/PythonFreeCourse/lms/blob/master/CONTRIBUTING.md).

dev_requirements.txt

@@ -1,4 +1,4 @@
-debugpy==1.4.3
-ipdb==0.13.9
-pytest-cov==2.12.1
-pytest-env==0.6.2
+debugpy==1.8.1
+ipdb==0.13.13
+pytest-cov==4.1.0
+pytest-env==1.1.3

devops/lms.yml

@@ -21,7 +21,7 @@ services:
       - lms
 
   rabbitmq:
-    image: rabbitmq:3.9-management-alpine
+    image: rabbitmq:3.12-management-alpine
     hostname: celery-mq
     volumes:
       - rabbit-data-volume:/var/lib/rabbitmq
@@ -130,7 +130,6 @@ volumes:
   rabbit-data-volume:
   repositories-data-volume:
 
-
 networks:
   lms:
     external:

lms/lmsdb/models.py

@@ -247,14 +247,15 @@ def __str__(self):
 @pre_save(sender=User)
 def on_save_handler(model_class, instance, created):
     """Hash password on creation/save."""
+    supported_hashing = ('pbkdf2:sha256', 'scrypt:')
 
     # If password changed then it won't start with hash's method prefix
-    is_password_changed = not instance.password.startswith('pbkdf2:sha256')
+    is_password_changed = not instance.password.startswith(supported_hashing)
     if created or is_password_changed:
         instance.password = generate_password_hash(instance.password)
         instance.uuid = uuid4()
 
-    is_api_key_changed = not instance.api_key.startswith('pbkdf2:sha256')
+    is_api_key_changed = not instance.api_key.startswith(supported_hashing)
     if created or is_api_key_changed:
         if not instance.api_key:
             instance.api_key = model_class.random_password()
@@ -563,9 +564,7 @@ class Solution(BaseModel):
     )
 
     @property
-    def solution_files(
-            self,
-    ) -> Union[Iterable['SolutionFile'], 'SolutionFile']:
+    def solution_files(self) -> Iterable["SolutionFile"]:
         return SolutionFile.filter(SolutionFile.solution == self)
 
     @property
@@ -707,8 +706,8 @@ def create_solution(
             raise AlreadyExists('This solution already exists.')
 
         instance = cls.create(**{
-            cls.exercise.name: exercise,
-            cls.solver.name: solver,
+            cls.exercise.name: exercise.id,
+            cls.solver.name: solver.id,
             cls.submission_timestamp.name: datetime.now(),
             cls.hashed.name: hash_,
         })
@@ -1135,7 +1134,7 @@ def generate_string(
 
 
 def create_demo_users() -> None:
-    print('First run! Here are some users to get start with:')  # noqa: T001
+    print('First run! Here are some users to get start with:')  # noqa: T201
     fields = ['username', 'fullname', 'mail_address', 'role']
     student_role = Role.by_name('Student')
     admin_role = Role.by_name('Administrator')
@@ -1149,7 +1148,7 @@ def create_demo_users() -> None:
         password = User.random_password()
         api_key = User.random_password(stronger=True)
         User.create(**user, password=password, api_key=api_key)
-        print(f"User: {user['username']}, Password: {password}")  # noqa: T001
+        print(f"User: {user['username']}, Password: {password}")  # noqa: T201
 
 
 def create_basic_roles() -> None:

lms/lmstests/public/unittests/import_tests.py

@@ -63,5 +63,5 @@ def load_test_from_module(file_path: str):
 
 if __name__ == '__main__':
     if len(sys.argv) != 2:
-        print('python load_tests.py test-module-path')  # noqa: T001
+        print('python load_tests.py test-module-path')  # noqa: T201
     load_tests_from_path(file_path=sys.argv[1])

lms/lmstests/public/unittests/services.py

@@ -1,6 +1,7 @@
 import logging
 import subprocess  # noqa: S404
 from typing import Iterable, List, Optional
+
 from flask_babel import gettext as _  # type: ignore
 import junitparser
 from junitparser.junitparser import TestCase

lms/lmstests/sandbox/linters/defines.py

@@ -15,7 +15,7 @@
     'C404': 'אין סיבה להשתמש פה ב־list comprehension – השתמשו ב־dictionary comprehension במקום.',
     'C406': 'אין סיבה להשתמש בפונקציה <code>list</code> או <code>tuple</code>. אפשר במקום להשתמש פשוט בסוגריים המתאימים שמייצגים את מבנה הנתונים.',
     'C407': 'לא חייבים להשתמש כאן ב־list/dict comprehension, הפונקציה יודעת לקבל גנרטור.',
-    'C408': 'אין סיבה לקרוא פה לפונקציה – עדיף לציין מבנה נתונים ריק. במקום <code dir="ltr">dict()</code>, לדוגמה, רשמו <code dir="ltr">\{\}</code>.',  # NOQA: W605
+    'C408': 'אין סיבה לקרוא פה לפונקציה – עדיף לציין מבנה נתונים ריק. במקום <code dir="ltr">dict()</code>, לדוגמה, רשמו <code dir="ltr">{}</code>.',  # NOQA: W605
     'C409': 'העברת ל־<code dir="ltr">tuple()</code> רשימה, אך אין בזה צורך. עדיף להשתמש בסוגריים עגולים במקום.',
     'C410': 'אין צורך להמיר את הרשימה הזו ל־list. הוציאו אותה מהקריאה לפונקציה.',
     'C413': 'אין צורך להמיר לרשימה, <var>sorted</var> כבר מחזירה רשימה בעצמה.',
@@ -135,6 +135,7 @@
     'S322',  # input is a dangerous method of Python 2 yada yada
     'T000',  # todo note found
     'T001',  # print found
+    'T201',  # print found (newer version of T001)
     'T002',  # Python 2.x reserved word print used
     'W291',  # whitespaces @ end of line
     'W292',  # no new line in the end of the code

lms/lmstests/sandbox/linters/python.py

@@ -1,5 +1,6 @@
+from collections.abc import Iterable
 import tempfile
-import typing
+from typing import cast
 
 from flake8.main import application
 
@@ -10,7 +11,7 @@
 class PythonLinter(BaseLinter):
     def initialize(self):
         self._app = application.Application()
-        self._app.initialize(argv=['--import-order-style', 'google'])
+        self._argv = ['--import-order-style', 'google']
 
     @property
     def app(self) -> application.Application:
@@ -24,19 +25,22 @@ def get_error_text(self, error: LinterError) -> str:
     def match_to_file_suffix(file_suffix: str) -> bool:
         return file_suffix.lower() == 'py'
 
-    def _get_errors_from_solution(self) -> typing.Iterable[LinterError]:
-        index_of_check = 0
+    def _get_errors_from_solution(self) -> Iterable[LinterError]:
         with tempfile.NamedTemporaryFile('w') as temp_file:
             temp_file.write(self._code)
             temp_file.flush()
-
-            self.app.run_checks([temp_file.name])
-            checkers = self.app.file_checker_manager.checkers
-            results = checkers[index_of_check].results
+            self.app.initialize(argv=[temp_file.name, *self._argv])
+            self.app.run_checks()
+            assert self.app.file_checker_manager is not None
+            artifacts = self.app.file_checker_manager.results
+            results = [r for _, results_, _ in artifacts for r in results_]
 
         for result in results:
+            assert isinstance(result, tuple)
+            result = cast(tuple, result)
             response = LinterError(
-                *result, solution_file_id=self._solution_file_id)
+                *result, solution_file_id=self._solution_file_id,
+            )
             if response.error_code in defines.FLAKE_SKIP_ERRORS:
                 self._logger.info(
                     'Skipping error %s on line %s to solution file %s',

lms/lmstests/sandbox/linters/sql.py

@@ -12,7 +12,8 @@
 
 class SQLLinter(BaseLinter):
     def initialize(self):
-        self._app = Linter(config=FluffConfig.from_root())
+        config = {'dialect': 'ansi'}
+        self._app = Linter(config=FluffConfig(overrides=config))
 
     @property
     def app(self) -> Linter:

lms/lmsweb/__init__.py

@@ -32,7 +32,12 @@
 
 http_basic_auth = HTTPBasicAuth()
 
-limiter = Limiter(webapp, key_func=get_remote_address)
+limiter = Limiter(
+    app=webapp,
+    key_func=get_remote_address,
+    default_limits=["60 per minute"],
+    storage_uri='memory://',
+)
 
 
 if not config_file.exists():

lms/lmsweb/git_service.py

@@ -200,7 +200,7 @@ def _build_upload_operation(self) -> _GitOperation:
             contain_new_commits=False,
         )
 
-    def _load_files_from_repository(self) -> typing.List[upload.File]:
+    def _load_files_from_repository(self) -> list[upload.File]:
         """
         Since the remote server is a git bare repository
         we need to 'clone' the bare repository to resolve the files.
@@ -209,7 +209,7 @@ def _load_files_from_repository(self) -> typing.List[upload.File]:
         """
         with tempfile.TemporaryDirectory() as tempdir:
             self._execute_command(
-                args=['git', 'clone', self.repository_folder, '.'],
+                args=['git', 'clone', str(self.repository_folder), '.'],
                 cwd=tempdir,
             )
             to_return = []

lms/lmsweb/tools/validators.py

@@ -1,29 +1,29 @@
+from typing import TYPE_CHECKING
+
 from flask_babel import gettext as _  # type: ignore
-from wtforms.fields.core import StringField
+from wtforms import StringField
 from wtforms.validators import ValidationError
 
 from lms.lmsdb.models import User
 
+if TYPE_CHECKING:
+    from lms.lmsweb.forms.register import RegisterForm
+    from lms.lmsweb.forms.reset_password import ResetPassForm
+
 
-def UniqueUsernameRequired(
-    _form: 'RegisterForm', field: StringField,  # type: ignore # NOQA: F821
-) -> None:
+def UniqueUsernameRequired(__: 'RegisterForm', field: StringField) -> None:
     username_exists = User.get_or_none(User.username == field.data)
     if username_exists:
         raise ValidationError(_('The username is already in use'))
 
 
-def UniqueEmailRequired(
-    _form: 'RegisterForm', field: StringField,  # type: ignore # NOQA: F821
-) -> None:
+def UniqueEmailRequired(__: 'RegisterForm', field: StringField) -> None:
     email_exists = User.get_or_none(User.mail_address == field.data)
     if email_exists:
         raise ValidationError(_('The email is already in use'))
 
 
-def EmailNotExists(
-    _form: 'ResetPassForm', field: StringField,  # type: ignore # NOQA: F821
-) -> None:
+def EmailNotExists(__: 'ResetPassForm', field: StringField) -> None:
     email_exists = User.get_or_none(User.mail_address == field.data)
     if not email_exists:
         raise ValidationError(_('Invalid email'))